Commit 9720d753 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc 

* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
  signal: sys_pause() should check signal_pending()
  ptrace: ptrace_resume() shouldn't wake up !TASK_TRACED thread
parents 0c63e38a d92fcf05

kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static int ptrace_resume(struct task_struct *child, long request, 
	}



	child->exit_code = data;

	wake_up_process(child);

	wake_up_state(child, __TASK_TRACED);



	return 0;

}

kernel/signal.c

+4 −2
Original line number Diff line number Diff line
@@ -3023,8 +3023,10 @@ SYSCALL_DEFINE2(signal, int, sig, __sighandler_t, handler) 


SYSCALL_DEFINE0(pause)

{

	while (!signal_pending(current)) {

		current->state = TASK_INTERRUPTIBLE;

		schedule();

	}

	return -ERESTARTNOHAND;

}