Commit 3197dac2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Handle -ERESTART_RESTARTBLOCK for restartable syscalls.
  sh: oops_enter()/oops_exit() in die().
  sh: Fix restartable syscall arg5 clobbering.
parents 710675d3 3aeb884b

arch/sh/kernel/signal.c

+6 −3
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 


static int

handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,

	      sigset_t *oldset, struct pt_regs *regs)

	      sigset_t *oldset, struct pt_regs *regs, unsigned int save_r0)

{

	int ret;
@@ -489,6 +489,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, 
	if (regs->tra >= 0) {

		/* If so, check system call restarting.. */

		switch (regs->regs[0]) {

			case -ERESTART_RESTARTBLOCK:

			case -ERESTARTNOHAND:

				regs->regs[0] = -EINTR;

				break;
@@ -500,6 +501,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, 
				}

			/* fallthrough */

			case -ERESTARTNOINTR:

				regs->regs[0] = save_r0;

				regs->pc -= instruction_size(

						ctrl_inw(regs->pc - 4));

				break;
@@ -583,7 +585,8 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0) 
	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (signr > 0) {

		/* Whee!  Actually deliver the signal.  */

		if (handle_signal(signr, &ka, &info, oldset, regs) == 0) {

		if (handle_signal(signr, &ka, &info, oldset,

				  regs, save_r0) == 0) {

			/* a signal was successfully delivered; the saved

			 * sigmask will have been stored in the signal frame,

			 * and will be restored by sigreturn, so we can simply

arch/sh/kernel/traps.c

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ void die(const char * str, struct pt_regs * regs, long err) 
{

	static int die_counter;



	oops_enter();



	console_verbose();

	spin_lock_irq(&die_lock);

	bust_spinlocks(1);
@@ -112,6 +114,7 @@ void die(const char * str, struct pt_regs * regs, long err) 
	if (panic_on_oops)

		panic("Fatal exception");



	oops_exit();

	do_exit(SIGSEGV);

}