Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH v3 11/29] x86: entry, annotate THUNKs | Date | Fri, 21 Apr 2017 16:12:47 +0200 |
| |
Place SYM_FUNC_START and SYM_FUNC_END around the THUNK macro body, given it generates functions.
Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <x86@kernel.org> --- arch/x86/entry/thunk_32.S | 4 ++-- arch/x86/entry/thunk_64.S | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/x86/entry/thunk_32.S b/arch/x86/entry/thunk_32.S index fee6bc79b987..c38852758d41 100644 --- a/arch/x86/entry/thunk_32.S +++ b/arch/x86/entry/thunk_32.S @@ -10,8 +10,7 @@ /* put return address in eax (arg1) */ .macro THUNK name, func, put_ret_addr_in_eax=0 - .globl \name -\name: +SYM_FUNC_START(\name) pushl %eax pushl %ecx pushl %edx @@ -27,6 +26,7 @@ popl %eax ret _ASM_NOKPROBE(\name) +SYM_FUNC_END(\name) .endm #ifdef CONFIG_TRACE_IRQFLAGS diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S index be36bf4e0957..38b76f5b097d 100644 --- a/arch/x86/entry/thunk_64.S +++ b/arch/x86/entry/thunk_64.S @@ -12,9 +12,7 @@ /* rdi: arg1 ... normal C conventions. rax is saved/restored. */ .macro THUNK name, func, put_ret_addr_in_rdi=0 - .globl \name - .type \name, @function -\name: +SYM_FUNC_START(\name) pushq %rbp movq %rsp, %rbp @@ -36,6 +34,7 @@ call \func jmp .L_restore _ASM_NOKPROBE(\name) +SYM_FUNC_END(\name) .endm #ifdef CONFIG_TRACE_IRQFLAGS -- 2.12.2
| |