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.

diff --combined arch/sparc/kernel/sys_sparc_32.c
index 50794137d710d71bfa197cbb055d14377f2cd770,de45de4851e90757c6a998576f70d9f1fc7b1b80..675c9e11ada5541085e2fd6e6129272c05713df4
--- 1/arch/sparc/kernel/sys_sparc_32.c
--- 2/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
@@@ -166,7 -166,6 +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 +179,6 @@@
  #ifdef DEBUG_SPARC_BREAKPOINT
        printk ("TRAP: Returning to space: PC=%x nPC=%x\n", regs->pc, regs->npc);
  #endif
-       unlock_kernel();
  }
  
  asmlinkage int
@@@ -282,9 -280,7 +280,9 @@@ out
   * Do a system call from kernel instead of calling sys_execve so we
   * end up with proper pt_regs.
   */
 -int kernel_execve(const char *filename, char *const argv[], char *const envp[])
 +int kernel_execve(const char *filename,
 +                const char *const argv[],
 +                const char *const envp[])
  {
        long __res;
        register long __g1 __asm__ ("g1") = __NR_execve;