diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-24 12:24:39 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-24 12:24:39 +0400 |
| commit | 89c8ae73459443eabfd7f24b4379ddb9248f1ee9 (patch) | |
| tree | e13e7c3a780668da718161305f2d1741c0b7ae6f /arch/x86/net/bpf_jit.S | |
| parent | 2df6742f613840a0b0a1590fb28f7af5b058a673 (diff) | |
| parent | e090d5b6ad20056ec0ef58727e3ae95fd82be090 (diff) | |
| download | linux-89c8ae73459443eabfd7f24b4379ddb9248f1ee9.tar.xz | |
Merge tag 'asoc-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.15
A few more updates for the merge window:
- Fixes for the simple-card DAI format DT mess.
- A new driver for Cirrus cs42xx8 devices.
- DT support for a couple more devices.
- A revert of a previous buggy fix for soc-pcm, plus a few more fixes
and cleanups.
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; \ |