Răsfoiți Sursa

ftrace: do not init module on ftrace disabled

If one of the self tests of ftrace has disabled the function tracer,
do not run the code to convert the mcount calls in modules.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Steven Rostedt 17 ani în urmă
părinte
comite
00fd61aee1
1 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 2 2
      kernel/trace/ftrace.c

+ 2 - 2
kernel/trace/ftrace.c

@@ -307,7 +307,7 @@ void ftrace_release(void *start, unsigned long size)
 	unsigned long e = s + size;
 	unsigned long e = s + size;
 	int i;
 	int i;
 
 
-	if (!start)
+	if (ftrace_disabled || !start)
 		return;
 		return;
 
 
 	/* No interrupt should call this */
 	/* No interrupt should call this */
@@ -1567,7 +1567,7 @@ static int ftrace_convert_nops(unsigned long *start,
 
 
 void ftrace_init_module(unsigned long *start, unsigned long *end)
 void ftrace_init_module(unsigned long *start, unsigned long *end)
 {
 {
-	if (start == end)
+	if (ftrace_disabled || start == end)
 		return;
 		return;
 	ftrace_convert_nops(start, end);
 	ftrace_convert_nops(start, end);
 }
 }