12 files changed, 75 insertions, 63 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 723092682023..5f7db9d2436e 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -34,11 +34,11 @@
  */
 int
 pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
-        unsigned long size, unsigned long align, unsigned long min,
-        unsigned int type_mask,
-        void (*alignf)(void *, struct resource *,
-                        unsigned long, unsigned long),
-        void *alignf_data)
+                resource_size_t size, resource_size_t align,
+                resource_size_t min, unsigned int type_mask,
+                void (*alignf)(void *, struct resource *, resource_size_t,
+                                resource_size_t),
+                void *alignf_data)
 {
         int i, ret = -ENOMEM;
 
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index f7cb00da38df..1ec165df8522 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -95,8 +95,8 @@ static int zt5550_hc_config(struct pci_dev *pdev)
 
         hc_dev = pdev;
         dbg("hc_dev = %p", hc_dev);
-        dbg("pci resource start %lx", pci_resource_start(hc_dev, 1));
-        dbg("pci resource len %lx", pci_resource_len(hc_dev, 1));
+        dbg("pci resource start %llx", (unsigned long long)pci_resource_start(hc_dev, 1));
+        dbg("pci resource len %llx", (unsigned long long)pci_resource_len(hc_dev, 1));
 
         if(!request_mem_region(pci_resource_start(hc_dev, 1),
                                 pci_resource_len(hc_dev, 1), MY_NAME)) {
@@ -108,8 +108,9 @@ static int zt5550_hc_config(struct pci_dev *pdev)
         hc_registers =
             ioremap(pci_resource_start(hc_dev, 1), pci_resource_len(hc_dev, 1));
         if(!hc_registers) {
-                err("cannot remap MMIO region %lx @ %lx",
-                    pci_resource_len(hc_dev, 1), pci_resource_start(hc_dev, 1));
+                err("cannot remap MMIO region %llx @ %llx",
+                        (unsigned long long)pci_resource_len(hc_dev, 1),
+                        (unsigned long long)pci_resource_start(hc_dev, 1));
                 ret = -ENODEV;
                 goto exit_release_region;
         }
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 9bc1deb8df52..f8658d63f077 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -1089,8 +1089,8 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
         
         dbg("pdev = %p\n", pdev);
-        dbg("pci resource start %lx\n", pci_resource_start(pdev, 0));
-        dbg("pci resource len %lx\n", pci_resource_len(pdev, 0));
+        dbg("pci resource start %llx\n", (unsigned long long)pci_resource_start(pdev, 0));
+        dbg("pci resource len %llx\n", (unsigned long long)pci_resource_len(pdev, 0));
 
         if (!request_mem_region(pci_resource_start(pdev, 0),
                                 pci_resource_len(pdev, 0), MY_NAME)) {
@@ -1102,9 +1102,9 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         ctrl->hpc_reg = ioremap(pci_resource_start(pdev, 0),
                                         pci_resource_len(pdev, 0));
         if (!ctrl->hpc_reg) {
-                err("cannot remap MMIO region %lx @ %lx\n",
-                                pci_resource_len(pdev, 0),
-                                pci_resource_start(pdev, 0));
+                err("cannot remap MMIO region %llx @ %llx\n",
+                    (unsigned long long)pci_resource_len(pdev, 0),
+                    (unsigned long long)pci_resource_start(pdev, 0));
                 rc = -ENODEV;
                 goto err_free_mem_region;
         }
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index d77138ecb098..11f7858f0064 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1398,8 +1398,9 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
 
         for ( rc = 0; rc < DEVICE_COUNT_RESOURCE; rc++)
                 if (pci_resource_len(pdev, rc) > 0)
-                        dbg("pci resource[%d] start=0x%lx(len=0x%lx)\n", rc,
-                                pci_resource_start(pdev, rc), pci_resource_len(pdev, rc));
+                        dbg("pci resource[%d] start=0x%llx(len=0x%llx)\n", rc,
+                            (unsigned long long)pci_resource_start(pdev, rc),
+                            (unsigned long long)pci_resource_len(pdev, rc));
 
         info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, 
                 pdev->subsystem_vendor, pdev->subsystem_device);
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c
index f5cfbf2c047c..620e1139e607 100644
--- a/drivers/pci/hotplug/shpchp_sysfs.c
+++ b/drivers/pci/hotplug/shpchp_sysfs.c
@@ -51,8 +51,10 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
                 res = bus->resource[index];
                 if (res && (res->flags & IORESOURCE_MEM) &&
                                 !(res->flags & IORESOURCE_PREFETCH)) {
-                        out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",
-                                        res->start, (res->end - res->start));
+                        out += sprintf(out, "start = %8.8llx, "
+                                        "length = %8.8llx\n",
+                                        (unsigned long long)res->start,
+                                        (unsigned long long)(res->end - res->start));
                 }
         }
         out += sprintf(out, "Free resources: prefetchable memory\n");
