Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 86023b9be47f46eeef7373935af024c1e7c4fa9d..1bec4e76d88c5852d8ba3392b22aa58d6453ab4d 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2941,7 +2941,7 @@ struct tcp_md5sig_pool *tcp_get_md5sig_pool(void)
        local_bh_disable();
        p = ACCESS_ONCE(tcp_md5sig_pool);
        if (p)
-               return __this_cpu_ptr(p);
+               return raw_cpu_ptr(p);
 
        local_bh_enable();
        return NULL;