diff --git a/[refs] b/[refs] index 057c067a236e..5a7a56ab657f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce4a600e477a4da600c8056897e71e2f4a8c5ac0 +refs/heads/master: 5fbee843c32e5de2d8af68ba0bdd113bb0af9d86 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 549f5ad2055d..85b0949d9946 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -1272,7 +1272,7 @@ struct net_device { void (*destructor)(struct net_device *dev); #ifdef CONFIG_NETPOLL - struct netpoll_info *npinfo; + struct netpoll_info __rcu *npinfo; #endif #ifdef CONFIG_NET_NS