Merge branch 'linus' into locking/core, to resolve conflicts

[linux-2.6-microblaze.git] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index 6670fbd..d15c0ee 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -147,7 +147,7 @@ static struct bsd_acct_struct *acct_get(struct pid_namespace *ns)
 again:
        smp_rmb();
        rcu_read_lock();
-       res = to_acct(ACCESS_ONCE(ns->bacct));
+       res = to_acct(READ_ONCE(ns->bacct));
        if (!res) {
                rcu_read_unlock();
                return NULL;
@@ -159,7 +159,7 @@ again:
        }
        rcu_read_unlock();
        mutex_lock(&res->lock);
-       if (res != to_acct(ACCESS_ONCE(ns->bacct))) {
+       if (res != to_acct(READ_ONCE(ns->bacct))) {
                mutex_unlock(&res->lock);
                acct_put(res);
                goto again;