diff options
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 21 | 
1 files changed, 5 insertions, 16 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 429dcebe2b99..0f7fd205ab7e 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -117,14 +117,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,   */  #define __stringify_label(n) #n -#define __annotate_reachable(c) ({					\ -	asm volatile(__stringify_label(c) ":\n\t"			\ -		     ".pushsection .discard.reachable\n\t"		\ -		     ".long " __stringify_label(c) "b - .\n\t"		\ -		     ".popsection\n\t" : : "i" (c));			\ -}) -#define annotate_reachable() __annotate_reachable(__COUNTER__) -  #define __annotate_unreachable(c) ({					\  	asm volatile(__stringify_label(c) ":\n\t"			\  		     ".pushsection .discard.unreachable\n\t"		\ @@ -133,24 +125,21 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,  })  #define annotate_unreachable() __annotate_unreachable(__COUNTER__) -#define ASM_UNREACHABLE							\ -	"999:\n\t"							\ -	".pushsection .discard.unreachable\n\t"				\ -	".long 999b - .\n\t"						\ +#define ASM_REACHABLE							\ +	"998:\n\t"							\ +	".pushsection .discard.reachable\n\t"				\ +	".long 998b - .\n\t"						\  	".popsection\n\t"  /* Annotate a C jump table to allow objtool to follow the code flow */  #define __annotate_jump_table __section(".rodata..c_jump_table")  #else -#define annotate_reachable()  #define annotate_unreachable() +# define ASM_REACHABLE  #define __annotate_jump_table  #endif -#ifndef ASM_UNREACHABLE -# define ASM_UNREACHABLE -#endif  #ifndef unreachable  # define unreachable() do {		\  	annotate_unreachable();		\  | 
