diff --git a/[refs] b/[refs]
index 88fdda9eeec4..2869095c1e34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ad3ca88da02baeccd5216780f1fe983c6953ba
+refs/heads/master: d5f642384e9da75393160350f75bbb9a527f7c58
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 941ad7c830a3..08291c1be41e 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -271,7 +271,9 @@ struct sock {
 	struct sk_buff		*sk_send_head;
 	__u32			sk_sndmsg_off;
 	int			sk_write_pending;
+#ifdef CONFIG_SECURITY
 	void			*sk_security;
+#endif
 	__u32			sk_mark;
 	/* XXX 4 bytes hole on 64 bit */
 	void			(*sk_state_change)(struct sock *sk);