Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable

[~andy/linux] / kernel / freezer.c

diff --git a/kernel/freezer.c b/kernel/freezer.c
index 66ecd2ead215a9cb88ca8ae9f674e1c82766a066..7b01de98bb6a97aea6e1d5b99f38b113c099b780 100644 (file)
--- a/kernel/freezer.c
+++ b/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;