diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-05-28 13:29:23 -0400 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-05-28 13:29:23 -0400 |
| commit | 2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch) | |
| tree | de062b67715e1eb0321032ad2a87f12cb664643b /tools | |
| parent | af885f4022622331f17227dfcfbb2dafdee25a43 (diff) | |
| parent | eed542d6962ba33a689b4007a389f466e407bd74 (diff) | |
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/net/bpf_dbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/net/bpf_dbg.c b/tools/net/bpf_dbg.c index bb31813e43dd..9a287bec695a 100644 --- a/tools/net/bpf_dbg.c +++ b/tools/net/bpf_dbg.c | |||
| @@ -820,7 +820,7 @@ do_div: | |||
| 820 | r->A &= r->X; | 820 | r->A &= r->X; |
| 821 | break; | 821 | break; |
| 822 | case BPF_ALU_AND | BPF_K: | 822 | case BPF_ALU_AND | BPF_K: |
| 823 | r->A &= r->X; | 823 | r->A &= K; |
| 824 | break; | 824 | break; |
| 825 | case BPF_ALU_OR | BPF_X: | 825 | case BPF_ALU_OR | BPF_X: |
| 826 | r->A |= r->X; | 826 | r->A |= r->X; |