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

[linux.git] / net / ipv4 / tcp_input.c

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 5a87a00641d3a82bfb78d4f3a2959fe8ea2e119c..9a0b3c5ffa46fcaf7176393907bfe3dbc2c3752e 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -816,12 +816,12 @@ static void tcp_update_pacing_rate(struct sock *sk)
        if (likely(tp->srtt_us))
                do_div(rate, tp->srtt_us);
 
-       /* ACCESS_ONCE() is needed because sch_fq fetches sk_pacing_rate
+       /* WRITE_ONCE() is needed because sch_fq fetches sk_pacing_rate
         * without any lock. We want to make sure compiler wont store
         * intermediate values in this location.
         */
-       ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
-                                               sk->sk_max_pacing_rate);
+       WRITE_ONCE(sk->sk_pacing_rate, min_t(u64, rate,
+                                            sk->sk_max_pacing_rate));
 }
 
 /* Calculate rto without backoff.  This is the second half of Van Jacobson's