early_page_fault() needs to outside of #ifdef CONFIG_PV
Spotted by Gitlab CI.
Fixes: fe3f50726e87 ("x86/entry: move .init.text section higher up in the code
for readability")
Signed-off-by: Andrew Cooper <[email protected]>
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>
---
xen/arch/x86/x86_64/entry.S | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 9b34150bc7ab..b0efe48192d5 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -22,6 +22,17 @@
#endif
.endm
+ .section .init.text, "ax", @progbits
+ENTRY(early_page_fault)
+ ENDBR64
+ movl $TRAP_page_fault, 4(%rsp)
+ SAVE_ALL
+ movq %rsp, %rdi
+ call do_early_page_fault
+ jmp restore_all_xen
+
+ .text
+
#ifdef CONFIG_PV
/* %rbx: struct vcpu */
switch_to_kernel:
@@ -140,15 +151,6 @@ process_trap:
call create_bounce_frame
jmp test_all_events
- .section .init.text, "ax", @progbits
-ENTRY(early_page_fault)
- ENDBR64
- movl $TRAP_page_fault, 4(%rsp)
- SAVE_ALL
- movq %rsp, %rdi
- call do_early_page_fault
- jmp restore_all_xen
-
.section .text.entry, "ax", @progbits
/* %rbx: struct vcpu, interrupts disabled */
--
2.11.0
