diff options
author | David S. Miller <davem@davemloft.net> | 2010-09-08 23:57:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-08 23:57:59 -0400 |
commit | b19f8200392db88d529576a4f8178d08b70047be (patch) | |
tree | fcfdbc9de62c614e2ccdc8adcab021aaa60bbb5c /arch | |
parent | 25edd6946a1d74e5e77813c2324a0908c68bcf9e (diff) |
sparc: Kill all BKL usage.
They were all bogus artifacts and completely unnecessary.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/sys_sparc_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/unaligned_32.c | 3 | ||||
-rw-r--r-- | arch/sparc/kernel/windows.c | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c index ee995b7dae7e..de45de4851e9 100644 --- a/arch/sparc/kernel/sys_sparc_32.c +++ b/arch/sparc/kernel/sys_sparc_32.c | |||
@@ -166,7 +166,6 @@ sparc_breakpoint (struct pt_regs *regs) | |||
166 | { | 166 | { |
167 | siginfo_t info; | 167 | siginfo_t info; |
168 | 168 | ||
169 | lock_kernel(); | ||
170 | #ifdef DEBUG_SPARC_BREAKPOINT | 169 | #ifdef DEBUG_SPARC_BREAKPOINT |
171 | printk ("TRAP: Entering kernel PC=%x, nPC=%x\n", regs->pc, regs->npc); | 170 | printk ("TRAP: Entering kernel PC=%x, nPC=%x\n", regs->pc, regs->npc); |
172 | #endif | 171 | #endif |
@@ -180,7 +179,6 @@ sparc_breakpoint (struct pt_regs *regs) | |||
180 | #ifdef DEBUG_SPARC_BREAKPOINT | 179 | #ifdef DEBUG_SPARC_BREAKPOINT |
181 | printk ("TRAP: Returning to space: PC=%x nPC=%x\n", regs->pc, regs->npc); | 180 | printk ("TRAP: Returning to space: PC=%x nPC=%x\n", regs->pc, regs->npc); |
182 | #endif | 181 | #endif |
183 | unlock_kernel(); | ||
184 | } | 182 | } |
185 | 183 | ||
186 | asmlinkage int | 184 | asmlinkage int |
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c index f8514e291e15..12b9f352595f 100644 --- a/arch/sparc/kernel/unaligned_32.c +++ b/arch/sparc/kernel/unaligned_32.c | |||
@@ -323,7 +323,6 @@ asmlinkage void user_unaligned_trap(struct pt_regs *regs, unsigned int insn) | |||
323 | { | 323 | { |
324 | enum direction dir; | 324 | enum direction dir; |
325 | 325 | ||
326 | lock_kernel(); | ||
327 | if(!(current->thread.flags & SPARC_FLAG_UNALIGNED) || | 326 | if(!(current->thread.flags & SPARC_FLAG_UNALIGNED) || |
328 | (((insn >> 30) & 3) != 3)) | 327 | (((insn >> 30) & 3) != 3)) |
329 | goto kill_user; | 328 | goto kill_user; |
@@ -377,5 +376,5 @@ asmlinkage void user_unaligned_trap(struct pt_regs *regs, unsigned int insn) | |||
377 | kill_user: | 376 | kill_user: |
378 | user_mna_trap_fault(regs, insn); | 377 | user_mna_trap_fault(regs, insn); |
379 | out: | 378 | out: |
380 | unlock_kernel(); | 379 | ; |
381 | } | 380 | } |
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) | |||
112 | struct thread_info *tp = current_thread_info(); | 112 | struct thread_info *tp = current_thread_info(); |
113 | int window; | 113 | int window; |
114 | 114 | ||
115 | lock_kernel(); | ||
116 | flush_user_windows(); | 115 | flush_user_windows(); |
117 | for(window = 0; window < tp->w_saved; window++) { | 116 | for(window = 0; window < tp->w_saved; window++) { |
118 | unsigned long sp = tp->rwbuf_stkptrs[window]; | 117 | unsigned long sp = tp->rwbuf_stkptrs[window]; |
@@ -123,5 +122,4 @@ void try_to_clear_window_buffer(struct pt_regs *regs, int who) | |||
123 | do_exit(SIGILL); | 122 | do_exit(SIGILL); |
124 | } | 123 | } |
125 | tp->w_saved = 0; | 124 | tp->w_saved = 0; |
126 | unlock_kernel(); | ||
127 | } | 125 | } |