summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMuli Ben-Yehuda <muli@il.ibm.com>2007-07-21 15:11:01 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 01:37:11 (GMT)
commite8f204147149e48d72e9c1e321ee72452169e34a (patch)
tree3797066c2375a59125fc03b95279293845ba43b3 /arch
parent8bcf77055cc88228263f936b2ecf69c017906cb2 (diff)
downloadlinux-fsl-qoriq-e8f204147149e48d72e9c1e321ee72452169e34a.tar.xz
x86_64: only reserve the first 1MB of IO space for CalIOC2
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/pci-calgary.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index 22c2d62..6b76e2f 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);