[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-d6f2d75a7ae06ffd793bb504c4f0d1665548cffc@git.kernel.org>
Date: Mon, 6 Jul 2015 08:38:06 -0700
From: tip-bot for Andrey Ryabinin <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: alpopov@...ecurity.com, tglx@...utronix.de, peterz@...radead.org,
linux-kernel@...r.kernel.org, hpa@...or.com, pebolle@...cali.nl,
a.ryabinin@...sung.com, mingo@...nel.org, dvyukov@...gle.com,
glider@...gle.com, adech.fo@...il.com, bp@...en8.de,
torvalds@...ux-foundation.org
Subject: [tip:x86/urgent] x86/kasan:
Move KASAN_SHADOW_OFFSET to the arch Kconfig
Commit-ID: d6f2d75a7ae06ffd793bb504c4f0d1665548cffc
Gitweb: http://git.kernel.org/tip/d6f2d75a7ae06ffd793bb504c4f0d1665548cffc
Author: Andrey Ryabinin <a.ryabinin@...sung.com>
AuthorDate: Thu, 2 Jul 2015 12:09:38 +0300
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 6 Jul 2015 14:53:15 +0200
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@...sung.com>
Cc: Alexander Popov <alpopov@...ecurity.com>
Cc: Alexander Potapenko <glider@...gle.com>
Cc: Andrey Konovalov <adech.fo@...il.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Dmitry Vyukov <dvyukov@...gle.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Paul Bolle <pebolle@...cali.nl>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1435828178-10975-7-git-send-email-a.ryabinin@samsung.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/Kconfig | 5 +++++
lib/Kconfig.kasan | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 55bced1..0b2929f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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
diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index 777eda7..39f24d6 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists