summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRakib Mullick <rakib.mullick@gmail.com>2009-02-14 06:36:00 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-15 22:41:08 +0300
commita234aa9ecdf47a5461573a21dc0b154278df5ba8 (patch)
tree35b53e048a4298e43de45883b446303ba17daee9
parent9abd60304816a5b0fd9e51034f78e3eaed89f901 (diff)
downloadlinux-a234aa9ecdf47a5461573a21dc0b154278df5ba8.tar.xz
tracing: fix section mismatch in trace_hw_branches.c
The function bts_trace_init() references a variable bts_hotcpu_notifier which is marked as __cpuinitdata. Thus causes section mismatch. This patch fixes it. LD kernel/trace/built-in.o WARNING: kernel/trace/built-in.o(.text+0xc90c): Section mismatch in reference from the function bts_trace_init() to the variable .cpuinit.data:bts_hotcpu_notifier The function bts_trace_init() references the variable __cpuinitdata bts_hotcpu_notifier. This is often because bts_trace_init lacks a __cpuinitdata annotation or the annotation of bts_hotcpu_notifier is wrong. WARNING: kernel/trace/built-in.o(.text+0xc92a): Section mismatch in reference from the function bts_trace_reset() to the variable .cpuinit.data:bts_hotcpu_notifier The function bts_trace_reset() references the variable __cpuinitdata bts_hotcpu_notifier. This is often because bts_trace_reset lacks a __cpuinitdata annotation or the annotation of bts_hotcpu_notifier is wrong. Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com> Cc: markus.t.metzger@gmail.com Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/trace_hw_branches.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index 0794dd33f27b..3561aace075c 100644
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -127,7 +127,7 @@ static struct notifier_block bts_hotcpu_notifier __cpuinitdata = {
.notifier_call = bts_hotcpu_handler
};
-static int bts_trace_init(struct trace_array *tr)
+static int __cpuinit bts_trace_init(struct trace_array *tr)
{
hw_branch_trace = tr;
@@ -137,7 +137,7 @@ static int bts_trace_init(struct trace_array *tr)
return 0;
}
-static void bts_trace_reset(struct trace_array *tr)
+static void __cpuinit bts_trace_reset(struct trace_array *tr)
{
bts_trace_stop(tr);
unregister_hotcpu_notifier(&bts_hotcpu_notifier);