Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e8f204147149e48d72e9c1e321ee72452169e34a
Commit:     e8f204147149e48d72e9c1e321ee72452169e34a
Parent:     8bcf77055cc88228263f936b2ecf69c017906cb2
Author:     Muli Ben-Yehuda <[EMAIL PROTECTED]>
AuthorDate: Sat Jul 21 17:11:01 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Jul 21 18:37:11 2007 -0700

    x86_64: only reserve the first 1MB of IO space for CalIOC2
    
    Signed-off-by: Muli Ben-Yehuda <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/x86_64/kernel/pci-calgary.c |    4 ++--
 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to