diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 08:01:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 08:01:09 -0700 |
commit | 10d90f28033fbd97e86c0cde4c99214165547a4b (patch) | |
tree | dc750b7f2e7c39fb4900e96f9967a2745316991e /arch/sparc/kernel/sys_sparc_32.c | |
parent | aad1830e6b978f5d90e5d81d071e1752f526f732 (diff) | |
parent | b19f8200392db88d529576a4f8178d08b70047be (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/sys_sparc_32.c')
-rw-r--r-- | arch/sparc/kernel/sys_sparc_32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c index 50794137d71..675c9e11ada 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) { siginfo_t info; - lock_kernel(); #ifdef DEBUG_SPARC_BREAKPOINT printk ("TRAP: Entering kernel PC=%x, nPC=%x\n", regs->pc, regs->npc); #endif @@ -180,7 +179,6 @@ sparc_breakpoint (struct pt_regs *regs) #ifdef DEBUG_SPARC_BREAKPOINT printk ("TRAP: Returning to space: PC=%x nPC=%x\n", regs->pc, regs->npc); #endif - unlock_kernel(); } asmlinkage int |