x86/entry: Fix !PV build

early_page_fault() needs to outside of #ifdef CONFIG_PV

Spotted by Gitlab CI.

Fixes: fe3f50726e ("x86/entry: move .init.text section higher up in the code for readability")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Andrew Cooper committed 2022-08-23 12:22:05 +01:00
1 parent 696ee5ca9f
commit 8d9006cf41
1 file changed
+9 -9
+9 -9
View File
@@ -140,15 +140,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 */
@@ -655,6 +646,15 @@ ret_from_intr:
jmp restore_all_xen
#endif
.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
ALIGN
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.