Browse Source

ftrace: let notrace function attribute disable hotpatching if necessary

gcc supports an s390 specific function attribute called "hotpatch".
It can be used to specify the number of halfwords that shall be added before
and after a function and which shall be filled with nops for runtime patching.

s390 will use the hotpatch attribute for function tracing, therefore make
sure that the notrace function attribute either disables the mcount call
or in case of hotpatch nop generation.

Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Heiko Carstens 10 years ago
parent
commit
61f552141c
1 changed files with 4 additions and 0 deletions
  1. 4 0
      include/linux/compiler.h

+ 4 - 0
include/linux/compiler.h

@@ -54,7 +54,11 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 #include <linux/compiler-gcc.h>
 #include <linux/compiler-gcc.h>
 #endif
 #endif
 
 
+#ifdef CC_USING_HOTPATCH
+#define notrace __attribute__((hotpatch(0,0)))
+#else
 #define notrace __attribute__((no_instrument_function))
 #define notrace __attribute__((no_instrument_function))
+#endif
 
 
 /* Intel compiler defines __GNUC__. So we will overwrite implementations
 /* Intel compiler defines __GNUC__. So we will overwrite implementations
  * coming from above header files here
  * coming from above header files here