diff options
| author | Andrey Ryabinin <a.ryabinin@samsung.com> | 2015-05-15 16:59:00 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-05-18 06:28:29 -0400 |
| commit | 0e2bef17340bfc1b7ca81f7f28ff830525d8d856 (patch) | |
| tree | b854ef91ebb8a76281d690f072992a91547e64f0 | |
| parent | 5887fa7fa321b0c138e8212112227f3160c3be86 (diff) | |
| download | mm-next-0e2bef17340bfc1b7ca81f7f28ff830525d8d856.tar.gz | |
kasan, x86: move KASAN_SHADOW_OFFSET to the arch Kconfig
KASAN_SHADOW_OFFSET is purely arch specific setting,
so it should be in arch's Kconfig file. This simplifies
porting KASan to other architectures and maintenance of it.
Signed-off-by: Andrey Ryabinin <a.ryabinin@samsung.com>
| -rw-r--r-- | arch/x86/Kconfig | 4 | ||||
| -rw-r--r-- | lib/Kconfig.kasan | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5116f4f7c2d235..ea0e00b3bfabe4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -251,6 +251,10 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING config ARCH_SUPPORTS_DEBUG_PAGEALLOC def_bool y +config KASAN_SHADOW_OFFSET + hex + default 0xdffffc0000000000 + config HAVE_INTEL_TXT def_bool y depends on INTEL_IOMMU && ACPI diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 777eda7d1ab4bf..39f24d6721e5a2 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -18,10 +18,6 @@ config KASAN For better error detection enable CONFIG_STACKTRACE, and add slub_debug=U to boot cmdline. -config KASAN_SHADOW_OFFSET - hex - default 0xdffffc0000000000 if X86_64 - choice prompt "Instrumentation type" depends on KASAN |