---

yaml --- r: 86087 b: refs/heads/master c: 13d36c2 h: refs/heads/master i: 86085: b417eab 86083: af6ac9d 86079: de17fa9 v: v3
git-mirror · Feb 21, 2008 · 734fcb8 · 734fcb8
1 parent c9de186
commit 734fcb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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);