From 9664ed1f9caaadda84e17db2e6137f0c5f3c9f9c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 23 May 2008 23:50:41 +0200
Subject: [PATCH] --- yaml --- r: 100633 b: refs/heads/master c:
 ada6b835067dc022f11cdae1c313a3710d3d977c h: refs/heads/master i:   100631:
 8f5937b10fc3afba10102b04a5242edb9b0ea27b v: v3

---
 [refs]                             |  2 +-
 trunk/kernel/trace/trace_sysprof.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e26acd2b1f65..27b6565c9e14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d618b3e6e50970a6248ac857653fdd49bcd3c045
+refs/heads/master: ada6b835067dc022f11cdae1c313a3710d3d977c
diff --git a/trunk/kernel/trace/trace_sysprof.c b/trunk/kernel/trace/trace_sysprof.c
index 19406236b67b..3b1e4ba9180d 100644
--- a/trunk/kernel/trace/trace_sysprof.c
+++ b/trunk/kernel/trace/trace_sysprof.c
@@ -155,7 +155,7 @@ static void stop_stack_timers(void)
 		stop_stack_timer(cpu);
 }
 
-static notrace void stack_reset(struct trace_array *tr)
+static void stack_reset(struct trace_array *tr)
 {
 	int cpu;
 
@@ -165,7 +165,7 @@ static notrace void stack_reset(struct trace_array *tr)
 		tracing_reset(tr->data[cpu]);
 }
 
-static notrace void start_stack_trace(struct trace_array *tr)
+static void start_stack_trace(struct trace_array *tr)
 {
 	mutex_lock(&sample_timer_lock);
 	stack_reset(tr);
@@ -174,7 +174,7 @@ static notrace void start_stack_trace(struct trace_array *tr)
 	mutex_unlock(&sample_timer_lock);
 }
 
-static notrace void stop_stack_trace(struct trace_array *tr)
+static void stop_stack_trace(struct trace_array *tr)
 {
 	mutex_lock(&sample_timer_lock);
 	stop_stack_timers();
@@ -182,7 +182,7 @@ static notrace void stop_stack_trace(struct trace_array *tr)
 	mutex_unlock(&sample_timer_lock);
 }
 
-static notrace void stack_trace_init(struct trace_array *tr)
+static void stack_trace_init(struct trace_array *tr)
 {
 	sysprof_trace = tr;
 
@@ -190,7 +190,7 @@ static notrace void stack_trace_init(struct trace_array *tr)
 		start_stack_trace(tr);
 }
 
-static notrace void stack_trace_reset(struct trace_array *tr)
+static void stack_trace_reset(struct trace_array *tr)
 {
 	if (tr->ctrl)
 		stop_stack_trace(tr);