summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/scs.h
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2020-05-15 16:56:05 +0300
committerWill Deacon <will@kernel.org>2020-05-18 19:47:40 +0300
commit88485be531f4aee841ddc53b56e2f6e6a338854d (patch)
tree10833e62803878f5163551402f0248494d57e3bf /arch/arm64/include/asm/scs.h
parent711e8b0de0d63c70c825b473da01288b661a2386 (diff)
downloadlinux-88485be531f4aee841ddc53b56e2f6e6a338854d.tar.xz
scs: Move scs_overflow_check() out of architecture code
There is nothing architecture-specific about scs_overflow_check() as it's just a trivial wrapper around scs_corrupted(). For parity with task_stack_end_corrupted(), rename scs_corrupted() to task_scs_end_corrupted() and call it from schedule_debug() when CONFIG_SCHED_STACK_END_CHECK_is enabled, which better reflects its purpose as a debug feature to catch inadvertent overflow of the SCS. Finally, remove the unused scs_overflow_check() function entirely. This has absolutely no impact on architectures that do not support SCS (currently arm64 only). Tested-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/scs.h')
-rw-r--r--arch/arm64/include/asm/scs.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm64/include/asm/scs.h b/arch/arm64/include/asm/scs.h
index d46efdd2060a..eaa2cd92e4c1 100644
--- a/arch/arm64/include/asm/scs.h
+++ b/arch/arm64/include/asm/scs.h
@@ -24,24 +24,6 @@
.endm
#endif /* CONFIG_SHADOW_CALL_STACK */
-#else /* __ASSEMBLY__ */
-
-#include <linux/scs.h>
-
-#ifdef CONFIG_SHADOW_CALL_STACK
-
-static inline void scs_overflow_check(struct task_struct *tsk)
-{
- if (unlikely(scs_corrupted(tsk)))
- panic("corrupted shadow stack detected inside scheduler\n");
-}
-
-#else /* CONFIG_SHADOW_CALL_STACK */
-
-static inline void scs_overflow_check(struct task_struct *tsk) {}
-
-#endif /* CONFIG_SHADOW_CALL_STACK */
-
#endif /* __ASSEMBLY __ */
#endif /* _ASM_SCS_H */