diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-09 16:59:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-09 16:59:03 -0700 |
| commit | 60005c60b1ea807013bcbbfe9309fc924a3881f0 (patch) | |
| tree | 50f1a085ddd7923b2b3c2764c850d0c02447d32a /arch/sparc/net/bpf_jit_comp.c | |
| parent | ca777eff51f7fbaebd954e645d8ecb781a906b4a (diff) | |
| parent | 286aad3c4014ca825c447e07e24f8929e6d266d2 (diff) | |
Merge branch 'bpf-next'
Daniel Borkmann says:
====================
BPF updates
[ Set applies on top of current net-next but also on top of
Alexei's latest patches. Please see individual patches for
more details. ]
Changelog:
v1->v2:
- Removed paragraph in 1st commit message
- Rest stays the same
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/net/bpf_jit_comp.c')
| -rw-r--r-- | arch/sparc/net/bpf_jit_comp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c index f7a736b645e8..b2ad9dc5425e 100644 --- a/arch/sparc/net/bpf_jit_comp.c +++ b/arch/sparc/net/bpf_jit_comp.c @@ -801,7 +801,7 @@ cond_branch: f_offset = addrs[i + filter[i].jf]; if (image) { bpf_flush_icache(image, image + proglen); fp->bpf_func = (void *)image; - fp->jited = 1; + fp->jited = true; } out: kfree(addrs); |