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

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

ftrace: fix hardirq header for non ftrace archs 



Impact: build fix for non-ftrace architectures

Not all archs implement ftrace, and therefore do not have an asm/ftrace.h.
This patch corrects the problem.

The ftrace_nmi_enter/exit now must be defined for all archs that implement
dynamic ftrace. Currently, only x86 does.

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

arch/arm/include/asm/ftrace.h

+0 −5
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_FTRACE

#define _ASM_ARM_FTRACE



#ifndef __ASSEMBLY__

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifdef CONFIG_FUNCTION_TRACER

#define MCOUNT_ADDR		((long)(mcount))

#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */

arch/powerpc/include/asm/ftrace.h

+0 −5
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_FTRACE

#define _ASM_POWERPC_FTRACE



#ifndef __ASSEMBLY__

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifdef CONFIG_FUNCTION_TRACER

#define MCOUNT_ADDR		((long)(_mcount))

#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */

arch/sh/include/asm/ftrace.h

+0 −5
Original line number Diff line number Diff line 
#ifndef __ASM_SH_FTRACE_H

#define __ASM_SH_FTRACE_H



#ifndef __ASSEMBLY__

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifndef __ASSEMBLY__

extern void mcount(void);

#endif

arch/sparc/include/asm/ftrace.h

+0 −5
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC64_FTRACE

#define _ASM_SPARC64_FTRACE



#ifndef __ASSEMBLY__

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#ifdef CONFIG_MCOUNT

#define MCOUNT_ADDR		((long)(_mcount))

#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */

arch/x86/include/asm/ftrace.h

+0 −16
Original line number Diff line number Diff line
@@ -17,23 +17,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) 
	 */

	return addr - 1;

}



#ifdef CONFIG_DYNAMIC_FTRACE

extern void ftrace_nmi_enter(void);

extern void ftrace_nmi_exit(void);

#else

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif

#endif /* __ASSEMBLY__ */



#else /* CONFIG_FUNCTION_TRACER */



#ifndef __ASSEMBLY__

static inline void ftrace_nmi_enter(void) { }

static inline void ftrace_nmi_exit(void) { }

#endif



#endif /* CONFIG_FUNCTION_TRACER */



#endif /* _ASM_X86_FTRACE_H */