From: ryabinin.a.a@gmail.com (Andrey Ryabinin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 1/6] x86/kasan: define KASAN_SHADOW_OFFSET per architecture
Date: Tue, 11 Aug 2015 05:18:14 +0300 [thread overview]
Message-ID: <1439259499-13913-2-git-send-email-ryabinin.a.a@gmail.com> (raw)
In-Reply-To: <1439259499-13913-1-git-send-email-ryabinin.a.a@gmail.com>
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>
---
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>
--
2.4.6
next prev parent reply other threads:[~2015-08-11 2:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 2:18 [PATCH v5 0/6] KASAN for amr64 Andrey Ryabinin
2015-08-11 2:18 ` Andrey Ryabinin [this message]
2015-08-11 2:18 ` [PATCH v5 2/6] x86/kasan, mm: introduce generic kasan_populate_zero_shadow() Andrey Ryabinin
2015-08-11 15:41 ` Catalin Marinas
2015-08-11 16:25 ` Andrey Ryabinin
2015-08-11 16:40 ` Catalin Marinas
2015-08-12 9:30 ` Andrey Ryabinin
2015-08-12 9:37 ` Will Deacon
2015-08-12 12:19 ` Andrey Ryabinin
2015-08-12 13:41 ` Will Deacon
2015-08-11 16:30 ` Andrey Ryabinin
2015-08-11 2:18 ` [PATCH v5 3/6] arm64: introduce VA_START macro - the first kernel virtual address Andrey Ryabinin
2015-08-11 2:18 ` [PATCH v5 4/6] arm64: move PGD_SIZE definition to pgalloc.h Andrey Ryabinin
2015-08-11 2:18 ` [PATCH v5 5/6] arm64: add KASAN support Andrey Ryabinin
2015-08-11 16:37 ` Catalin Marinas
2015-08-11 2:18 ` [PATCH v5 6/6] ARM64: kasan: print memory assignment 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=1439259499-13913-2-git-send-email-ryabinin.a.a@gmail.com \
--to=ryabinin.a.a@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).