- Introduce _GLOBAL_SYM() for global symbols in assembly. This helps reduce verbosity of assembly files. - Introduce NOKPROBE variants of _GLOBAL() and _GLOBAL_SYM(). These are used subsequently to blacklist certain assembly functions and symbols from kprobe. - Fix a small typo in kprobe comment and re-format it, to make it clearer.
Signed-off-by: Naveen N. Rao <naveen.n....@linux.vnet.ibm.com> --- arch/powerpc/include/asm/ppc_asm.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index 025833b..2443545 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -254,13 +254,19 @@ GLUE(.,name): #endif +#define _GLOBAL_SYM(name) \ + .globl name; \ +name: + /* * __kprobes (the C annotation) puts the symbol into the .kprobes.text * section, which gets emitted at the end of regular text. * * _ASM_NOKPROBE_SYMBOL and NOKPROBE_SYMBOL just adds the symbol to - * a blacklist. The former is for core kprobe functions/data, the - * latter is for those that incdentially must be excluded from probing + * a blacklist. + * + * The former (__kprobes) is for core kprobe functions/data, the + * latter is for those that incidentally must be excluded from probing * and allows them to be linked at more optimal location within text. */ #ifdef CONFIG_KPROBES @@ -272,6 +278,15 @@ GLUE(.,name): #define _ASM_NOKPROBE_SYMBOL(entry) #endif +#define _GLOBAL_NOKPROBE(name) \ + _GLOBAL(name); \ + _ASM_NOKPROBE_SYMBOL(name) + +#define _GLOBAL_SYM_NOKPROBE(name) \ + _GLOBAL_SYM(name); \ + _ASM_NOKPROBE_SYMBOL(name) + + #define FUNC_START(name) _GLOBAL(name) #define FUNC_END(name) -- 2.10.2