Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754759AbbGFPi6 (ORCPT ); Mon, 6 Jul 2015 11:38:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49149 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751687AbbGFPiy (ORCPT ); Mon, 6 Jul 2015 11:38:54 -0400 Date: Mon, 6 Jul 2015 08:38:06 -0700 From: tip-bot for Andrey Ryabinin Message-ID: Cc: alpopov@ptsecurity.com, tglx@linutronix.de, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, pebolle@tiscali.nl, a.ryabinin@samsung.com, mingo@kernel.org, dvyukov@google.com, glider@google.com, adech.fo@gmail.com, bp@alien8.de, torvalds@linux-foundation.org Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, pebolle@tiscali.nl, tglx@linutronix.de, alpopov@ptsecurity.com, peterz@infradead.org, adech.fo@gmail.com, torvalds@linux-foundation.org, bp@alien8.de, a.ryabinin@samsung.com, glider@google.com, mingo@kernel.org, dvyukov@google.com In-Reply-To: <1435828178-10975-7-git-send-email-a.ryabinin@samsung.com> References: <1435828178-10975-7-git-send-email-a.ryabinin@samsung.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig Git-Commit-ID: d6f2d75a7ae06ffd793bb504c4f0d1665548cffc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2176 Lines: 65 Commit-ID: d6f2d75a7ae06ffd793bb504c4f0d1665548cffc Gitweb: http://git.kernel.org/tip/d6f2d75a7ae06ffd793bb504c4f0d1665548cffc Author: Andrey Ryabinin AuthorDate: Thu, 2 Jul 2015 12:09:38 +0300 Committer: Ingo Molnar 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 Cc: Alexander Popov Cc: Alexander Potapenko Cc: Andrey Konovalov Cc: Borislav Petkov Cc: Dmitry Vyukov Cc: Linus Torvalds Cc: Paul Bolle Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1435828178-10975-7-git-send-email-a.ryabinin@samsung.com Signed-off-by: Ingo Molnar --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/