diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:10:03 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:10:03 +0100 |
commit | 3c76db70eb70a0fbd40b3e0dec8f69ca344d1ff8 (patch) | |
tree | a9dd314ac18992cdc2c50d4de60535a1b76ee351 /arch/x86/Makefile | |
parent | 194a9749c73d650c0b1dfdee04fb0bdf0a888ba8 (diff) | |
parent | 7958b2246fadf54b7ff820a2a5a2c5ca1554716f (diff) | |
download | op-kernel-dev-3c76db70eb70a0fbd40b3e0dec8f69ca344d1ff8.zip op-kernel-dev-3c76db70eb70a0fbd40b3e0dec8f69ca344d1ff8.tar.gz |
Merge branch 'x86/pti' into x86/mm, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Makefile')
-rw-r--r-- | arch/x86/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index fad5516..498c1b8 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -232,10 +232,9 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables # Avoid indirect branches in kernel to deal with Spectre ifdef CONFIG_RETPOLINE - RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register) - ifneq ($(RETPOLINE_CFLAGS),) - KBUILD_CFLAGS += $(RETPOLINE_CFLAGS) -DRETPOLINE - endif +ifneq ($(RETPOLINE_CFLAGS),) + KBUILD_CFLAGS += $(RETPOLINE_CFLAGS) -DRETPOLINE +endif endif archscripts: scripts_basic |