Commit:     5d3c8b21e22712137db6bbd246d1bdcbe0a09914
Parent:     2b5407811db755257ae53c75cc6b312ed5d2ad9e
Author:     Andi Kleen <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 13 16:20:35 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Feb 13 16:20:35 2008 +0100

    x86: CPA: fix gbpages support in try_preserve_large_page
    [ [EMAIL PROTECTED]: while gbpages cannot be enabled on mainline currently,
      keep the code uptodate and this fix is easy enough. ]
    Use correct page sizes and masks for GB pages in try_preserve_large_page()
    This prevents a boot hang on a GB capable system with CONFIG_DIRECT_GBPAGES
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/mm/pageattr.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 440210a..bd61ed1 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -275,8 +275,8 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,
 #ifdef CONFIG_X86_64
        case PG_LEVEL_1G:
-               psize = PMD_PAGE_SIZE;
-               pmask = PMD_PAGE_MASK;
+               psize = PUD_PAGE_SIZE;
+               pmask = PUD_PAGE_MASK;
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

Reply via email to