Commit 10d90f28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents aad1830e b19f8200

arch/sparc/kernel/sys_sparc_32.c

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/sparc/kernel/unaligned_32.c

+1 −2
Original line number Diff line number Diff line
@@ -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();

	;

}

arch/sparc/kernel/windows.c

+0 −2
Original line number Diff line number Diff line
@@ -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();

}