Skip to content

Commit f4c5ca9

Browse files
Hugh DickinsIngo Molnar
authored andcommitted
x86_64: Show CR4.PSE on auxiliaries like on BSP
Set CR4.PSE in secondary_startup_64: the Intel SDM is clear that it does not matter whether it's 0 or 1 when 4-level-pts are enabled, but it's distracting to find CR4 different on BSP and auxiliaries - on x86_64, BSP alone got to add the PSE bit, in probe_page_size_mask(). Peter Zijlstra adds: "I think the point is that PSE bit is completely without meaning in long mode. But yes, having the same CR4 bits set across BSP and APs is definitely sane." Signed-off-by: Hugh Dickins <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent c53cbc5 commit f4c5ca9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kernel/head_64.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL)
180180
movl $0, %ecx
181181
#endif
182182

183-
/* Enable PAE mode, PGE and LA57 */
184-
orl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
183+
/* Enable PAE mode, PSE, PGE and LA57 */
184+
orl $(X86_CR4_PAE | X86_CR4_PSE | X86_CR4_PGE), %ecx
185185
#ifdef CONFIG_X86_5LEVEL
186186
testl $1, __pgtable_l5_enabled(%rip)
187187
jz 1f

0 commit comments

Comments
 (0)