[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-920e277e17f12870188f4564887a95ae9ac03e31@git.kernel.org>
Date: Sat, 22 Aug 2015 06:59:19 -0700
From: tip-bot for Andrey Ryabinin <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: arnd@...db.de, will.deacon@....com, hpa@...or.com,
akpm@...ux-foundation.org, dkeitel@...eaurora.org,
tglx@...utronix.de, linux-kernel@...r.kernel.org,
peterz@...radead.org, riel@...hat.com, klimov.linux@...il.com,
linus.walleij@...aro.org, dvyukov@...gle.com, yury.norov@...il.com,
torvalds@...ux-foundation.org, catalin.marinas@....com,
mingo@...nel.org, glider@...gle.com,
aneesh.kumar@...ux.vnet.ibm.com, ryabinin.a.a@...il.com
Subject: [tip:mm/kasan] x86/kasan:
Define KASAN_SHADOW_OFFSET per architecture
Commit-ID: 920e277e17f12870188f4564887a95ae9ac03e31
Gitweb: http://git.kernel.org/tip/920e277e17f12870188f4564887a95ae9ac03e31
Author: Andrey Ryabinin <ryabinin.a.a@...il.com>
AuthorDate: Thu, 13 Aug 2015 08:37:23 +0300
Committer: Ingo Molnar <mingo@...nel.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@...il.com>
Cc: Alexander Potapenko <glider@...gle.com>
Cc: Alexey Klimov <klimov.linux@...il.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@...ux.vnet.ibm.com>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Catalin Marinas <catalin.marinas@....com>
Cc: David Keitel <dkeitel@...eaurora.org>
Cc: Dmitry Vyukov <dvyukov@...gle.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Linus Walleij <linus.walleij@...aro.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Rik van Riel <riel@...hat.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Will Deacon <will.deacon@....com>
Cc: Yury <yury.norov@...il.com>
Cc: linux-arm-kernel@...ts.infradead.org
Cc: linux-mm@...ck.org
Link: http://lkml.kernel.org/r/1439444244-26057-2-git-send-email-ryabinin.a.a@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists