diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-06 19:11:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-06 19:11:17 -0700 |
| commit | 12e94471b2be5ef9b55b10004a3a2cd819490036 (patch) | |
| tree | f84ae818687dc7c35bd54f11bfb9717278d28a4e /arch/sparc/kernel/windows.c | |
| parent | 79315068f4560f3f7bd6e9790190dcb43059770c (diff) | |
| parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) | |
| download | kernel_samsung_smdk4412-12e94471b2be5ef9b55b10004a3a2cd819490036.zip kernel_samsung_smdk4412-12e94471b2be5ef9b55b10004a3a2cd819490036.tar.gz kernel_samsung_smdk4412-12e94471b2be5ef9b55b10004a3a2cd819490036.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc/kernel/windows.c')
| -rw-r--r-- | arch/sparc/kernel/windows.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c index f24d298..b351770 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(); } |