Skip to content

Commit db9aded

Browse files
bysuijgross1
authored andcommitted
x86/xen/pvh: Enable PAE mode for 32-bit guest only when CONFIG_X86_PAE is set
The PVH entry is available for 32-bit KVM guests, and 32-bit KVM guests do not depend on CONFIG_X86_PAE. However, mk_early_pgtbl_32() builds different pagetables depending on whether CONFIG_X86_PAE is set. Therefore, enabling PAE mode for 32-bit KVM guests without CONFIG_X86_PAE being set would result in a boot failure during CR3 loading. Signed-off-by: Hou Wenlong <houwenlong.hwl@antgroup.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Juergen Gross <jgross@suse.com> Message-ID: <d09ce9a134eb9cbc16928a5b316969f8ba606b81.1768017442.git.houwenlong.hwl@antgroup.com>
1 parent 378f1dc commit db9aded

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

arch/x86/platform/pvh/head.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@ SYM_CODE_START(pvh_start_xen)
9191

9292
leal rva(early_stack_end)(%ebp), %esp
9393

94+
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
9495
/* Enable PAE mode. */
9596
mov %cr4, %eax
9697
orl $X86_CR4_PAE, %eax
9798
mov %eax, %cr4
99+
#endif
98100

99101
#ifdef CONFIG_X86_64
100102
/* Enable Long mode. */

0 commit comments

Comments
 (0)