aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-01-17 19:01:50 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-01-17 19:01:50 -0500
commitbda63093c3e97d4b877f5cf8dd3141723c6f31bf (patch)
treee3bfecb7d1ac5a5e3e4e546418dc29f9cb7b71fe
parent3351adaf7f550b61d3bb9c7c53d7f1398d621123 (diff)
parentafe9186ee0ac156144e33bd492bacc6fdc5eaecb (diff)
downloadlinux-yocto-bda63093c3e97d4b877f5cf8dd3141723c6f31bf.tar.gz
linux-yocto-bda63093c3e97d4b877f5cf8dd3141723c6f31bf.tar.bz2
linux-yocto-bda63093c3e97d4b877f5cf8dd3141723c6f31bf.zip
Merge branch 'v5.2/standard/base' into v5.2/standard/cn96xx
-rw-r--r--net/core/sysctl_net_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index f9204719aeee..50eeb0ef320e 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -290,6 +290,7 @@ static int proc_dointvec_minmax_bpf_enable(struct ctl_table *table, int write,
return ret;
}
+# ifdef CONFIG_HAVE_EBPF_JIT
static int
proc_dointvec_minmax_bpf_restricted(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp,
@@ -300,6 +301,7 @@ proc_dointvec_minmax_bpf_restricted(struct ctl_table *table, int write,
return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
}
+# endif /* CONFIG_HAVE_EBPF_JIT */
static int
proc_dolongvec_minmax_bpf_restricted(struct ctl_table *table, int write,