diff --git a/[refs] b/[refs]
index d0d43b47e66e..bfe00be94e9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a076e4bca2fdabb9e45d86722cc72c0944da5f94
+refs/heads/master: 5fcc57f2d5d558056668159f9153bf21d2c53d16
diff --git a/trunk/include/linux/freezer.h b/trunk/include/linux/freezer.h
index c9435252e8e4..1045ee9c0bb4 100644
--- a/trunk/include/linux/freezer.h
+++ b/trunk/include/linux/freezer.h
@@ -63,8 +63,10 @@ static inline int thaw_process(struct task_struct *p)
  */
 static inline void frozen_process(struct task_struct *p)
 {
-	p->flags |= PF_FROZEN;
-	wmb();
+	if (!unlikely(p->flags & PF_NOFREEZE)) {
+		p->flags |= PF_FROZEN;
+		wmb();
+	}
 	clear_tsk_thread_flag(p, TIF_FREEZE);
 }