diff options
author | David S. Miller | 2017-08-10 21:09:13 +0200 |
---|---|---|
committer | David S. Miller | 2017-08-10 21:09:13 +0200 |
commit | 2f7043a37708110aa98262b91702da6bc32e17b6 (patch) | |
tree | de0525dae8420a56f9a00def631ccc0108d9d091 /include/net/sock.h | |
parent | sparc64: Revert 16GB huge page support. (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-2f7043a37708110aa98262b91702da6bc32e17b6.tar.gz kernel-qcow2-linux-2f7043a37708110aa98262b91702da6bc32e17b6.tar.xz kernel-qcow2-linux-2f7043a37708110aa98262b91702da6bc32e17b6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index f69c8c2782df..7c0632c7e870 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1128,7 +1128,7 @@ struct proto { atomic_t socks; #endif int (*diag_destroy)(struct sock *sk, int err); -}; +} __randomize_layout; int proto_register(struct proto *prot, int alloc_slab); void proto_unregister(struct proto *prot); |