[PATCH 6.18 274/309] unwind_user/x86: Fix arch=um build

Greg Kroah-Hartman
2026-03-31T17:09:51Z

From: Peter Zijlstra <peterz@infradead.org>

commit aa7387e79a5cff0585cd1b9091944142a06872b6 upstream.

Add CONFIG_HAVE_UNWIND_USER_FP guards to make sure this code
doesn't break arch=um builds.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Closes: https://lore.kernel.org/oe-kbuild-all/202510291919.FFGyU7nq-lkp@intel.com/
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/x86/include/asm/unwind_user.h | 4 ++++
1 file changed, 4 insertions(+)

--- a/arch/x86/include/asm/unwind_user.h
+++ b/arch/x86/include/asm/unwind_user.h
@@ -2,6 +2,8 @@
#ifndef _ASM_X86_UNWIND_USER_H
#define _ASM_X86_UNWIND_USER_H

+#ifdef CONFIG_HAVE_UNWIND_USER_FP
+
#include <asm/ptrace.h>
#include <asm/uprobes.h>

@@ -34,4 +36,6 @@ static inline bool unwind_user_at_functi
return is_uprobe_at_func_entry(regs);
}

+#endif /* CONFIG_HAVE_UNWIND_USER_FP */
+
#endif /* _ASM_X86_UNWIND_USER_H */