diff options
| author |  Peter Zijlstra <peterz@infradead.org>
| 2022-06-14 23:15:34 +0200 |
|---|---|---|
| committer |  Borislav Petkov <bp@suse.de>
| 2022-06-27 10:33:58 +0200 |
| commit | 369ae6ffc41a3c1137cab697635a84d0cc7cdcea (patch) | |
| tree | ff1f393393f07e90b93b6ddf351fbb659f654211 /arch/x86/net | |
| parent | x86/cpufeatures: Move RETPOLINE flags to word 11 (diff) | |
| download | linux-369ae6ffc41a3c1137cab697635a84d0cc7cdcea.tar.gz linux-369ae6ffc41a3c1137cab697635a84d0cc7cdcea.tar.bz2 linux-369ae6ffc41a3c1137cab697635a84d0cc7cdcea.zip | |
x86/retpoline: Cleanup some #ifdefery
On it's own not much of a cleanup but it prepares for more/similar
code.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/net')
| -rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index c98b8c0ed3b8..79d26908c143 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -412,16 +412,15 @@ static void emit_indirect_jump(u8 **pprog, int reg, u8 *ip) { u8 *prog = *pprog; -#ifdef CONFIG_RETPOLINE if (cpu_feature_enabled(X86_FEATURE_RETPOLINE_LFENCE)) { EMIT_LFENCE(); EMIT2(0xFF, 0xE0 + reg); } else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) { OPTIMIZER_HIDE_VAR(reg); emit_jump(&prog, &__x86_indirect_thunk_array[reg], ip); - } else -#endif - EMIT2(0xFF, 0xE0 + reg); + } else { + EMIT2(0xFF, 0xE0 + reg); + } *pprog = prog; } |