---

yaml
---
r: 146207
b: refs/heads/master
c: 0f6ce3d
h: refs/heads/master
i:
  146205: 203b279
  146203: 2c794e9
  146199: 0c6c958
  146191: b357649
  146175: 16d1fe1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 112f38a7e36e9d688b389507136bf3af3e6d159b
+refs/heads/master: 0f6ce3de4ef6ff940308087c49760d068851c1a7

trunk/kernel/trace/ftrace.c

@@ -599,7 +599,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
 	local_irq_save(flags);
 
 	stat = &__get_cpu_var(ftrace_profile_stats);
-	if (!stat->hash)
+	if (!stat->hash || !ftrace_profile_enabled)
 		goto out;
 
 	rec = ftrace_find_profiled_func(stat, ip);
@@ -630,7 +630,7 @@ static void profile_graph_return(struct ftrace_graph_ret *trace)
 
 	local_irq_save(flags);
 	stat = &__get_cpu_var(ftrace_profile_stats);
-	if (!stat->hash)
+	if (!stat->hash || !ftrace_profile_enabled)
 		goto out;
 
 	calltime = trace->rettime - trace->calltime;
@@ -724,6 +724,10 @@ ftrace_profile_write(struct file *filp, const char __user *ubuf,
 			ftrace_profile_enabled = 1;
 		} else {
 			ftrace_profile_enabled = 0;
+			/*
+			 * unregister_ftrace_profiler calls stop_machine
+			 * so this acts like an synchronize_sched.
+			 */
 			unregister_ftrace_profiler();
 		}
 	}