diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
commit | 545633f6fecd240bfa50bb8e2db627eac76f9f8a (patch) | |
tree | 7b68d3d5d49e352c5d1eaecd5e0958db89bda09a /arch/x86/net/bpf_jit_comp.c | |
parent | 3a9fce327ff9cabf7f89d3f20616a83af28393da (diff) | |
parent | 5803b023881857db32ffefa0d269c90280a67ee0 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/x86/net/bpf_jit_comp.c')
-rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 8c9573660d51..0554e8aef4d5 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -284,9 +284,9 @@ static void emit_bpf_tail_call(u8 **pprog) /* if (index >= array->map.max_entries) * goto out; */ - EMIT4(0x48, 0x8B, 0x46, /* mov rax, qword ptr [rsi + 16] */ + EMIT2(0x89, 0xD2); /* mov edx, edx */ + EMIT3(0x39, 0x56, /* cmp dword ptr [rsi + 16], edx */ offsetof(struct bpf_array, map.max_entries)); - EMIT3(0x48, 0x39, 0xD0); /* cmp rax, rdx */ #define OFFSET1 43 /* number of bytes to jump */ EMIT2(X86_JBE, OFFSET1); /* jbe out */ label1 = cnt; |