From c065d0615316754d324382c6b6879ac392510b13 Mon Sep 17 00:00:00 2001
From: Todd Kjos <tkjos@google.com>
Date: Sat, 1 Feb 2025 00:10:16 +0000
Subject: [PATCH] Revert "ANDROID: declare sp_in_global outside of
 CONFIG_FRAME_POINTER"

This reverts commit 3818981c333235449aa71c20848b175571a0c1cb.

Breaks 64-bit riscv builds in kernelci

Bug: 393656515
Change-Id: Ia980771e1895e2360a7e9ec6eca8ff495123bdd7
Signed-off-by: Todd Kjos <tkjos@google.com>
---
 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 aecbfd0b883a..7d145ae70416 100644
--- a/arch/riscv/kernel/stacktrace.c
+++ b/arch/riscv/kernel/stacktrace.c
@@ -12,8 +12,6 @@
 #include <linux/stacktrace.h>
 #include <linux/ftrace.h>
 
-register unsigned long sp_in_global __asm__("sp");
-
 #ifdef CONFIG_FRAME_POINTER
 
 struct stackframe {
@@ -21,6 +19,8 @@ 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)
 {