aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-01-17 19:01:59 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-01-17 19:01:59 -0500
commitc28e1b6e74170f099e98589529dccb9795e1bcda (patch)
tree51494920f15586d2d6b696b8573bf1efc5ebafc3
parentcc22380189ddba2c896b83a22f5fc554257309b8 (diff)
parentafe9186ee0ac156144e33bd492bacc6fdc5eaecb (diff)
downloadlinux-yocto-v5.2/standard/preempt-rt/intel-x86.tar.gz
linux-yocto-v5.2/standard/preempt-rt/intel-x86.tar.bz2
linux-yocto-v5.2/standard/preempt-rt/intel-x86.zip
Merge branch 'v5.2/standard/base' into v5.2/standard/preempt-rt/intel-x86v5.2/standard/preempt-rt/intel-x86
-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,