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/unaligned_32.c | |
| parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | sparc: Kill all BKL usage. (diff) | |
| download | linux-dev-10d90f28033fbd97e86c0cde4c99214165547a4b.tar.xz linux-dev-10d90f28033fbd97e86c0cde4c99214165547a4b.zip | |
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/unaligned_32.c')
| -rw-r--r-- | arch/sparc/kernel/unaligned_32.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) { enum direction dir; - lock_kernel(); if(!(current->thread.flags & SPARC_FLAG_UNALIGNED) || (((insn >> 30) & 3) != 3)) goto kill_user; @@ -377,5 +376,5 @@ asmlinkage void user_unaligned_trap(struct pt_regs *regs, unsigned int insn) kill_user: user_mna_trap_fault(regs, insn); out: - unlock_kernel(); + ; } |