diff options
author | Peter Zijlstra <peterz@infradead.org> | 2022-06-27 22:21:17 +0000 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2022-06-29 17:43:41 +0200 |
commit | f43b9876e857c739d407bc56df288b0ebe1a9164 (patch) | |
tree | 22fcf2716b615556869c460a71ed3fd9b1393bd6 /scripts/Makefile.vmlinux_o | |
parent | 26aae8ccbc1972233afd08fb3f368947c0314265 (diff) | |
download | linux-stable-f43b9876e857c739d407bc56df288b0ebe1a9164.tar.gz linux-stable-f43b9876e857c739d407bc56df288b0ebe1a9164.tar.bz2 linux-stable-f43b9876e857c739d407bc56df288b0ebe1a9164.zip |
x86/retbleed: Add fine grained Kconfig knobs
Do fine-grained Kconfig for all the various retbleed parts.
NOTE: if your compiler doesn't support return thunks this will
silently 'upgrade' your mitigation to IBPB, you might not like this.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'scripts/Makefile.vmlinux_o')
-rw-r--r-- | scripts/Makefile.vmlinux_o | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.vmlinux_o b/scripts/Makefile.vmlinux_o index bc67748044a6..84019814f33f 100644 --- a/scripts/Makefile.vmlinux_o +++ b/scripts/Makefile.vmlinux_o @@ -44,7 +44,7 @@ objtool-enabled := $(or $(delay-objtool),$(CONFIG_NOINSTR_VALIDATION)) objtool_args := \ $(if $(delay-objtool),$(objtool_args)) \ - $(if $(CONFIG_NOINSTR_VALIDATION), --noinstr $(if $(CONFIG_RETPOLINE), --unret)) \ + $(if $(CONFIG_NOINSTR_VALIDATION), --noinstr $(if $(CONFIG_CPU_UNRET_ENTRY), --unret)) \ $(if $(CONFIG_GCOV_KERNEL), --no-unreachable) \ --link |