Commit 7a895f53 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace',... 

Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tracing/nmisafe', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core
parents d9e54076 5d9881ea fd3fdf11 a26a2a27 127cafbb c2c80529

arch/arm/include/asm/ftrace.h

+5 −0
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

+5 −0
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

+5 −0
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

+5 −0
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/Kconfig.debug

+0 −4
Original line number Diff line number Diff line
@@ -186,14 +186,10 @@ config IOMMU_LEAK 
	  Add a simple leak tracer to the IOMMU code. This is useful when you

	  are debugging a buggy device driver that leaks IOMMU mappings.



config MMIOTRACE_HOOKS

	bool



config MMIOTRACE

	bool "Memory mapped IO tracing"

	depends on DEBUG_KERNEL && PCI

	select TRACING

	select MMIOTRACE_HOOKS

	help

	  Mmiotrace traces Memory Mapped I/O access and is meant for

	  debugging and reverse engineering. It is called from the ioremap