Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932113AbbHVOAQ (ORCPT ); Sat, 22 Aug 2015 10:00:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35585 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932085AbbHVOAK (ORCPT ); Sat, 22 Aug 2015 10:00:10 -0400 Date: Sat, 22 Aug 2015 06:59:19 -0700 From: tip-bot for Andrey Ryabinin Message-ID: Cc: arnd@arndb.de, will.deacon@arm.com, hpa@zytor.com, akpm@linux-foundation.org, dkeitel@codeaurora.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, riel@redhat.com, klimov.linux@gmail.com, linus.walleij@linaro.org, dvyukov@google.com, yury.norov@gmail.com, torvalds@linux-foundation.org, catalin.marinas@arm.com, mingo@kernel.org, glider@google.com, aneesh.kumar@linux.vnet.ibm.com, ryabinin.a.a@gmail.com Reply-To: will.deacon@arm.com, hpa@zytor.com, akpm@linux-foundation.org, arnd@arndb.de, linus.walleij@linaro.org, dkeitel@codeaurora.org, peterz@infradead.org, klimov.linux@gmail.com, riel@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, catalin.marinas@arm.com, torvalds@linux-foundation.org, mingo@kernel.org, yury.norov@gmail.com, dvyukov@google.com, aneesh.kumar@linux.vnet.ibm.com, ryabinin.a.a@gmail.com, glider@google.com In-Reply-To: <1439444244-26057-2-git-send-email-ryabinin.a.a@gmail.com> References: <1439444244-26057-2-git-send-email-ryabinin.a.a@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:mm/kasan] x86/kasan: Define KASAN_SHADOW_OFFSET per architecture Git-Commit-ID: 920e277e17f12870188f4564887a95ae9ac03e31 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: 2586 Lines: 69 Commit-ID: 920e277e17f12870188f4564887a95ae9ac03e31 Gitweb: http://git.kernel.org/tip/920e277e17f12870188f4564887a95ae9ac03e31 Author: Andrey Ryabinin AuthorDate: Thu, 13 Aug 2015 08:37:23 +0300 Committer: Ingo Molnar CommitDate: Sat, 22 Aug 2015 14:54:55 +0200 x86/kasan: Define KASAN_SHADOW_OFFSET per architecture Current definition of KASAN_SHADOW_OFFSET in include/linux/kasan.h will not work for upcomming arm64, so move it to the arch header. Signed-off-by: Andrey Ryabinin Cc: Alexander Potapenko Cc: Alexey Klimov Cc: Andrew Morton Cc: Aneesh Kumar K.V Cc: Arnd Bergmann Cc: Catalin Marinas Cc: David Keitel Cc: Dmitry Vyukov Cc: Linus Torvalds Cc: Linus Walleij Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: Will Deacon Cc: Yury Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1439444244-26057-2-git-send-email-ryabinin.a.a@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/kasan.h | 3 +++ include/linux/kasan.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index 74a2a8d..1410b56 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -1,6 +1,9 @@ #ifndef _ASM_X86_KASAN_H #define _ASM_X86_KASAN_H +#include +#define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) + /* * Compiler uses shadow offset assuming that addresses start * from 0. Kernel addresses don't start from 0, so shadow diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 5486d77..6fb1c7d 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -10,7 +10,6 @@ struct vm_struct; #ifdef CONFIG_KASAN #define KASAN_SHADOW_SCALE_SHIFT 3 -#define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) #include #include -- 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/