[<prev] [next>] [day] [month] [year] [list]
Message-ID: <176174511766.2601451.10946132380682286777.tip-bot2@tip-bot2>
Date: Wed, 29 Oct 2025 13:38:37 -0000
From: "tip-bot2 for Peter Zijlstra" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: kernel test robot <lkp@...el.com>,
 "Peter Zijlstra (Intel)" <peterz@...radead.org>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: perf/core] Subject: unwind_user/x86: Fix arch=um build
The following commit has been merged into the perf/core branch of tip:
Commit-ID:     e56b519d9d7742f3b2ad1debb4e231c46cdda218
Gitweb:        https://git.kernel.org/tip/e56b519d9d7742f3b2ad1debb4e231c46cdda218
Author:        Peter Zijlstra <peterz@...radead.org>
AuthorDate:    Wed, 29 Oct 2025 14:24:57 +01:00
Committer:     Peter Zijlstra <peterz@...radead.org>
CommitterDate: Wed, 29 Oct 2025 14:29:08 +01:00
Subject: unwind_user/x86: Fix arch=um build
Add CONFIG_HAVE_UNWIND_USER_FP guards to make sure this code
doesn't break arch=um builds.
Reported-by: kernel test robot <lkp@...el.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Closes: https://lore.kernel.org/oe-kbuild-all/202510291919.FFGyU7nq-lkp@intel.com/
---
 arch/x86/include/asm/unwind_user.h | 4 ++++
 1 file changed, 4 insertions(+)
diff --git a/arch/x86/include/asm/unwind_user.h b/arch/x86/include/asm/unwind_user.h
index c4f1ff8..1206428 100644
--- 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_function_start(struct pt_regs *regs)
 	return is_uprobe_at_func_entry(regs);
 }
 
+#endif /* CONFIG_HAVE_UNWIND_USER_FP */
+
 #endif /* _ASM_X86_UNWIND_USER_H */
Powered by blists - more mailing lists
 
