From nobody Wed Jul 6 11:04:13 2022 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 F2F7A1D01458; Wed, 6 Jul 2022 11:04:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LdGrY3pKkz3NYn; Wed, 6 Jul 2022 11:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657105454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lxhxo7SyIDQ2e5b/AEUYzRSwzrDm2BgJAmO2kK6OdOI=; b=kDYkWNk/AjtP7AuiSU6TeP/zoUGbYyeV2FDMid5Poyzs9ZB/1EssPUVrjnPNkU4Qf5K/90 3u4mFOe34dJ0Dwy3LgpOaO3FYNi+8HDtpX0HDLgwmM5jG8qbvNs77cPBcjQvySVGJ6c+bi ycWnefc762/GW1nncISqx/q02bGJrQRonQvZj5sUKRXIrmyEYyWhji1wgimxpK1S10Qk/h HI0fkwpFhRzh5ccav8c4rGyWjp/zoZ+I2FCu7/LmxlNhr5P7cPN7no8nORe6s4Q78ECA2g chHtlo2muJQewQbxuwhOGHuVu32710eInCuGtzp/Q2kYHPet4a1NreQZAbHqew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D333194BD; Wed, 6 Jul 2022 11:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 266B4DC2096700; Wed, 6 Jul 2022 11:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266B4Dbm096699; Wed, 6 Jul 2022 11:04:13 GMT (envelope-from git) Date: Wed, 6 Jul 2022 11:04:13 GMT Message-Id: <202207061104.266B4Dbm096699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: e20c669d21fc - stable/13 - linux(4): To reuse MD linux.h hide kernel dependencies unde _KERNEL constraint 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e20c669d21fce0b323fdb07545761b98d86d933a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657105454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lxhxo7SyIDQ2e5b/AEUYzRSwzrDm2BgJAmO2kK6OdOI=; b=x1IJF9tgz5uPXas5DZBoFIOkpWLViElxcL1c60QgC9lP6G67iRjkKtUswT97vjKfjk+4RH mSoRG//0H+QL63cLJcaJZGl4o6owU2gKZM5qkoHzbrRl1FOXokZI4SYkiU8BgX9L5gCfS9 cwficdO74uUUJ5BxrPEEw39A4CLnnQiap3ESTg/7vtFYJ3W/qNDMndZd6ibyNQ11Q42ztd eylMXwncXq2509UoRyigmw7hYRH+H5ZrAXJEgdARI0ssO1Tt9qSeZVXYmWIhQwUlkA3u5j 9r/yHwMW0sLwHPrHKGnZWMAbklrje5E13x1uNSqlE7PoBwFSxG56HDbqaCPIdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657105454; a=rsa-sha256; cv=none; b=aPdK6Bx8IKDp2P2V99y/iQSpgZtK2s4nswvILOM5OINli5Z/PckWr09C82d+PH5E0Z+F62 YENX/StjDH1rzCdqU4MRljwO6XRGrG+BvCYhftkwdQZTqPQsh1dBT8i6fgHsNCNxVBGFIY kmzNYj0HqKawsrjSIQuGOSfIKFiTUg6bxN6VdqHC/vz/BsqV39m1h04ORgtrnWmiz23q1p EJEnv5H2xEZVj5ym2qrSlyg+C7tlxydLvenzQji1qW+6ZnCshoTgVMRIPkoKi+fLlyjDNt 9HZnlngGS9wDYCJSgqKSaPuQAMiWXoeL2KyfbYuEqlyOvudOTEpStItbmmQupg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e20c669d21fce0b323fdb07545761b98d86d933a commit e20c669d21fce0b323fdb07545761b98d86d933a Author: Dmitry Chagin AuthorDate: 2022-06-22 11:28:24 +0000 Commit: Dmitry Chagin CommitDate: 2022-07-06 11:02:15 +0000 linux(4): To reuse MD linux.h hide kernel dependencies unde _KERNEL constraint MFC after: 2 weeks (cherry picked from commit d416ee86c73bef55ba29c25cd594156441f1daa9) --- sys/amd64/linux/linux.h | 2 ++ sys/amd64/linux32/linux.h | 4 ++++ sys/arm64/linux/linux.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 6f91e86255e2..c9e28f20ef94 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -319,6 +319,7 @@ struct linux_pt_regset { l_ulong gs; }; +#ifdef _KERNEL struct reg; struct syscall_info; @@ -330,5 +331,6 @@ void linux_ptrace_get_syscall_info_machdep(const struct reg *reg, struct syscall_info *si); int linux_ptrace_getregs_machdep(struct thread *td, pid_t pid, struct linux_pt_regset *l_regset); +#endif /* _KERNEL */ #endif /* !_AMD64_LINUX_H_ */ diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index f8b72e060de4..7909c9c2081b 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -426,6 +426,7 @@ struct l_user_desc { #define LINUX_GET_USEABLE(desc) \ (((desc)->b >> LINUX_ENTRY_B_USEABLE) & 1) +#ifdef _KERNEL struct iovec; struct uio; @@ -439,6 +440,7 @@ int linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, int linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt, struct uio **uiop); int linux_copyout_rusage(struct rusage *ru, void *uaddr); +#endif /* _KERNEL */ /* robust futexes */ struct linux_robust_list { @@ -472,11 +474,13 @@ struct linux_pt_regset32 { l_uint ss; }; +#ifdef _KERNEL struct reg32; void bsd_to_linux_regset32(const struct reg32 *b_reg, struct linux_pt_regset32 *l_regset); extern bool linux32_emulate_i386; +#endif /* _KERNEL */ #endif /* !_AMD64_LINUX_H_ */ diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index 9b78ac59f9dc..fe9c9b23e552 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -235,6 +235,7 @@ struct linux_pt_regset { l_ulong cpsr; }; +#ifdef _KERNEL struct reg; struct syscall_info; @@ -246,5 +247,6 @@ void linux_ptrace_get_syscall_info_machdep(const struct reg *reg, struct syscall_info *si); int linux_ptrace_getregs_machdep(struct thread *td, pid_t pid, struct linux_pt_regset *l_regset); +#endif /* _KERNEL */ #endif /* _ARM64_LINUX_H_ */