diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2018-01-19 18:37:01 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2018-01-19 18:37:02 -0800 |
| commit | 1391040b6570584c177a238eeac01930beabbaa4 (patch) | |
| tree | f94d94db60f1bd595fc080694f8660566eeaf28b /net/socket.c | |
| parent | 417f1d9f217922d822b64e8323458d7d03a12d4f (diff) | |
| parent | 1728a4f2ad6840746a6b1b9f01d652c5842f7e8d (diff) | |
Merge branch 'bpf-misc-improvements'
Daniel Borkmann says:
====================
This series adds various misc improvements to BPF: detection
of BPF helper definition misconfiguration for mem/size argument
pairs, csum_diff helper also for XDP, various test cases,
removal of the recently added pure_initcall(), restriction
of the jit sysctls to cap_sys_admin for initns, a minor size
improvement for x86 jit in alu ops, output of complexity limit
to verifier log and last but not least having the event output
more flexible with moving to const_size_or_zero type.
Thanks!
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/socket.c b/net/socket.c index fbfae1ed3ff5..1536515b6437 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2613,15 +2613,6 @@ out_fs: core_initcall(sock_init); /* early initcall */ -static int __init jit_init(void) -{ -#ifdef CONFIG_BPF_JIT_ALWAYS_ON - bpf_jit_enable = 1; -#endif - return 0; -} -pure_initcall(jit_init); - #ifdef CONFIG_PROC_FS void socket_seq_show(struct seq_file *seq) { |