diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-05 08:50:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-22 00:34:38 +0100 |
| commit | 13d36c248379ca09c269f5dbed6dce1e3a326a48 (patch) | |
| tree | e502b3ca016a6cc57b014a145d63f32e16b3e251 /drivers/pci/setup-bus.c | |
| parent | PCI: don't load acpi_php when acpi is disabled (diff) | |
| download | linux-13d36c248379ca09c269f5dbed6dce1e3a326a48.tar.xz linux-13d36c248379ca09c269f5dbed6dce1e3a326a48.zip | |
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/setup-bus.c')
| -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) if (bus->resource[2]->flags & IORESOURCE_PREFETCH) { l = (region.start >> 16) & 0xfff0; l |= region.end & 0xfff00000; -#ifdef CONFIG_RESOURCES_64BIT - bu = region.start >> 32; - lu = region.end >> 32; -#endif + bu = upper_32_bits(region.start); + lu = upper_32_bits(region.end); DBG(KERN_INFO " PREFETCH window: 0x%016llx-0x%016llx\n", (unsigned long long)region.start, (unsigned long long)region.end); |