From nobody Fri May 12 11:17:17 2023 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 4QHmSZ29dTz4BsWB; Fri, 12 May 2023 11:17:18 +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 4QHmSZ1SVvz3kg6; Fri, 12 May 2023 11:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890238; 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=NJyWCtVGr83hvvKaA4bSDJV7iLi9BNV6zH+694Vvx74=; b=HNfu5waE6son3ZaTXBz0YQrhdWQmL966XwId8hwFqMj4u4Fd9/ToPj37aUXyhAs1s1D9JE Kh2xmt8TwaddnCiSv9evu84PKhn5//PZezrhuLCB+FjAHoLKVZPUfIHVEEK70VqYN9nQ/g wkfwbFAGL8PAvf1FsEjetZUONr+NIGZek468IKHb58ehdVHSaovTLnui0IpoBjd+3MjjKZ cIPfa2r9IZIo0huBbsC+bGIXRQt0IEUQ9gwi4cNILMTa11S0EHi1u9nLUrfnj/+Tnx7EnO oSa74icNlztoWEUNxNLF2lJTeWJqTGbvuUhjL+8r5IGPY5UqD+Cgi1He6kmoxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890238; 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=NJyWCtVGr83hvvKaA4bSDJV7iLi9BNV6zH+694Vvx74=; b=EZUiylGXYY/FB2e4VUKtoe9Z3Cd31Q/6PHgfUdMkRB1bK/0oZgVaUgaIxfJnXJjS8T7Gyh m9cF8Jshu7BtQO/KyvT/JhbHhhuCkvltohEAKOVEjkn36/Q4aptKSseTbmdgKH04kHcxuH 2yJjHO2XLxUniCmM4S7D7/+nM8ywcxuhEaoW2vvT3RR6xVvjPrFa8l7TqArxLI3x+h6RdK M6J7BwZuh24w4OxOZ890Uu1nVqbuMY8MJKzO2kNalhqutb54J+Q6xz7F1GTRCUSl9e6bBs bQo89pwtJyciF8kPGXse/pp4Nf4eSWRTlwgeW6Y9jGgYHQI4AZ9tOOVs72B73A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683890238; a=rsa-sha256; cv=none; b=iTINRtEy5+4F1YYKj3DVkv7oS3b0K7Gk7cFFZYCe5Szr6JopHEYyZ+gW14t/77Q0992gZ1 3DPv2aboKbF7hqSPEHoZJy7Bz+FXfxsdvPh/E5WzuBUqdKmigWUOcNtqUX9eqVxWkVskp3 QZaAoMiDc2Ld1Ew7z+486I1fmEa8Sc1uvdSJSUlZmxkKOeyoT+gQnFpnYU0pIAzDUqJhZL W9f9VBVK68E8J/RM2069RIQ5mk6O7AS23dXE4IDOENuQZZIX4aQXN4JgO5/8LKiiZ90oKu y0N9NBYop0KyQYa/xAmsVH6c8HtmXUR0KB58GWBzXAIzicQ54IICKMLTRWST3w== 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 4QHmSZ0TQbzYX2; Fri, 12 May 2023 11:17:18 +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 34CBHHcf018421; Fri, 12 May 2023 11:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CBHHFJ018420; Fri, 12 May 2023 11:17:17 GMT (envelope-from git) Date: Fri, 12 May 2023 11:17:17 GMT Message-Id: <202305121117.34CBHHFJ018420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 721b44ba5f3f - main - amd64: pmap.h put a guard around a pcpu.h function 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 721b44ba5f3fb711af5797eae6345295721e13dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=721b44ba5f3fb711af5797eae6345295721e13dd commit 721b44ba5f3fb711af5797eae6345295721e13dd Author: Bjoern A. Zeeb AuthorDate: 2023-05-12 11:14:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-12 11:14:54 +0000 amd64: pmap.h put a guard around a pcpu.h function pmap_get_pcid() calls zpcpu_get() which is defined in pcpu.h. It is unclear why we do not include that header but like right above the change add another guard around pmap_get_pcid(). This allows some LinuxKPI headers to compile again. Suggested by: markj MFC after: 10 days --- sys/amd64/include/pmap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index cf41855a7c59..b61edf475b4b 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -534,6 +534,7 @@ pmap_invlpg(pmap_t pmap, vm_offset_t va) } #endif /* sys/pcpu.h && machine/cpufunc.h */ +#if defined(_SYS_PCPU_H_) /* Return pcid for the pmap pmap on current cpu */ static __inline uint32_t pmap_get_pcid(pmap_t pmap) @@ -544,6 +545,7 @@ pmap_get_pcid(pmap_t pmap) pcidp = zpcpu_get(pmap->pm_pcidp); return (pcidp->pm_pcid); } +#endif /* sys/pcpu.h */ #endif /* _KERNEL */