History

Merge branches 'for-next/52-bit-kva', 'for-next/cpu-topology', 'for-next/error-injection', 'for-next/perf', 'for-next/psci-cpuidle', 'for-next/rng', 'for-next/smpboot', 'for-next/tbi' and 'for-next/tlbi' into for-next/core

* for-next/52-bit-kva: (25 commits) Support for 52-bit virtual addressing in kernel space * for-next/cpu-topology: (9 commits) Move CPU topology parsing into core code and add support for ACPI 6.3 * for-next/error-injection: (2 commits) Support for function error injection via kprobes * for-next/perf: (8 commits) Support for i.MX8 DDR PMU and proper SMMUv3 group validation * for-next/psci-cpuidle: (7 commits) Move PSCI idle code into a new CPUidle driver * for-next/rng: (4 commits) Support for 'rng-seed' property being passed in the devicetree * for-next/smpboot: (3 commits) Reduce fragility of secondary CPU bringup in debug configurations * for-next/tbi: (10 commits) Introduce new syscall ABI with relaxed requirements for pointer tags * for-next/tlbi: (6 commits) Handle spurious page faults arising from kernel space

Will Deacon committed 7 years ago

Commit ac12cf810 parents f32c7a8 b333b0b d06fa5a 42d038c 3724e18 d55c5f2 dd753d9 ebef746 92af2b6 5c062ef89 files · +1971 −968Browse files

Showing the changes to scripts (1 of 89 files). Show all

Unified · Split

scripts/Makefile.kasan+5−6
@@ -1,4 +1,9 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2ifdef CONFIG_KASAN
3CFLAGS_KASAN_NOSANITIZE := -fno-builtin
4KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET)
5endif
6
2ifdef CONFIG_KASAN_GENERIC7ifdef CONFIG_KASAN_GENERIC
3 8
4ifdef CONFIG_KASAN_INLINE9ifdef CONFIG_KASAN_INLINE
@@ -7,8 +12,6 @@ else · 2 unmodified lines
7 call_threshold := 012 call_threshold := 0
8endif13endif
9 14
10KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET)
11
12CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address15CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address
13 16
14cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))17cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))
@@ -45,7 +48,3 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ · 30 unmodified lines
45 $(instrumentation_flags)48 $(instrumentation_flags)
46 49
47endif # CONFIG_KASAN_SW_TAGS50endif # CONFIG_KASAN_SW_TAGS
48
49ifdef CONFIG_KASAN
50CFLAGS_KASAN_NOSANITIZE := -fno-builtin
51endif