From: tip-bot for Andrey Ryabinin <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:mm/kasan] x86/kasan: Define KASAN_SHADOW_OFFSET per architecture
Date: Sat, 22 Aug 2015 06:59:19 -0700 [thread overview]
Message-ID: <tip-920e277e17f12870188f4564887a95ae9ac03e31@git.kernel.org> (raw)
In-Reply-To: <1439444244-26057-2-git-send-email-ryabinin.a.a@gmail.com>
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>
next prev parent reply other threads:[~2015-08-22 14:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-13 5:37 [PATCH 0/2] x86/KASAN updates for 4.3 Andrey Ryabinin
2015-08-13 5:37 ` [PATCH v6 1/2] x86/kasan: define KASAN_SHADOW_OFFSET per architecture Andrey Ryabinin
2015-08-22 13:59 ` tip-bot for Andrey Ryabinin [this message]
2015-08-13 5:37 ` [PATCH v6 2/2] x86/kasan, mm: introduce generic kasan_populate_zero_shadow() Andrey Ryabinin
2015-08-22 13:59 ` [tip:mm/kasan] x86/kasan, mm: Introduce " tip-bot for Andrey Ryabinin
2015-08-13 6:50 ` [PATCH 0/2] x86/KASAN updates for 4.3 Ingo Molnar
2015-08-13 8:16 ` Ingo Molnar
2015-08-13 9:01 ` Will Deacon
2015-08-13 11:02 ` Andrey Ryabinin
2015-08-13 11:24 ` Will Deacon
2015-08-13 17:23 ` Will Deacon
2015-08-22 10:09 ` Ingo Molnar
2015-08-22 12:51 ` Andrey Ryabinin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-920e277e17f12870188f4564887a95ae9ac03e31@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=dkeitel@codeaurora.org \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=hpa@zytor.com \
--cc=klimov.linux@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=ryabinin.a.a@gmail.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).