Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a26a2a27 authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

ftrace: nmi safe code clean ups 



Impact: cleanup

This patch cleans up the NMI safe code for dynamic ftrace as suggested
by Andrew Morton.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b807c3d0

arch/arm/include/asm/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define _ASM_ARM_FTRACE



#ifndef __ASSEMBLY__

#define ftrace_nmi_enter()	do { } while (0)

#define ftrace_nmi_exit()	do { } while (0)

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifdef CONFIG_FUNCTION_TRACER

arch/powerpc/include/asm/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define _ASM_POWERPC_FTRACE



#ifndef __ASSEMBLY__

#define ftrace_nmi_enter()	do { } while (0)

#define ftrace_nmi_exit()	do { } while (0)

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifdef CONFIG_FUNCTION_TRACER

arch/sh/include/asm/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define __ASM_SH_FTRACE_H



#ifndef __ASSEMBLY__

#define ftrace_nmi_enter()	do { } while (0)

#define ftrace_nmi_exit()	do { } while (0)

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifndef __ASSEMBLY__

arch/sparc/include/asm/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define _ASM_SPARC64_FTRACE



#ifndef __ASSEMBLY__

#define ftrace_nmi_enter()	do { } while (0)

#define ftrace_nmi_exit()	do { } while (0)

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifdef CONFIG_MCOUNT

arch/x86/include/asm/ftrace.h

+5 −5
Original line number Diff line number Diff line
@@ -22,16 +22,16 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) 
extern void ftrace_nmi_enter(void);

extern void ftrace_nmi_exit(void);

#else

#define ftrace_nmi_enter()	do { } while (0)

#define ftrace_nmi_exit()	do { } while (0)

#endif

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif

#endif /* __ASSEMBLY__ */



#else /* CONFIG_FUNCTION_TRACER */



#ifndef __ASSEMBLY__

#define ftrace_nmi_enter()	do { } while (0)

#define ftrace_nmi_exit()	do { } while (0)

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#endif /* CONFIG_FUNCTION_TRACER */