Skip to content

Commit

Permalink
x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
aryabinin authored and Ingo Molnar committed Jul 6, 2015
1 parent 8515522 commit d6f2d75
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 5 additions & 0 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,11 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
config ARCH_SUPPORTS_DEBUG_PAGEALLOC
def_bool y

config KASAN_SHADOW_OFFSET
hex
depends on KASAN
default 0xdffffc0000000000

config HAVE_INTEL_TXT
def_bool y
depends on INTEL_IOMMU && ACPI
Expand Down
4 changes: 0 additions & 4 deletions lib/Kconfig.kasan
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d6f2d75

Please sign in to comment.