From 24be05a085b4bd0308bb60fd76b4520fd1d6a09b Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 11:29:53 +0100
Subject: [PATCH] --- yaml --- r: 140741 b: refs/heads/master c:
 c4e2b432d5b57e2faaeea048079b31c243079647 h: refs/heads/master i:   140739:
 b039ef26238bf0a2f871c9d019d0f7130401bc6b v: v3

---
 [refs]                                 | 2 +-
 trunk/kernel/trace/trace_hw_branches.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eb87327c030a..25bb27bce0dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72b623c73685e86b70a51855e1058ebc98a9f6ed
+refs/heads/master: c4e2b432d5b57e2faaeea048079b31c243079647
diff --git a/trunk/kernel/trace/trace_hw_branches.c b/trunk/kernel/trace/trace_hw_branches.c
index 0794dd33f27b..3561aace075c 100644
--- a/trunk/kernel/trace/trace_hw_branches.c
+++ b/trunk/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);