Skip to content

Commit

Permalink
x86, ftrace: fix section mismatch in hw-branch-tracer
Browse files Browse the repository at this point in the history
Fix an invalid memory reference problem when cpu hotplug support is
disabled and the hw-branch-tracer is set as current tracer.

Initializing the tracer calls bts_trace_init() which has already
been freed at this time.

Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Markus Metzger authored and Ingo Molnar committed Feb 24, 2009
1 parent a7f4463 commit 5e01cb6
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions kernel/trace/trace_hw_branches.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,18 @@ static struct notifier_block bts_hotcpu_notifier __cpuinitdata = {
.notifier_call = bts_hotcpu_handler
};

static int __cpuinit bts_trace_init(struct trace_array *tr)
static int bts_trace_init(struct trace_array *tr)
{
hw_branch_trace = tr;

register_hotcpu_notifier(&bts_hotcpu_notifier);
bts_trace_start(tr);

return 0;
}

static void __cpuinit bts_trace_reset(struct trace_array *tr)
static void bts_trace_reset(struct trace_array *tr)
{
bts_trace_stop(tr);
unregister_hotcpu_notifier(&bts_hotcpu_notifier);
}

static void bts_trace_print_header(struct seq_file *m)
Expand Down Expand Up @@ -299,6 +297,7 @@ struct tracer bts_tracer __read_mostly =

__init static int init_bts_trace(void)
{
register_hotcpu_notifier(&bts_hotcpu_notifier);
return register_tracer(&bts_tracer);
}
device_initcall(init_bts_trace);

0 comments on commit 5e01cb6

Please sign in to comment.