@@ -60,16 +62,20 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
                 res = bus->resource[index];
                 if (res && (res->flags & IORESOURCE_MEM) &&
                                (res->flags & IORESOURCE_PREFETCH)) {
-                        out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",
-                                        res->start, (res->end - res->start));
+                        out += sprintf(out, "start = %8.8llx, "
+                                        "length = %8.8llx\n",
+                                        (unsigned long long)res->start,
+                                        (unsigned long long)(res->end - res->start));
                 }
         }
         out += sprintf(out, "Free resources: IO\n");
         for (index = 0; index < PCI_BUS_NUM_RESOURCES; index++) {
                 res = bus->resource[index];
                 if (res && (res->flags & IORESOURCE_IO)) {
-                        out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",
-                                        res->start, (res->end - res->start));
+                        out += sprintf(out, "start = %8.8llx, "
+                                        "length = %8.8llx\n",
+                                        (unsigned long long)res->start,
+                                        (unsigned long long)(res->end - res->start));
                 }
         }
         out += sprintf(out, "Free resources: bus numbers\n");
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index bc405c035ce3..606f9b6f70eb 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -87,7 +87,7 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf)
         char * str = buf;
         int i;
         int max = 7;
-        u64 start, end;
+        resource_size_t start, end;
 
         if (pci_dev->subordinate)
                 max = DEVICE_COUNT_RESOURCE;
@@ -365,7 +365,7 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
                                                        struct device, kobj));
         struct resource *res = (struct resource *)attr->private;
         enum pci_mmap_state mmap_type;
-        u64 start, end;
+        resource_size_t start, end;
         int i;
 
         for (i = 0; i < PCI_ROM_RESOURCE; i++)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 23d3b17c8cad..cf57d7de3765 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -691,10 +691,12 @@ int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name)
         return 0;
 
 err_out:
-        printk (KERN_WARNING "PCI: Unable to reserve %s region #%d:%lx@%lx for device %s\n",
+        printk (KERN_WARNING "PCI: Unable to reserve %s region #%d:%llx@%llx "
+                "for device %s\n",
                 pci_resource_flags(pdev, bar) & IORESOURCE_IO ? "I/O" : "mem",
                 bar + 1, /* PCI BAR # */
-                pci_resource_len(pdev, bar), pci_resource_start(pdev, bar),
+                (unsigned long long)pci_resource_len(pdev, bar),
+                (unsigned long long)pci_resource_start(pdev, bar),
                 pci_name(pdev));
         return -EBUSY;
 }
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 29bdeca031a8..9cc842b666eb 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -6,10 +6,10 @@ extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_cleanup_rom(struct pci_dev *dev);
 extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
-                                  unsigned long size, unsigned long align,
-                                  unsigned long min, unsigned int type_mask,
+                                  resource_size_t size, resource_size_t align,
+                                  resource_size_t min, unsigned int type_mask,
                                   void (*alignf)(void *, struct resource *,
-                                                 unsigned long, unsigned long),
+                                              resource_size_t, resource_size_t),
                                   void *alignf_data);
 /* Firmware callbacks */
 extern int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 54b2ebc9c91a..99cf33379769 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -302,12 +302,6 @@ static struct file_operations proc_bus_pci_operations = {
 #endif /* HAVE_PCI_MMAP */
 };
 
-#if BITS_PER_LONG == 32
-#define LONG_FORMAT "\t%08lx"
-#else
-#define LONG_FORMAT "\t%16lx"
-#endif
-
 /* iterator */
 static void *pci_seq_start(struct seq_file *m, loff_t *pos)
 {
@@ -356,18 +350,18 @@ static int show_device(struct seq_file *m, void *v)
                         dev->irq);
         /* Here should be 7 and not PCI_NUM_RESOURCES as we need to preserve compatibility */
         for (i=0; i<7; i++) {
-                u64 start, end;
+                resource_size_t start, end;
                 pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);
-                seq_printf(m, LONG_FORMAT,
-                        ((unsigned long)start) |
-                        (dev->resource[i].flags & PCI_REGION_FLAG_MASK));
+                seq_printf(m, "\t%16llx",
+                        (unsigned long long)(start |
+                        (dev->resource[i].flags & PCI_REGION_FLAG_MASK)));
         }
         for (i=0; i<7; i++) {
-                u64 start, end;
+                resource_size_t start, end;
                 pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);
