diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
| commit | db5bc601e46abbb8fc4c17a6bc848c560e80fe57 (patch) | |
| tree | b1eb723eb8acd5261336cef1b968311e6332a7b6 /arch/s390 | |
| parent | d98f3af5986fae62bacbe7e83026660d61621a3a (diff) | |
| parent | 21b5f5d91a589931a22009d918fd319f481e8eee (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
fs/f2fs/super.c
Pick changes from LTS commit 76517ed2a7fe
("f2fs: sanity check checkpoint segno and blkoff"),
over changes from AOSP commit 0f127e451bc7
("FROMLIST: f2fs: sanity check checkpoint segno and blkoff")
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 0e2919dd8df3..1395eeb6005f 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -1250,7 +1250,8 @@ static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp) insn_count = bpf_jit_insn(jit, fp, i); if (insn_count < 0) return -1; - jit->addrs[i + 1] = jit->prg; /* Next instruction address */ + /* Next instruction address */ + jit->addrs[i + insn_count] = jit->prg; } bpf_jit_epilogue(jit); |