diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 09:26:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 09:26:45 +0100 |
| commit | c744ca39f28f9a1e94a62ba02483619925d25ddc (patch) | |
| tree | bfcd445d31c88130cb0833675e2c7ea1c40f47e0 /kernel/bpf/cgroup.c | |
| parent | serial: max310x: Correction of the initial setting of the MODE1 bits for various supported ICs. (diff) | |
| parent | Linux 5.0-rc6 (diff) | |
| download | wireguard-linux-c744ca39f28f9a1e94a62ba02483619925d25ddc.tar.xz wireguard-linux-c744ca39f28f9a1e94a62ba02483619925d25ddc.zip | |
Merge 5.0-rc6 into tty-next
We need the tty fixes in here for other patches to be based on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/bpf/cgroup.c')
| -rw-r--r-- | kernel/bpf/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index ab612fe9862f..d17d05570a3f 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -572,7 +572,7 @@ int __cgroup_bpf_run_filter_skb(struct sock *sk, bpf_compute_and_save_data_end(skb, &saved_data_end); ret = BPF_PROG_RUN_ARRAY(cgrp->bpf.effective[type], skb, - bpf_prog_run_save_cb); + __bpf_prog_run_save_cb); bpf_restore_data_end(skb, saved_data_end); __skb_pull(skb, offset); skb->sk = save_sk; |