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

Commit 0b54968f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ftrace: fix trace_nop config select
  ftrace: perform an initialization for ftrace to enable it
parents effdb949 f3384b28

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ config NOP_TRACER 


config HAVE_FUNCTION_TRACER

	bool

	select NOP_TRACER



config HAVE_DYNAMIC_FTRACE

	bool
@@ -28,6 +27,7 @@ config TRACING 
	select RING_BUFFER

	select STACKTRACE

	select TRACEPOINTS

	select NOP_TRACER



menu "Tracers"

kernel/trace/ftrace.c

+8 −0
Original line number Diff line number Diff line
@@ -1339,6 +1339,14 @@ void __init ftrace_init(void) 
}



#else



static int __init ftrace_nodyn_init(void)

{

	ftrace_enabled = 1;

	return 0;

}

device_initcall(ftrace_nodyn_init);



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

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

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