diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:53:01 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:53:01 +0100 |
| commit | a9ff720e0fee2f64c279e71c1bf86e93804295d2 (patch) | |
| tree | c9d6a77274bcb90142aace2dd4a1c9808a191533 /arch/x86/net/bpf_jit_comp.c | |
| parent | 21e7fbe7db2a983c046a05f12419d88c554a0f5a (diff) | |
| parent | 06b35d93af0a5904aa832f58733be84ddbfe2e04 (diff) | |
| download | talos-op-linux-a9ff720e0fee2f64c279e71c1bf86e93804295d2.tar.gz talos-op-linux-a9ff720e0fee2f64c279e71c1bf86e93804295d2.zip | |
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
For AVX512_VPOPCNTDQ.
Diffstat (limited to 'arch/x86/net/bpf_jit_comp.c')
| -rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index e76d1af60f7a..bb660e53cbd6 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -1172,6 +1172,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) set_memory_ro((unsigned long)header, header->pages); prog->bpf_func = (void *)image; prog->jited = 1; + } else { + prog = orig_prog; } out_addrs: |
