diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-05-04 15:25:30 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-04 15:25:30 +0200 |
| commit | a8644aebec1152b992d5d54a05a538d338262944 (patch) | |
| tree | 5c0084fbcaf77545497d0ca92bc033693b185653 /arch/x86/mm/Makefile | |
| parent | 9e96e646e6f890308110cb7c81f200f5211cf082 (diff) | |
| parent | 3b02a051d25d9600e9d403ad3043aed7de00160e (diff) | |
Merge branch 'locking/kcsan' into x86/entryentry-base
Pull the pending KCSAN changes as the required changes vs. atomics to fixup
INT3 interfere with the KCSAN modifications of atomics.
Diffstat (limited to 'arch/x86/mm/Makefile')
| -rw-r--r-- | arch/x86/mm/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 98f7c6fa2eaa..f7fd0e868c9c 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -7,6 +7,10 @@ KCOV_INSTRUMENT_mem_encrypt_identity.o := n KASAN_SANITIZE_mem_encrypt.o := n KASAN_SANITIZE_mem_encrypt_identity.o := n +# Disable KCSAN entirely, because otherwise we get warnings that some functions +# reference __initdata sections. +KCSAN_SANITIZE := n + ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_mem_encrypt.o = -pg CFLAGS_REMOVE_mem_encrypt_identity.o = -pg |