Commit 122679eb authored by Josh Poimboeuf's avatar Josh Poimboeuf
Browse files

x86/kprobes: Remove STACK_FRAME_NON_STANDARD annotation 



Since commit 877b145f ("x86/kprobes: Move trampoline code into
RODATA"), the optprobe template code is no longer analyzed by objtool so
it doesn't need to be ignored.

Acked-by: default avatarPetr Mladek <pmladek@suse.com>
Tested-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
parent bf770d6d

arch/x86/kernel/kprobes/opt.c

+0 −4
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val) 


asm (

			".pushsection .rodata\n"

			"optprobe_template_func:\n"

			".global optprobe_template_entry\n"

			"optprobe_template_entry:\n"

#ifdef CONFIG_X86_64
@@ -160,9 +159,6 @@ asm ( 
			"optprobe_template_end:\n"

			".popsection\n");



void optprobe_template_func(void);

STACK_FRAME_NON_STANDARD(optprobe_template_func);



#define TMPL_CLAC_IDX \

	((long)optprobe_template_clac - (long)optprobe_template_entry)

#define TMPL_MOVE_IDX \