[tip:mm/kasan] x86/kasan: Define KASAN_SHADOW_OFFSET per architecture

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Andrey Ryabinin <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:mm/kasan] x86/kasan: Define KASAN_SHADOW_OFFSET per architecture
Date	Sat, 22 Aug 2015 16:10:01 +0200
Message-ID	<q0hEB-4kX-3@gated-at.bofh.it> (permalink)
References	<pWTp8-2nL-13@gated-at.bofh.it>
X-Original-To	linux-tip-commits@vger.kernel.org
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
Git-Commit-ID	920e277e17f12870188f4564887a95ae9ac03e31
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> 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	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	69
Organization	linux.* mail to news gateway
X-Original-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
X-Original-Date	Sat, 22 Aug 2015 06:59:19 -0700
X-Original-Message-ID	<tip-920e277e17f12870188f4564887a95ae9ac03e31@git.kernel.org>
X-Original-References	<1439444244-26057-2-git-send-email-ryabinin.a.a@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1211466

Show key headers only | View raw

Commit-ID:  920e277e17f12870188f4564887a95ae9ac03e31
Gitweb:     http://git.kernel.org/tip/920e277e17f12870188f4564887a95ae9ac03e31
Author:     Andrey Ryabinin <ryabinin.a.a@gmail.com>
AuthorDate: Thu, 13 Aug 2015 08:37:23 +0300
Committer:  Ingo Molnar <mingo@kernel.org>
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 <ryabinin.a.a@gmail.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Alexey Klimov <klimov.linux@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Keitel <dkeitel@codeaurora.org>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yury <yury.norov@gmail.com>
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 <mingo@kernel.org>
---
 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 <linux/const.h>
+#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 <asm/kasan.h>
 #include <linux/sched.h>
--
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/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[tip:mm/kasan] x86/kasan:   Define KASAN_SHADOW_OFFSET per architecture tip-bot for Andrey Ryabinin <tipbot@zytor.com> - 2015-08-22 16:10 +0200

csiph-web