From: Török Edwin <edwintorok@gmail.com>
Date: Fri, 28 Nov 2008 09:17:56 +0000 (+0200)
Subject: tracing, alpha: fix build: add missing #ifdef CONFIG_STACKTRACE
X-Git-Tag: v2.6.29-rc1~586^2~38^7~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c7425acb42fff1e723b05fbf4ea11e9a455d95dc;p=linux-2.6-omap-h63xx.git

tracing, alpha: fix build: add missing #ifdef CONFIG_STACKTRACE

There are architectures that still have no stacktrace support.

Signed-off-by: Török Edwin <edwintorok@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5811e0a5f73..91887a280ab 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -983,6 +983,7 @@ static void ftrace_trace_userstack(struct trace_array *tr,
 		   struct trace_array_cpu *data,
 		   unsigned long flags, int pc)
 {
+#ifdef CONFIG_STACKTRACE
 	struct ring_buffer_event *event;
 	struct userstack_entry *entry;
 	struct stack_trace trace;
@@ -1008,6 +1009,7 @@ static void ftrace_trace_userstack(struct trace_array *tr,
 
 	save_stack_trace_user(&trace);
 	ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
+#endif
 }
 
 void __trace_userstack(struct trace_array *tr,