| Message ID | 20200515172756.27185-6-will@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | aa7a65ae5b8f459617e5ed1422301386e7f12274 |
| Headers | show |
| Series | Clean up Shadow Call Stack patches for 5.8 | expand |
On Fri, May 15, 2020 at 06:27:55PM +0100, Will Deacon wrote: > 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@kernel.org> With the corruption checks moved out of arch code this looks sound to me, so modulo my comments on the prior patch, assuming we factor that out: Reviewed-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > 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 >
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;
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@kernel.org> --- arch/Kconfig | 4 ++-- kernel/scs.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)