swsusp: finally solve mysqld problem
RFC 1/1 swsusp: finally solve mysqld problem
Move userland freezing into more logical place. It now hits even with mysqld running.
(Rafael, I'm a bit afraid this will clash with your refrigerator changes, plus I'm lazy and don't -mm here. Do you think you could forward it to akpm?)
Signed-off-by Pavel Machek <[email protected]>
arch/i386/kernel/signal.c +0 -4
@@ -582,9 +582,6 @@ static void fastcall do_signal(struct ptif (!user_mode (regs))return ; -if (try_to_freeze ()) - goto no_signal; -if (test_thread_flag (TIF_RESTORE_SIGMASK )) oldset = ¤t->saved_sigmask;else
@@ -613,7 +610,6 @@ static void fastcall do_signal(struct ptreturn ; } -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
@@ -443,9 +443,6 @@ int do_signal(struct pt_regs *regs, sigsif (!user_mode (regs))return 1 ; -if (try_to_freeze ()) - goto no_signal; -if (!oldset) oldset = ¤t->blocked;
@@ -463,7 +460,6 @@ int do_signal(struct pt_regs *regs, sigsreturn 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
@@ -1922,6 +1922,8 @@ int get_signal_to_deliver(siginfo_t *infsigset_t *mask = ¤t->blocked;int signr =0 ; +try_to_freeze (); + relock:spin_lock_irq (¤t->sighand->siglock);for (;;) {
@@ -2307,7 +2309,6 @@ sys_rt_sigtimedwait(const sigset_t __use timeout =schedule_timeout_interruptible (timeout); -try_to_freeze ();spin_lock_irq (¤t->sighand->siglock); sig =dequeue_signal (current, &these, &info); current->blocked = current->real_blocked;
Signature · 1 line
Thanks, Sharp!