Commit db9aded9 authored by Hou Wenlong's avatar Hou Wenlong Committed by Juergen Gross
Browse files

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: default avatarHou Wenlong <houwenlong.hwl@antgroup.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Message-ID: <d09ce9a134eb9cbc16928a5b316969f8ba606b81.1768017442.git.houwenlong.hwl@antgroup.com>
parent 378f1dc3

arch/x86/platform/pvh/head.S

+2 −0
Original line number Diff line number Diff line
@@ -91,10 +91,12 @@ SYM_CODE_START(pvh_start_xen) 


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



#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)

	/* Enable PAE mode. */

	mov %cr4, %eax

	orl $X86_CR4_PAE, %eax

	mov %eax, %cr4

#endif



#ifdef CONFIG_X86_64

	/* Enable Long mode. */