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, 12 insertions, 6 deletions

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