diff --git a/[refs] b/[refs] index 4b6635fdff13..c16dd2b7695e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e50e7a99d04774506f4e1dee51afba37125cd3c +refs/heads/master: ef2a701d444a4ea9790146e92756b0dde5070a15 diff --git a/trunk/fs/jffs/intrep.c b/trunk/fs/jffs/intrep.c index fc589ddd0762..456d7e6e29c2 100644 --- a/trunk/fs/jffs/intrep.c +++ b/trunk/fs/jffs/intrep.c @@ -3397,6 +3397,9 @@ jffs_garbage_collect_thread(void *ptr) siginfo_t info; unsigned long signr = 0; + if (try_to_freeze()) + continue; + spin_lock_irq(¤t->sighand->siglock); signr = dequeue_signal(current, ¤t->blocked, &info); spin_unlock_irq(¤t->sighand->siglock);