]> err.no Git - linux-2.6/commitdiff
PCI: fix up setup-bus.c #ifdef
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 5 Feb 2008 07:50:12 +0000 (23:50 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Feb 2008 23:34:38 +0000 (15:34 -0800)
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>
drivers/pci/setup-bus.c

index 262b0439abe9e41a476629d9ac35927f2491620f..125e7b7f34ffd13462e551b31c79cd03ab0d3572 100644 (file)
@@ -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);