scs: Move DEFINE_SCS macro into core code

Defining static shadow call stacks is not architecture-specific, so move
the DEFINE_SCS() macro into the core header file.

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/arm64/kernel/scs.c b/arch/arm64/kernel/scs.c
index 955875dff9e17683c61d7bf16dcd3150a1911a9b..e8f7ff45dd8fa263ab070c23526a02c7519adaf7 100644 (file)
--- a/arch/arm64/kernel/scs.c
+++ b/arch/arm64/kernel/scs.c
@@ -8,10 +8,6 @@
 #include <linux/percpu.h>
 #include <linux/scs.h>
 
-/* Allocate a static per-CPU shadow stack */
-#define DEFINE_SCS(name)                                               \
-       DEFINE_PER_CPU(unsigned long [SCS_SIZE/sizeof(long)], name)     \
-
 DEFINE_SCS(irq_shadow_call_stack);
 
 #ifdef CONFIG_ARM_SDE_INTERFACE

diff --git a/include/linux/scs.h b/include/linux/scs.h
index 2fd3df50e93ee931d94b243920818ea61d2feb18..6dec390cf154b7b30f9799a3d1f620e18927eb94 100644 (file)
--- a/include/linux/scs.h
+++ b/include/linux/scs.h
@@ -26,6 +26,10 @@
 /* An illegal pointer value to mark the end of the shadow stack. */
 #define SCS_END_MAGIC          (0x5f6UL + POISON_POINTER_DELTA)
 
+/* Allocate a static per-CPU shadow stack */
+#define DEFINE_SCS(name)                                               \
+       DEFINE_PER_CPU(unsigned long [SCS_SIZE/sizeof(long)], name)     \
+
 #define task_scs(tsk)          (task_thread_info(tsk)->scs_base)
 #define task_scs_sp(tsk)       (task_thread_info(tsk)->scs_sp)