Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

1 files changed, 0 insertions, 2 deletions

diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c
index f24d298bda29..b351770cbdd6 100644
--- a/arch/sparc/kernel/windows.c
+++ b/arch/sparc/kernel/windows.c
@@ -112,7 +112,6 @@ void try_to_clear_window_buffer(struct pt_regs *regs, int who)
         struct thread_info *tp = current_thread_info();
         int window;
 
-        lock_kernel();
         flush_user_windows();
         for(window = 0; window < tp->w_saved; window++) {
                 unsigned long sp = tp->rwbuf_stkptrs[window];
@@ -123,5 +122,4 @@ void try_to_clear_window_buffer(struct pt_regs *regs, int who)
                         do_exit(SIGILL);
         }
         tp->w_saved = 0;
-        unlock_kernel();
 }