From nobody Wed Apr 22 21:08:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bf420WWz6bL3J for ; Wed, 22 Apr 2026 21:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1Bf36yt6z3l44 for ; Wed, 22 Apr 2026 21:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dcWAw3YAZGUBjblVdHUMCpmjbwEISm7oSiTN3ETUHU4=; b=wBY1F1827yFIvykWw5aR1J1zbArvYprpc71VyLHCls2eQiTypx8Dc34Ory9pPVaQ4GQnFf X5qYp8/fclBTBvtqxGlJUSx/MAejnDuEsC5DoevR7M1QZHH8ghrNHeOcCtIhLWDref1Ad2 PawzVkFrLsIxDlFqvlUZqslPqld3OIRmDzQNep0T3aO2/FCiwzZ8853uCJAQuz+ohIWWpl 50eSxciaiako61vQEeLO7FIaxzOZpVISSgv/tDhHjTLWnisaRe/l9oYqbpc4+T8Pd5Q48n OLJpgslJKnthK3AI3b8C/DIVOIodSHVjQKQx0ecTFuNLJs/mvmmo6681HpZ4SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892108; a=rsa-sha256; cv=none; b=UbpJaNbX0RCMJuaSr8fyIfOxC5uNtAK0+qXVEApJN+P9IyzzPxJuR5OG4gXuBQs1F2E3rz 3WcwMeaPuF8Ru8sXdkmcUo8/0fmW/iT+moU40ZrZC3ChQ5aX73HG4h6HEZ97TRCAUe+f/z AIgkrjwaNmlxTPXb5q7yX2mF6z/e3kQO6OB/ckxX8S9AUpUCnp9DmNpGam00Lvwa0miT8i 1ONeL4z6DFlNQYSG9sLsrafWdLcb2hmLCaDQeCoWiLefqCcbhh5ROQItdCiTtOdI0iDmnG Nk54B8OBfwcpU/88V+iLzDbB6DP7C2eRzK7HkqPdZvKxbI8mgUheDMyw4z5SSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dcWAw3YAZGUBjblVdHUMCpmjbwEISm7oSiTN3ETUHU4=; b=RIghG7nPtf8QNysk220dmiGFCyjW1F74aMTlr0k2ayRB5JWe0EA4ZRBKkBF9r/Ie/Q56Jp s9MZ5ty7jukq9A4B0Qz81ty3+5WPX6MW53JAfQ2vk+qDB90KwZSLQj8yRtD+q4ci74VyiW J0coQtO+FJ+2lxa01kc2FQTWsvYq/N7n28MVIfQ90deZObX+tdsxK+p10A+/y4SR3wgdzj z182wIxY6j6S+N2yTKZ9I3vBCv7Oqoripwo4e0J5Kq2/2qvFw4vYRiQoDBHd2Doov0oTNH xWgYp/6R6pXfpUCXLa0k/bntqLllOsBa+GikYH2LiMVaQRcSrhBUE05tRwdUCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bf36NKKznZX for ; Wed, 22 Apr 2026 21:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a14 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:08:27 +0000 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 From: Bjoern A. Zeeb Subject: git: 7ba86edecbb0 - stable/15 - linuxkpi: Move `_RET_IP_` to List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7ba86edecbb09f378a0fdd424599a9bc383dc511 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:08:27 +0000 Message-Id: <69e938cb.30a14.70c05096@gitrepo.freebsd.org> 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 AuthorDate: 2026-03-02 23:06:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:57:00 +0000 linuxkpi: Move `_RET_IP_` to 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 #include #include +#include #include #include @@ -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)))