Merge tag 'tty-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

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

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 7c857c72aad1481965792b94216074dced2419f5..1510e951f4511a351ba0afa7330731bb16331fc9 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -201,7 +201,7 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];
  */
 static struct sock *icmp_sk(struct net *net)
 {
-       return *this_cpu_ptr(net->ipv4.icmp_sk);
+       return this_cpu_read(*net->ipv4.icmp_sk);
 }
 
 /* Called with BH disabled */