diff options
| author |   Andi Kleen <ak@suse.de> | 2008-02-13 16:20:35 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-02-13 16:20:35 +0100 |
| commit | 5d3c8b21e22712137db6bbd246d1bdcbe0a09914 (patch) | |
| tree | b8e50f8850eb4d672aeda06819edbcf73a5d3eae /arch | |
| parent | xen: unpin initial Xen pagetable once we're finished with it (diff) | |
| download | linux-dev-5d3c8b21e22712137db6bbd246d1bdcbe0a09914.tar.xz linux-dev-5d3c8b21e22712137db6bbd246d1bdcbe0a09914.zip | |
x86: CPA: fix gbpages support in try_preserve_large_page
[ mingo@elte.hu: 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
enabled.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 440210a2277d..bd61ed13f9cf 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, break; #ifdef CONFIG_X86_64 case PG_LEVEL_1G: - psize = PMD_PAGE_SIZE; - pmask = PMD_PAGE_MASK; + psize = PUD_PAGE_SIZE; + pmask = PUD_PAGE_MASK; break; #endif default: |