diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-26 07:54:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-26 07:54:42 +0200 |
| commit | ad759c906954aab1bab8b5fe04931e566d901a0e (patch) | |
| tree | e63af6ed708ed97df97b4b1b9ec16150131097e2 /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | bpf: Fix preempt_enable_no_resched() abuse (diff) | |
| download | linux-ad759c906954aab1bab8b5fe04931e566d901a0e.tar.xz linux-ad759c906954aab1bab8b5fe04931e566d901a0e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-04-25
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) the bpf verifier fix to properly mark registers in all stack frames, from Paul.
2) preempt_enable_no_resched->preempt_enable fix, from Peter.
3) other misc fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bpf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index f02367faa58d..944ccc310201 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -510,7 +510,7 @@ int bpf_prog_array_copy(struct bpf_prog_array __rcu *old_array, } \ _out: \ rcu_read_unlock(); \ - preempt_enable_no_resched(); \ + preempt_enable(); \ _ret; \ }) |