aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/head_64.S11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 48385c1074a5..8344dd2f310a 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -399,8 +399,13 @@ NEXT_PAGE(level3_ident_pgt)
399 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC 399 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC
400 .fill 511, 8, 0 400 .fill 511, 8, 0
401NEXT_PAGE(level2_ident_pgt) 401NEXT_PAGE(level2_ident_pgt)
402 /* Since I easily can, map the first 1G. 402 /*
403 * Since I easily can, map the first 1G.
403 * Don't set NX because code runs from these pages. 404 * Don't set NX because code runs from these pages.
405 *
406 * Note: This sets _PAGE_GLOBAL despite whether
407 * the CPU supports it or it is enabled. But,
408 * the CPU should ignore the bit.
404 */ 409 */
405 PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD) 410 PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
406#else 411#else
@@ -431,6 +436,10 @@ NEXT_PAGE(level2_kernel_pgt)
431 * (NOTE: at +512MB starts the module area, see MODULES_VADDR. 436 * (NOTE: at +512MB starts the module area, see MODULES_VADDR.
432 * If you want to increase this then increase MODULES_VADDR 437 * If you want to increase this then increase MODULES_VADDR
433 * too.) 438 * too.)
439 *
440 * This table is eventually used by the kernel during normal
441 * runtime. Care must be taken to clear out undesired bits
442 * later, like _PAGE_RW or _PAGE_GLOBAL in some cases.
434 */ 443 */
435 PMDS(0, __PAGE_KERNEL_LARGE_EXEC, 444 PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
436 KERNEL_IMAGE_SIZE/PMD_SIZE) 445 KERNEL_IMAGE_SIZE/PMD_SIZE)