4 files changed, 25 insertions, 17 deletions

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