From f5fc4a26a99a11b1a407d4f41da61e2dd0b9e4cf Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 25 Apr 2011 12:33:15 +0200
Subject: [PATCH] --- yaml --- r: 245341 b: refs/heads/master c:
 ee940d8dccd899aa1777ea84da3d9cd04b1d2e8e h: refs/heads/master i:   245339:
 9c306ac2a32f3c6685803a668296a436d3789991 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/freezer.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3fc5766915fc..8c0cbb106994 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c431936087e93d2219a184a8e19eaa68077e379
+refs/heads/master: ee940d8dccd899aa1777ea84da3d9cd04b1d2e8e
diff --git a/trunk/kernel/freezer.c b/trunk/kernel/freezer.c
index 66ecd2ead215..7b01de98bb6a 100644
--- a/trunk/kernel/freezer.c
+++ b/trunk/kernel/freezer.c
@@ -17,7 +17,7 @@ static inline void frozen_process(void)
 {
 	if (!unlikely(current->flags & PF_NOFREEZE)) {
 		current->flags |= PF_FROZEN;
-		wmb();
+		smp_wmb();
 	}
 	clear_freeze_flag(current);
 }
@@ -93,7 +93,7 @@ bool freeze_task(struct task_struct *p, bool sig_only)
 	 * the task as frozen and next clears its TIF_FREEZE.
 	 */
 	if (!freezing(p)) {
-		rmb();
+		smp_rmb();
 		if (frozen(p))
 			return false;