diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 15:14:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 09:23:58 -0700 |
| commit | 1396a8c3f7cec9f5e0d00bd089be21fc468f0f1c (patch) | |
| tree | b96018459e26a24e20221f0bb7d5bb25d6608147 /drivers/pci/proc.c | |
| parent | 7c7459d1f91abdf1e31ef80cad526e83e8b8ba4e (diff) | |
| download | op-kernel-dev-1396a8c3f7cec9f5e0d00bd089be21fc468f0f1c.zip op-kernel-dev-1396a8c3f7cec9f5e0d00bd089be21fc468f0f1c.tar.gz | |
[PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/proc.c')
| -rw-r--r-- | drivers/pci/proc.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 54b2ebc..20dfd77 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) { @@ -358,16 +352,16 @@ static int show_device(struct seq_file *m, void *v) for (i=0; i<7; i++) { u64 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; 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) |
