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 ;)

1 files changed, 20 insertions, 14 deletions

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;