[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] x86/entry: Fix !PV build
commit 8d9006cf4152cb8ef360ee12c4a1477992bbf85a Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> AuthorDate: Mon Aug 22 13:46:39 2022 +0100 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Tue Aug 23 12:22:05 2022 +0100 x86/entry: Fix !PV build 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 <andrew.cooper3@xxxxxxxxxx> Acked-by: Jan Beulich <jbeulich@xxxxxxxx> --- xen/arch/x86/x86_64/entry.S | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 9b34150bc7..ae01285181 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -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 -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |