diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-05-06 01:11:53 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-05-06 01:11:53 -0500 |
| commit | e8f84c44a0d78cb3413d69331bee6ce4d86b2e1d (patch) | |
| tree | 0eb14b7e337b7b8dbc1bd97e11a13e1abc114b9a /arch/x86/net/bpf_jit.S | |
| parent | e365c882ed38dbbe1a6ff4ed72414835390368a6 (diff) | |
| parent | f512eefd5cde0ad21bd99bbfe4dc70b62805838e (diff) | |
Merge tag 'v3.10.37' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.37-finallinux-lng-v3.10.xlinux-lng
This is the 3.10.37 stable release
Conflicts:
scripts/package/builddeb
Diffstat (limited to 'arch/x86/net/bpf_jit.S')
| -rw-r--r-- | arch/x86/net/bpf_jit.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S index 877b9a1b2152..01495755701b 100644 --- a/arch/x86/net/bpf_jit.S +++ b/arch/x86/net/bpf_jit.S @@ -140,7 +140,7 @@ bpf_slow_path_byte_msh: push %r9; \ push SKBDATA; \ /* rsi already has offset */ \ - mov $SIZE,%ecx; /* size */ \ + mov $SIZE,%edx; /* size */ \ call bpf_internal_load_pointer_neg_helper; \ test %rax,%rax; \ pop SKBDATA; \ |