From: Andrew Morton Use upper_32_bits(): no code changes, one less ifdef. Cc: Greg KH Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton --- drivers/pci/setup-bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/pci/setup-bus.c~cleanup-gregkh-pci-pci-fix-bus-resource-assignment-on-32-bits-with-64b-resources drivers/pci/setup-bus.c --- a/drivers/pci/setup-bus.c~cleanup-gregkh-pci-pci-fix-bus-resource-assignment-on-32-bits-with-64b-resources +++ a/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); _