[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>

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index ea154104a00b..dfb09ba5c013 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -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;