aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/windows.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-11 08:01:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-11 08:01:09 -0700
commit10d90f28033fbd97e86c0cde4c99214165547a4b (patch)
treedc750b7f2e7c39fb4900e96f9967a2745316991e /arch/sparc/kernel/windows.c
parentaad1830e6b978f5d90e5d81d071e1752f526f732 (diff)
parentb19f8200392db88d529576a4f8178d08b70047be (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Kill all BKL usage.
Diffstat (limited to 'arch/sparc/kernel/windows.c')
-rw-r--r--arch/sparc/kernel/windows.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c
index f24d298bda2..b351770cbdd 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();
}