From 734fcb800621e526cbd7f2ab2f91cbf708c9a95b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 4 Feb 2008 23:50:12 -0800
Subject: [PATCH] --- yaml --- r: 86087 b: refs/heads/master c:
 13d36c248379ca09c269f5dbed6dce1e3a326a48 h: refs/heads/master i:   86085:
 b417eab6b7f1a32843ec31b2262906b743387700   86083:
 af6ac9dc0deb3013beb980df8b035d7235e6f4c6   86079:
 de17fa9780ba6828b01fb978ba08394b4c511607 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/setup-bus.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d9e1bd5d0358..180c00d36d59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e4be1ff2e767fc3a34c5e8d67c3cba107c02099
+refs/heads/master: 13d36c248379ca09c269f5dbed6dce1e3a326a48
diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c
index 262b0439abe9..125e7b7f34ff 100644
--- a/trunk/drivers/pci/setup-bus.c
+++ b/trunk/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);