aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2019-08-16 13:09:54 -0700
committerAlistair Delva <adelva@google.com>2019-11-26 13:27:39 -0800
commit4756bebcd2875c68105882d0f5bfc01fea021b04 (patch)
treef263ee51c068b1f9d09ca4fa4c3f44b2adc47365
parent8662f567f78ad4d7bfde6eab25fc61f8b42763e4 (diff)
FROMLIST: arm64: disable SCS for hypervisor code
Filter out CC_FLAGS_SCS for code that runs at a different exception level. Bug: 145210207 Change-Id: I834424fba7aa18598b618891814327ecc2841c6e (am from https://lore.kernel.org/patchwork/patch/1149062/) Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
-rw-r--r--arch/arm64/kvm/hyp/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index ea710f674cb6..17ea3da325e9 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -28,3 +28,6 @@ GCOV_PROFILE := n
KASAN_SANITIZE := n
UBSAN_SANITIZE := n
KCOV_INSTRUMENT := n
+
+# remove the SCS flags from all objects in this directory
+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS))