git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
pci
/
proc.c
diff --git
a/drivers/pci/proc.c
b/drivers/pci/proc.c
index
54b2ebc
..
99cf333
100644
(file)
--- 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 */
};
#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)
{
/* 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++) {
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);
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++) {
}
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);
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 ?
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)
}
seq_putc(m, '\t');
if (drv)