From 443b8456891fbe991d670c77ecaf26216d51b25e Mon Sep 17 00:00:00 2001
From: Muli Ben-Yehuda <muli@il.ibm.com>
Date: Sat, 21 Jul 2007 17:11:01 +0200
Subject: [PATCH] --- yaml --- r: 62415 b: refs/heads/master c:
 e8f204147149e48d72e9c1e321ee72452169e34a h: refs/heads/master i:   62413:
 682ea44c839cd9c050309151e428e8a910e26f96   62411:
 473c5b84783ee2af98f3d7cfdd06c652a255e493   62407:
 b762a73c8112e3ae8661e631bad4aeb515678cb8   62399:
 addb6108d2a2a5873e39c732eb2da2bc4caad9ad v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86_64/kernel/pci-calgary.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 88140d7d1755..d5e30971d547 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bcf77055cc88228263f936b2ecf69c017906cb2
+refs/heads/master: e8f204147149e48d72e9c1e321ee72452169e34a
diff --git a/trunk/arch/x86_64/kernel/pci-calgary.c b/trunk/arch/x86_64/kernel/pci-calgary.c
index 22c2d6250bff..6b76e2fc9249 100644
--- a/trunk/arch/x86_64/kernel/pci-calgary.c
+++ b/trunk/arch/x86_64/kernel/pci-calgary.c
@@ -806,13 +806,13 @@ static void __init calgary_reserve_regions(struct pci_dev *dev)
 	iommu_range_reserve(tbl, bad_dma_address, EMERGENCY_PAGES);
 
 	/* avoid the BIOS/VGA first 640KB-1MB region */
-	/* for CalIOC2 - avoid the entire first 2MB */
+	/* for CalIOC2 - avoid the entire first MB */
 	if (is_calgary(dev->device)) {
 		start = (640 * 1024);
 		npages = ((1024 - 640) * 1024) >> PAGE_SHIFT;
 	} else { /* calioc2 */
 		start = 0;
-		npages = (2 * 1024 * 1024) >> PAGE_SHIFT;
+		npages = (1 * 1024 * 1024) >> PAGE_SHIFT;
 	}
 	iommu_range_reserve(tbl, start, npages);