diff options
authorLinus Torvalds <>2013-12-20 09:32:30 -0800
committerLinus Torvalds <>2013-12-20 09:32:30 -0800
commit5263f0a88076ab32b3120356645734918bdc1700 (patch)
parentf7556698a36995a755a4ce154953dcf438145b3b (diff)
parentc4602c1c818bd6626178d6d3fcc152d9f2f48ac0 (diff)
Merge tag 'trace-fixes-v3.13-rc2' of git://
Pull ftrace fix from Steven Rostedt: "This fixes a long standing bug in the ftrace profiler. The problem is that the profiler only initializes the online CPUs, and not possible CPUs. This causes issues if the user takes CPUs online or offline while the profiler is running. If we online a CPU after starting the profiler, we lose all the trace information on the CPU going online. If we offline a CPU after running a test and start a new test, it will not clear the old data from that CPU. This bug causes incorrect data to be reported to the user if they online or offline CPUs during the profiling" * tag 'trace-fixes-v3.13-rc2' of git:// ftrace: Initialize the ftrace profiler for each possible cpu
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 0e9f9eaade2f..72a0f81dc5a8 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -775,7 +775,7 @@ static int ftrace_profile_init(void)
int cpu;
int ret = 0;
- for_each_online_cpu(cpu) {
+ for_each_possible_cpu(cpu) {
ret = ftrace_profile_init_cpu(cpu);
if (ret)