Commit 5d3c8b21 authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar

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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2b540781
...@@ -275,8 +275,8 @@ try_preserve_large_page(pte_t *kpte, unsigned long address, ...@@ -275,8 +275,8 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,
break; break;
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
case PG_LEVEL_1G: case PG_LEVEL_1G:
psize = PMD_PAGE_SIZE; psize = PUD_PAGE_SIZE;
pmask = PMD_PAGE_MASK; pmask = PUD_PAGE_MASK;
break; break;
#endif #endif
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment