Commit 1903ac54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  [PATCH] i386: export memory more than 4G through /proc/iomem
  [PATCH] 64bit Resource: finally enable 64bit resource sizes
  [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed
  [PATCH] 64bit resource: change pnp core to use resource_size_t
  [PATCH] 64bit resource: change pci core and arch code to use resource_size_t
  [PATCH] 64bit resource: change resource core to use resource_size_t
  [PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource
  [PATCH] 64bit resource: fix up printks for resources in misc drivers
  [PATCH] 64bit resource: fix up printks for resources in arch and core code
  [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers
  [PATCH] 64bit resource: fix up printks for resources in video drivers
  [PATCH] 64bit resource: fix up printks for resources in ide drivers
  [PATCH] 64bit resource: fix up printks for resources in mtd drivers
  [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers
  [PATCH] 64bit resource: fix up printks for resources in networks drivers
  [PATCH] 64bit resource: fix up printks for resources in sound drivers
  [PATCH] 64bit resource: C99 changes for struct resource declarations

Fixed up trivial conflict in drivers/ide/pci/cmd64x.c (the printk that
was changed by the 64-bit resources had been deleted in the meantime ;)
parents 47c2a3aa 87937472

arch/alpha/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -124,12 +124,12 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final); 


void

pcibios_align_resource(void *data, struct resource *res,

		       unsigned long size, unsigned long align)

		       resource_size_t size, resource_size_t align)

{

	struct pci_dev *dev = data;

	struct pci_controller *hose = dev->sysdata;

	unsigned long alignto;

	unsigned long start = res->start;

	resource_size_t start = res->start;



	if (res->flags & IORESOURCE_IO) {

		/* Make sure we start at our min on all hoses */

arch/arm/kernel/bios32.c

+3 −3
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev) 
static void __devinit

pdev_fixup_device_resources(struct pci_sys_data *root, struct pci_dev *dev)

{

	unsigned long offset;

	resource_size_t offset;

	int i;



	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
@@ -634,9 +634,9 @@ char * __init pcibios_setup(char *str) 
 * which might be mirrored at 0x0100-0x03ff..

 */

void pcibios_align_resource(void *data, struct resource *res,

			    unsigned long size, unsigned long align)

			    resource_size_t size, resource_size_t align)

{

	unsigned long start = res->start;

	resource_size_t start = res->start;



	if (res->flags & IORESOURCE_IO && start & 0x300)

		start = (start + 0x3ff) & ~0x3ff;

arch/arm/kernel/setup.c

+36 −6
Original line number Diff line number Diff line
@@ -119,9 +119,24 @@ DEFINE_PER_CPU(struct cpuinfo_arm, cpu_data); 
 * Standard memory resources

 */

static struct resource mem_res[] = {

	{ "Video RAM",   0,     0,     IORESOURCE_MEM			},

	{ "Kernel text", 0,     0,     IORESOURCE_MEM			},

	{ "Kernel data", 0,     0,     IORESOURCE_MEM			}

	{

		.name = "Video RAM",

		.start = 0,

		.end = 0,

		.flags = IORESOURCE_MEM

	},

	{

		.name = "Kernel text",

		.start = 0,

		.end = 0,

		.flags = IORESOURCE_MEM

	},

	{

		.name = "Kernel data",

		.start = 0,

		.end = 0,

		.flags = IORESOURCE_MEM

	}

};



#define video_ram   mem_res[0]
@@ -129,9 +144,24 @@ static struct resource mem_res[] = { 
#define kernel_data mem_res[2]



static struct resource io_res[] = {

	{ "reserved",    0x3bc, 0x3be, IORESOURCE_IO | IORESOURCE_BUSY },

	{ "reserved",    0x378, 0x37f, IORESOURCE_IO | IORESOURCE_BUSY },

	{ "reserved",    0x278, 0x27f, IORESOURCE_IO | IORESOURCE_BUSY }

	{

		.name = "reserved",

		.start = 0x3bc,

		.end = 0x3be,

		.flags = IORESOURCE_IO | IORESOURCE_BUSY

	},

	{

		.name = "reserved",

		.start = 0x378,

		.end = 0x37f,

		.flags = IORESOURCE_IO | IORESOURCE_BUSY

	},

	{

		.name = "reserved",

		.start = 0x278,

		.end = 0x27f,

		.flags = IORESOURCE_IO | IORESOURCE_BUSY

	}

};



#define lp0 io_res[0]

arch/cris/arch-v32/drivers/pci/bios.c

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 


void

pcibios_align_resource(void *data, struct resource *res,

		       unsigned long size, unsigned long align)

		       resource_size_t size, resource_size_t align)

{

	if (res->flags & IORESOURCE_IO) {

		unsigned long start = res->start;

		resource_size_t start = res->start;



		if (start & 0x300) {

			start = (start + 0x3ff) & ~0x3ff;

arch/frv/mb93090-mb00/pci-frv.c

+2 −2
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root, 
 */

void

pcibios_align_resource(void *data, struct resource *res,

		       unsigned long size, unsigned long align)

		       resource_size_t size, resource_size_t align)

{

	if (res->flags & IORESOURCE_IO) {

		unsigned long start = res->start;

		resource_size_t start = res->start;



		if (start & 0x300) {

			start = (start + 0x3ff) & ~0x3ff;

CRA Git | Maintained and supported by SUSTech CRA and CCSE