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, 7 insertions, 13 deletions

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)