Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc558a74 authored Mar 23, 2006 by Rafael J. Wysocki Committed by Linus Torvalds Mar 23, 2006

[PATCH] swsusp: finally solve mysqld problem



This patch from Pavel moves userland freeze signals handling into more logical
place.  It now hits even with mysqld running.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent ce6ed29f

arch/i386/kernel/signal.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -583,9 +583,6 @@ static void fastcall do_signal(struct pt_regs *regs)
		if (!user_mode(regs))
		return;

		if (try_to_freeze())
		goto no_signal;

		if (test_thread_flag(TIF_RESTORE_SIGMASK))
		oldset = &current->saved_sigmask;
		else
		@@ -614,7 +611,6 @@ static void fastcall do_signal(struct pt_regs *regs)
		return;
		}

		no_signal:
		/* Did we come from a system call? */
		if (regs->orig_eax >= 0) {
		/* Restart the system call - no handlers present */

arch/x86_64/kernel/signal.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -443,9 +443,6 @@ int do_signal(struct pt_regs regs, sigset_t oldset)
		if (!user_mode(regs))
		return 1;

		if (try_to_freeze())
		goto no_signal;

		if (!oldset)
		oldset = &current->blocked;

		@@ -463,7 +460,6 @@ int do_signal(struct pt_regs regs, sigset_t oldset)
		return handle_signal(signr, &info, &ka, oldset, regs);
		}

		no_signal:
		/* Did we come from a system call? */
		if ((long)regs->orig_rax >= 0) {
		/* Restart the system call - no handlers present */

kernel/signal.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1922,6 +1922,8 @@ int get_signal_to_deliver(siginfo_t info, struct k_sigaction return_ka,
		sigset_t *mask = &current->blocked;
		int signr = 0;

		try_to_freeze();

		relock:
		spin_lock_irq(&current->sighand->siglock);
		for (;;) {
		@@ -2307,7 +2309,6 @@ sys_rt_sigtimedwait(const sigset_t __user *uthese,

		timeout = schedule_timeout_interruptible(timeout);

		try_to_freeze();
		spin_lock_irq(&current->sighand->siglock);
		sig = dequeue_signal(current, &these, &info);
		current->blocked = current->real_blocked;