diff options
| author | Andrey Ryabinin <a.ryabinin@samsung.com> | 2015-07-02 05:09:38 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-06 08:53:15 -0400 |
| commit | d6f2d75a7ae06ffd793bb504c4f0d1665548cffc (patch) | |
| tree | f769a1d713ce004b2c6b0b4c9eebf74838f84cdd | |
| parent | 8515522949951d81fe2d06c0a3292f171f2b8ec4 (diff) | |
x86/kasan: 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.
Signed-off-by: Andrey Ryabinin <a.ryabinin@samsung.com>
Cc: Alexander Popov <alpopov@ptsecurity.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <adech.fo@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1435828178-10975-7-git-send-email-a.ryabinin@samsung.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/Kconfig | 5 | ||||
| -rw-r--r-- | lib/Kconfig.kasan | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 55bced17dc95..0b2929f49531 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -254,6 +254,11 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING | |||
| 254 | config ARCH_SUPPORTS_DEBUG_PAGEALLOC | 254 | config ARCH_SUPPORTS_DEBUG_PAGEALLOC |
| 255 | def_bool y | 255 | def_bool y |
| 256 | 256 | ||
| 257 | config KASAN_SHADOW_OFFSET | ||
| 258 | hex | ||
| 259 | depends on KASAN | ||
| 260 | default 0xdffffc0000000000 | ||
| 261 | |||
| 257 | config HAVE_INTEL_TXT | 262 | config HAVE_INTEL_TXT |
| 258 | def_bool y | 263 | def_bool y |
| 259 | depends on INTEL_IOMMU && ACPI | 264 | depends on INTEL_IOMMU && ACPI |
diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 777eda7d1ab4..39f24d6721e5 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan | |||
| @@ -18,10 +18,6 @@ config KASAN | |||
| 18 | For better error detection enable CONFIG_STACKTRACE, | 18 | For better error detection enable CONFIG_STACKTRACE, |
| 19 | and add slub_debug=U to boot cmdline. | 19 | and add slub_debug=U to boot cmdline. |
| 20 | 20 | ||
| 21 | config KASAN_SHADOW_OFFSET | ||
| 22 | hex | ||
| 23 | default 0xdffffc0000000000 if X86_64 | ||
| 24 | |||
| 25 | choice | 21 | choice |
| 26 | prompt "Instrumentation type" | 22 | prompt "Instrumentation type" |
| 27 | depends on KASAN | 23 | depends on KASAN |
