Merge branch 'linus' into x86/asm

Sync up the latest NMI fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 10 deletions

diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index e8c25b981205..ba52c830a7a5 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -218,20 +218,12 @@ extern void inet_twsk_purge(struct inet_hashinfo *hashinfo,
 static inline
 struct net *twsk_net(const struct inet_timewait_sock *twsk)
 {
-#ifdef CONFIG_NET_NS
-        return rcu_dereference_raw(twsk->tw_net); /* protected by locking, */
-                                                  /* reference counting, */
-                                                  /* initialization, or RCU. */
-#else
-        return &init_net;
-#endif
+        return read_pnet(&twsk->tw_net);
 }
 
 static inline
 void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)
 {
-#ifdef CONFIG_NET_NS
-        rcu_assign_pointer(twsk->tw_net, net);
-#endif
+        write_pnet(&twsk->tw_net, net);
 }
 #endif  /* _INET_TIMEWAIT_SOCK_ */