diff options
| author | Will Deacon <will@kernel.org> | 2020-05-15 16:15:46 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-05-18 17:47:45 +0100 |
| commit | aa7a65ae5b8f459617e5ed1422301386e7f12274 (patch) | |
| tree | cef0ed39d12b017d967f3e5c02282173eb87200f | |
| parent | 88485be531f4aee841ddc53b56e2f6e6a338854d (diff) | |
| download | linux-aa7a65ae5b8f459617e5ed1422301386e7f12274.tar.gz linux-aa7a65ae5b8f459617e5ed1422301386e7f12274.tar.bz2 linux-aa7a65ae5b8f459617e5ed1422301386e7f12274.zip | |
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>
| -rw-r--r-- | arch/Kconfig | 4 | ||||
| -rw-r--r-- | 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; |