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.

Tested-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index 45dfca9a98d32bdf615951c8bc634045056e4c59..2e6f843d87c47d7cc86cab234dc5858d3d79f5ca 100644 (file)
--- 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 faf0ecd7b8935c8e81bb90d450a3d4081d8c3d68..222a7a9ad5439a4b9a974a636072a4f21e0578f5 100644 (file)
--- 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;