[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200515172756.27185-6-will@kernel.org>
Date: Fri, 15 May 2020 18:27:55 +0100
From: Will Deacon <will@...nel.org>
To: linux-kernel@...r.kernel.org
Cc: linux-arm-kernel@...ts.infradead.org,
Will Deacon <will@...nel.org>,
Sami Tolvanen <samitolvanen@...gle.com>,
Kees Cook <keescook@...omium.org>,
Catalin Marinas <catalin.marinas@....com>,
Mark Rutland <mark.rutland@...com>,
Jann Horn <jannh@...gle.com>, Ard Biesheuvel <ardb@...nel.org>,
Peter Zijlstra <peterz@...radead.org>, kernel-team@...roid.com
Subject: [PATCH 5/6] scs: Remove references to asm/scs.h from core code
asm/scs.h is no longer needed by the core code, so remove a redundant
header inclusion and update the stale Kconfig text.
Signed-off-by: Will Deacon <will@...nel.org>
---
arch/Kconfig | 4 ++--
kernel/scs.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 45dfca9a98d3..2e6f843d87c4 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -537,8 +537,8 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK
bool
help
An architecture should select this if it supports Clang's Shadow
- Call Stack, has asm/scs.h, and implements runtime support for shadow
- stack switching.
+ Call Stack and implements runtime support for shadow stack
+ switching.
config SHADOW_CALL_STACK
bool "Clang Shadow Call Stack"
diff --git a/kernel/scs.c b/kernel/scs.c
index faf0ecd7b893..222a7a9ad543 100644
--- a/kernel/scs.c
+++ b/kernel/scs.c
@@ -10,7 +10,6 @@
#include <linux/scs.h>
#include <linux/slab.h>
#include <linux/vmstat.h>
-#include <asm/scs.h>
static struct kmem_cache *scs_cache;
--
2.26.2.761.g0e0b3e54be-goog
Powered by blists - more mailing lists