diff --git a/[refs] b/[refs]
index c5c13f2897a0..f5d454be8a69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 561d9a969455cb009bb15b63e1d925dc527e7a9d
+refs/heads/master: e136e769d471e7f3d24a8f6bf9c91dcb372bd0ab
diff --git a/trunk/fs/jffs2/background.c b/trunk/fs/jffs2/background.c
index d568ae846741..8adebd3e43c6 100644
--- a/trunk/fs/jffs2/background.c
+++ b/trunk/fs/jffs2/background.c
@@ -105,7 +105,7 @@ static int jffs2_garbage_collect_thread(void *_c)
 
 		/* Put_super will send a SIGKILL and then wait on the sem.
 		 */
-		while (signal_pending(current)) {
+		while (signal_pending(current) || freezing(current)) {
 			siginfo_t info;
 			unsigned long signr;