diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 16:03:37 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 16:03:37 +0400 |
| commit | 73e6d6c6467771838c1fc6949e6768a12ed72464 (patch) | |
| tree | 94dd60891869a0a275cd332c4e675cf0b101fcfa /arch/sparc/kernel/windows.c | |
| parent | 12e5272585901217e919da810c801e5084ee0cb1 (diff) | |
| parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
| download | linux-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.xz | |
Merge branch 'master' into upstream
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 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(); } |