From: Muli Ben-Yehuda Date: Sat, 21 Jul 2007 15:11:01 +0000 (+0200) Subject: x86_64: only reserve the first 1MB of IO space for CalIOC2 X-Git-Tag: v2.6.23-rc1~80 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e8f204147149e48d72e9c1e321ee72452169e34a;p=linux-2.6-omap-h63xx.git x86_64: only reserve the first 1MB of IO space for CalIOC2 Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index 22c2d6250bf..6b76e2fc924 100644 --- a/arch/x86_64/kernel/pci-calgary.c +++ b/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);