-                seq_printf(m, LONG_FORMAT,
+                seq_printf(m, "\t%16llx",
                         dev->resource[i].start < dev->resource[i].end ?
-                        (unsigned long)(end - start) + 1 : 0);
+                        (unsigned long long)(end - start) + 1 : 0);
         }
         seq_putc(m, '\t');
         if (drv)
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 598a115cd00e..cbb69cf41311 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -80,8 +80,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
         } else {
                 if (res->flags & IORESOURCE_ROM_COPY) {
                         *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
-                        return (void __iomem *)pci_resource_start(pdev,
-                                                             PCI_ROM_RESOURCE);
+                        return (void __iomem *)(unsigned long)
+                                pci_resource_start(pdev, PCI_ROM_RESOURCE);
                 } else {
                         /* assign the ROM an address if it doesn't have one */
                         if (res->parent == NULL &&
@@ -170,11 +170,11 @@ void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size)
                 return rom;
 
         res->end = res->start + *size;
-        memcpy_fromio((void*)res->start, rom, *size);
+        memcpy_fromio((void*)(unsigned long)res->start, rom, *size);
         pci_unmap_rom(pdev, rom);
         res->flags |= IORESOURCE_ROM_COPY;
 
-        return (void __iomem *)res->start;
+        return (void __iomem *)(unsigned long)res->start;
 }
 
 /**
@@ -227,7 +227,7 @@ void pci_cleanup_rom(struct pci_dev *pdev)
 {
         struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
         if (res->flags & IORESOURCE_ROM_COPY) {
-                kfree((void*)res->start);
+                kfree((void*)(unsigned long)res->start);
                 res->flags &= ~IORESOURCE_ROM_COPY;
                 res->start = 0;
                 res->end = 0;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 35086e80faa9..47c1071ad84e 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -357,8 +357,10 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
                         order = __ffs(align) - 20;
                         if (order > 11) {
                                 printk(KERN_WARNING "PCI: region %s/%d "
-                                       "too large: %lx-%lx\n",
-                                       pci_name(dev), i, r->start, r->end);
+                                       "too large: %llx-%llx\n",
+                                        pci_name(dev), i,
+                                        (unsigned long long)r->start,
+                                        (unsigned long long)r->end);
                                 r->flags = 0;
                                 continue;
                         }
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 577f4b55c46d..ab78e4bbdd83 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -40,8 +40,9 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
 
         pcibios_resource_to_bus(dev, &region, res);
 
-        pr_debug("  got res [%lx:%lx] bus [%lx:%lx] flags %lx for "
-                 "BAR %d of %s\n", res->start, res->end,
+        pr_debug("  got res [%llx:%llx] bus [%lx:%lx] flags %lx for "
+                 "BAR %d of %s\n", (unsigned long long)res->start,
+                 (unsigned long long)res->end,
                  region.start, region.end, res->flags, resno, pci_name(dev));
 
         new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
@@ -104,10 +105,12 @@ pci_claim_resource(struct pci_dev *dev, int resource)
                 err = insert_resource(root, res);
 
         if (err) {
-                printk(KERN_ERR "PCI: %s region %d of %s %s [%lx:%lx]\n",
-                       root ? "Address space collision on" :
-                              "No parent found for",
-                       resource, dtype, pci_name(dev), res->start, res->end);
+                printk(KERN_ERR "PCI: %s region %d of %s %s [%llx:%llx]\n",
+                        root ? "Address space collision on" :
+                                "No parent found for",
+                        resource, dtype, pci_name(dev),
+                        (unsigned long long)res->start,
+                        (unsigned long long)res->end);
         }
 
         return err;
@@ -118,7 +121,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
 {
         struct pci_bus *bus = dev->bus;
         struct resource *res = dev->resource + resno;
-        unsigned long size, min, align;
+        resource_size_t size, min, align;
         int ret;
 
         size = res->end - res->start + 1;
@@ -145,9 +148,11 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
         }
 
         if (ret) {
-                printk(KERN_ERR "PCI: Failed to allocate %s resource #%d:%lx@%lx for %s\n",
-                       res->flags & IORESOURCE_IO ? "I/O" : "mem",
-                       resno, size, res->start, pci_name(dev));
+                printk(KERN_ERR "PCI: Failed to allocate %s resource "
+                        "#%d:%llx@%llx for %s\n",
+                        res->flags & IORESOURCE_IO ? "I/O" : "mem",
+                        resno, (unsigned long long)size,
+                        (unsigned long long)res->start, pci_name(dev));
         } else if (resno < PCI_BRIDGE_RESOURCES) {
                 pci_update_resource(dev, res, resno);
         }
@@ -204,7 +209,7 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
         for (i = 0; i < PCI_NUM_RESOURCES; i++) {
                 struct resource *r;
                 struct resource_list *list, *tmp;
-                unsigned long r_align;
+                resource_size_t r_align;
 
                 r = &dev->resource[i];
                 r_align = r->end - r->start;
@@ -213,13 +218,14 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
                         continue;
                 if (!r_align) {
                         printk(KERN_WARNING "PCI: Ignore bogus resource %d "
-                                            "[%lx:%lx] of %s\n",
-                                            i, r->start, r->end, pci_name(dev));
+                                "[%llx:%llx] of %s\n",
+                                i, (unsigned long long)r->start,
+                                (unsigned long long)r->end, pci_name(dev));
                         continue;
                 }
                 r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start;
                 for (list = head; ; list = list->next) {
-                        unsigned long align = 0;
+                        resource_size_t align = 0;
                         struct resource_list *ln = list->next;
                         int idx;