Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Apr 2026 21:08:27 +0000
From:      Bjoern A. Zeeb <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron <dumbbell@FreeBSD.org>
Subject:   git: 7ba86edecbb0 - stable/15 - linuxkpi: Move `_RET_IP_` to <linux/instruction_pointer.h>
Message-ID:  <69e938cb.30a14.70c05096@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=7ba86edecbb09f378a0fdd424599a9bc383dc511

commit 7ba86edecbb09f378a0fdd424599a9bc383dc511
Author:     Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
AuthorDate: 2026-03-02 23:06:54 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-04-22 20:57:00 +0000

    linuxkpi: Move `_RET_IP_` to <linux/instruction_pointer.h>
    
    This matches the declaration on Linux.
    
    Reviewed by:    bz, emaste
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D55730
    
    (cherry picked from commit 8af854ea479a140a6e284d74e481d0b547408df2)
---
 .../linuxkpi/common/include/linux/instruction_pointer.h     | 13 +++++++++++++
 sys/compat/linuxkpi/common/include/linux/kernel.h           |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/instruction_pointer.h b/sys/compat/linuxkpi/common/include/linux/instruction_pointer.h
new file mode 100644
index 000000000000..9dc16781808a
--- /dev/null
+++ b/sys/compat/linuxkpi/common/include/linux/instruction_pointer.h
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021 Neel Chauhan
+ * Copyright (c) 2026 The FreeBSD Foundation
+ */
+
+#ifndef	_LINUXKPI_LINUX_INSTRUCTION_POINTER_H_
+#define	_LINUXKPI_LINUX_INSTRUCTION_POINTER_H_
+
+#define	_RET_IP_		__builtin_return_address(0)
+
+#endif /* _LINUXKPI_LINUX_INSTRUCTION_POINTER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h
index 11a13cbd49b4..880d2f67c517 100644
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -55,6 +55,7 @@
 #include <linux/jiffies.h>
 #include <linux/log2.h>
 #include <linux/kconfig.h>
+#include <linux/instruction_pointer.h>
 
 #include <asm/byteorder.h>
 #include <asm/cpufeature.h>
@@ -267,8 +268,6 @@ extern int linuxkpi_debug;
 
 #define	u64_to_user_ptr(val)	((void *)(uintptr_t)(val))
 
-#define _RET_IP_		__builtin_return_address(0)
-
 #define offsetofend(t, m)	\
         (offsetof(t, m) + sizeof((((t *)0)->m)))
 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e938cb.30a14.70c05096>