From eab1cecc1223378fee700ab6acebf0f39fa6da81 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 31 Jul 2018 12:02:18 +0100 Subject: [PATCH] arm64: sdei: Mark sdei stack helper functions as static The SDEI stack helper functions are only used by _on_sdei_stack() and refer to symbols (e.g. sdei_stack_normal_ptr) that are only defined if CONFIG_VMAP_STACK=y. Mark these functions as static, so we don't run into errors at link-time due to references to undefined symbols. Stick all the parameters onto the same line whilst we're passing through. Signed-off-by: Will Deacon --- arch/arm64/kernel/sdei.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c index a94a868..5ba4465 100644 --- a/arch/arm64/kernel/sdei.c +++ b/arch/arm64/kernel/sdei.c @@ -89,8 +89,7 @@ static int init_sdei_stacks(void) return err; } -bool on_sdei_normal_stack(unsigned long sp, - struct stack_info *info) +static bool on_sdei_normal_stack(unsigned long sp, struct stack_info *info) { unsigned long low = (unsigned long)raw_cpu_read(sdei_stack_normal_ptr); unsigned long high = low + SDEI_STACK_SIZE; @@ -107,8 +106,7 @@ bool on_sdei_normal_stack(unsigned long sp, return true; } -bool on_sdei_critical_stack(unsigned long sp, - struct stack_info *info) +static bool on_sdei_critical_stack(unsigned long sp, struct stack_info *info) { unsigned long low = (unsigned long)raw_cpu_read(sdei_stack_critical_ptr); unsigned long high = low + SDEI_STACK_SIZE; @@ -125,8 +123,7 @@ bool on_sdei_critical_stack(unsigned long sp, return true; } -bool _on_sdei_stack(unsigned long sp, - struct stack_info *info) +bool _on_sdei_stack(unsigned long sp, struct stack_info *info) { if (!IS_ENABLED(CONFIG_VMAP_STACK)) return false; -- 2.7.4