diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-05 02:50:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-21 18:34:38 -0500 |
commit | 13d36c248379ca09c269f5dbed6dce1e3a326a48 (patch) | |
tree | e502b3ca016a6cc57b014a145d63f32e16b3e251 /drivers/pci | |
parent | 6e4be1ff2e767fc3a34c5e8d67c3cba107c02099 (diff) |
PCI: fix up setup-bus.c #ifdef
Use upper_32_bits(): no code changes, one less ifdef.
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/setup-bus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 262b0439abe9..125e7b7f34ff 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -206,10 +206,8 @@ pci_setup_bridge(struct pci_bus *bus) | |||
206 | if (bus->resource[2]->flags & IORESOURCE_PREFETCH) { | 206 | if (bus->resource[2]->flags & IORESOURCE_PREFETCH) { |
207 | l = (region.start >> 16) & 0xfff0; | 207 | l = (region.start >> 16) & 0xfff0; |
208 | l |= region.end & 0xfff00000; | 208 | l |= region.end & 0xfff00000; |
209 | #ifdef CONFIG_RESOURCES_64BIT | 209 | bu = upper_32_bits(region.start); |
210 | bu = region.start >> 32; | 210 | lu = upper_32_bits(region.end); |
211 | lu = region.end >> 32; | ||
212 | #endif | ||
213 | DBG(KERN_INFO " PREFETCH window: 0x%016llx-0x%016llx\n", | 211 | DBG(KERN_INFO " PREFETCH window: 0x%016llx-0x%016llx\n", |
214 | (unsigned long long)region.start, | 212 | (unsigned long long)region.start, |
215 | (unsigned long long)region.end); | 213 | (unsigned long long)region.end); |