Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c
index 47f92a59be18..84d39e873e88 100644
--- a/arch/sparc64/kernel/stacktrace.c
+++ b/arch/sparc64/kernel/stacktrace.c
@@ -2,13 +2,15 @@
 #include <linux/stacktrace.h>
 #include <linux/thread_info.h>
 #include <asm/ptrace.h>
+#include <asm/stacktrace.h>
 
 void save_stack_trace(struct stack_trace *trace)
 {
         unsigned long ksp, fp, thread_base;
         struct thread_info *tp = task_thread_info(current);
 
-        flushw_all();
+        stack_trace_flush();
+
         __asm__ __volatile__(
                 "mov    %%fp, %0"
                 : "=r" (ksp)