* annotate functions properly by SYM_CODE_START, SYM_CODE_START_LOCAL* and SYM_CODE_END -- these are not C-like functions, so we have to annotate them using CODE. * use SYM_CODE_INNER_LABEL* for labels being in the middle of other functions
[v4] alignments preserved Signed-off-by: Jiri Slaby <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: <[email protected]> --- arch/x86/entry/entry_32.S | 15 ++++++++------- arch/x86/entry/entry_64.S | 9 ++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index ee6e204bfac3..5ed412379984 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -324,7 +324,7 @@ ret_from_intr: cmpl $USER_RPL, %eax jb resume_kernel # not returning to v8086 or userspace -ENTRY(resume_userspace) +SYM_CODE_INNER_LABEL(resume_userspace, SYM_V_LOCAL) DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_OFF movl %esp, %eax @@ -554,10 +554,11 @@ restore_all: INTERRUPT_RETURN .section .fixup, "ax" -ENTRY(iret_exc ) +SYM_CODE_START(iret_exc) pushl $0 # no error code pushl $do_iret_error jmp common_exception +SYM_CODE_END(iret_exc) .previous _ASM_EXTABLE(.Lirq_return, iret_exc) @@ -649,7 +650,7 @@ END(irq_entries_start) * so IRQ-flags tracing has to follow that: */ .p2align CONFIG_X86_L1_CACHE_SHIFT -common_interrupt: +SYM_CODE_START_LOCAL(common_interrupt) ASM_CLAC addl $-0x80, (%esp) /* Adjust vector into the [-256, -1] range */ SAVE_ALL @@ -658,7 +659,7 @@ common_interrupt: movl %esp, %eax call do_IRQ jmp ret_from_intr -ENDPROC(common_interrupt) +SYM_CODE_END(common_interrupt) #define BUILD_INTERRUPT3(name, nr, fn) \ ENTRY(name) \ @@ -810,7 +811,7 @@ ENTRY(xen_hypervisor_callback) jmp xen_iret_crit_fixup -ENTRY(xen_do_upcall) +SYM_CODE_INNER_LABEL(xen_do_upcall, SYM_V_GLOBAL) 1: mov %esp, %eax call xen_evtchn_do_upcall #ifndef CONFIG_PREEMPT @@ -889,7 +890,7 @@ ENTRY(page_fault) jmp common_exception END(page_fault) -common_exception: +SYM_CODE_START_LOCAL_NOALIGN(common_exception) /* the function address is in %gs's slot on the stack */ pushl %fs pushl %es @@ -919,7 +920,7 @@ common_exception: movl %esp, %eax # pt_regs pointer call *%edi jmp ret_from_exception -END(common_exception) +SYM_CODE_END(common_exception) ENTRY(debug) /* diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index c7cd02cf710b..1dd3511279af 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -592,7 +592,7 @@ END(irq_entries_start) * then jump to common_interrupt. */ .p2align CONFIG_X86_L1_CACHE_SHIFT -common_interrupt: +SYM_CODE_START_LOCAL(common_interrupt) ASM_CLAC addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */ interrupt do_IRQ @@ -643,7 +643,7 @@ restore_c_regs_and_iret: REMOVE_PT_GPREGS_FROM_STACK 8 INTERRUPT_RETURN -ENTRY(native_iret) +SYM_CODE_INNER_LABEL(native_iret, SYM_V_GLOBAL) UNWIND_HINT_IRET_REGS /* * Are we returning to a stack segment from the LDT? Note: in @@ -654,8 +654,7 @@ ENTRY(native_iret) jnz native_irq_return_ldt #endif -.global native_irq_return_iret -native_irq_return_iret: +SYM_CODE_INNER_LABEL_NOALIGN(native_irq_return_iret, SYM_V_GLOBAL) /* * This may fault. Non-paranoid faults on return to userspace are * handled by fixup_bad_iret. These include #SS, #GP, and #NP. @@ -732,7 +731,7 @@ native_irq_return_ldt: */ jmp native_irq_return_iret #endif -END(common_interrupt) +SYM_CODE_END(common_interrupt) /* * APIC interrupts. -- 2.14.2
