From 0215dc28859c21075ea0f3510f2d33499e909eb1 Mon Sep 17 00:00:00 2001
From: Todd Kjos <tkjos@google.com>
Date: Thu, 21 Nov 2024 18:19:34 +0000
Subject: [PATCH] ANDROID: declare sp_in_global outside of CONFIG_FRAME_POINTER

Fix for riscv allmodconfig builds. Need sp_in_global to be declared
outside of #ifdef CONFIG_FRAME_POINTER to cover all cases

Fixes: f06e9ec97955 ("BACKPORT: RISC-V: Stop relying on GCC's register allocator's hueristics")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: Ifeb8901498895bb2079d9541e856b417619a6b78
---
 arch/riscv/kernel/stacktrace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c
index 7d145ae70416..aecbfd0b883a 100644
--- a/arch/riscv/kernel/stacktrace.c
+++ b/arch/riscv/kernel/stacktrace.c
@@ -12,6 +12,8 @@
 #include <linux/stacktrace.h>
 #include <linux/ftrace.h>
 
+register unsigned long sp_in_global __asm__("sp");
+
 #ifdef CONFIG_FRAME_POINTER
 
 struct stackframe {
@@ -19,8 +21,6 @@ struct stackframe {
 	unsigned long ra;
 };
 
-register unsigned long sp_in_global __asm__("sp");
-
 void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs,
 			     bool (*fn)(unsigned long, void *), void *arg)
 {