From nobody Mon Jun 13 17:36:12 2022 X-Original-To: dev-commits-src-main@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 C5BB8835888; Mon, 13 Jun 2022 17:36:13 +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 4LMJdS66P3z4tgp; Mon, 13 Jun 2022 17:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141773; 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=qOPxwXtp1uUvXYfcpH+TgY4tQQOipLneknQkTpEvDSA=; b=Uh5Kk1g8DPJ+04Q7pMfLGBtmGo2RM7d1tewIr7b8nyFm9lIjEDArzTQW9ur9KkupX7P9rL WrDQDTPq7ga+E95sTzDKRrkDsI/nDU45pycnsFMokLW7o8BtA2o+/4mxLz5TZ6DbUdbOoe aNIo3I+HRKkaiklO1HtCK8ciQqS7wumIFlul2xEdacUqXIj080iJL0vLrofC8h+Odd/cTm hmTyIYyvWWIgclM1sTK5zy2cIEg0j0SgOSo4hCgp23CuSSe2WhH8J5xadZFjb3MLNj5Uu9 eB/mSgYC4pGCjGJJwJUj3V/lju80VDaaSoyeFhaWumb6+IegiiSFrikg5e+Mqg== 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 851CC1A392; Mon, 13 Jun 2022 17:36:12 +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 25DHaCVa061502; Mon, 13 Jun 2022 17:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHaCJE061501; Mon, 13 Jun 2022 17:36:12 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:12 GMT Message-Id: <202206131736.25DHaCJE061501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8dc3fdfe69d5 - main - amd64: -m32 support for machine/counter.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8dc3fdfe69d588851237cc9e2e8cdc90a4a6aa0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141773; 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=qOPxwXtp1uUvXYfcpH+TgY4tQQOipLneknQkTpEvDSA=; b=e/BNVoWlyNW3WJTyOMljwn7XJKceEZ+JuJCf5a3o7xsCuU3hZG5CpR5NF5u5zGPYcp0brZ f86baqIhuSyeUSA0rHsB13mYgsG4ks0qYpXsBp5RVAFgGKIcxOig7OI0IDIu2iN5TZ0h96 z/mDNeu1ZaNE7W6lwUUr4dZUeF8UGXHw1c8seTDB1aSuaQ8gpdSm2VPjKgNVUfBcdltAJ4 T2+AO1E9kRIM0Cy3Gg9wiQrmOWQnJF2zqYPXreqmq4+efHbVHwVWH4CHgeeg8DGJ4Tg5M7 BKokf9ExbRlyO4Z7yK3Yp8rMRmOrBlthbjL4l/A1tPgfvgSf6/rLZ2glAnUajQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141773; a=rsa-sha256; cv=none; b=Se2MZ5qcU1zKvh7RQSBmEZcIt3qfi+owTjCoAehPpbajcgTBcL+N2/rhCtSkNdsYGtiBn6 6WrYASnqpxV8rKWMojdivY0wTV1mLvMYWWbNIvoBmPnSrwpj2A3g7Xx7jc6v8C0osgDkGG 6aG/TGco/YLN9a72G4CImcyNe5qHo8iI6AcOM2y1nEKcnJH/mAudjbFI2V7xdHLqN1CpYc Z5gW7QBz7GmipPcmG8za0L2SuLuzd5xxo0KIwZ8qOBa3siJkYnQ9dRAk4Ep0vOre2OIISe kmplSe6sIoeJN5Zb1OFUn51vOFWFkLVgHxl8r4O1kH3ZV/OUHdWgSrMjeXb4bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc3fdfe69d588851237cc9e2e8cdc90a4a6aa0f commit 8dc3fdfe69d588851237cc9e2e8cdc90a4a6aa0f Author: Brooks Davis AuthorDate: 2022-06-13 17:35:40 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:40 +0000 amd64: -m32 support for machine/counter.h Install the i386 counter.h under /usr/include/i386 on amd64 and include when targeting i386. This is a kernel-only header required by procstat's ZFS support. Reviewed by: jhb, imp --- include/i386/Makefile | 1 + sys/amd64/include/counter.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/i386/Makefile b/include/i386/Makefile index de270655fb69..58c619f4dbdf 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -14,6 +14,7 @@ INCS= \ # These kernel-only headers are used by procstat's ZFS support. # This should be fixed. INCS+= \ + counter.h \ pcpu.h \ pcpu_aux.h INCSDIR= ${INCLUDEDIR}/i386 diff --git a/sys/amd64/include/counter.h b/sys/amd64/include/counter.h index e7eb19e058cd..1d641a365e3f 100644 --- a/sys/amd64/include/counter.h +++ b/sys/amd64/include/counter.h @@ -28,6 +28,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef __MACHINE_COUNTER_H__ #define __MACHINE_COUNTER_H__ @@ -90,3 +94,5 @@ counter_u64_add(counter_u64_t c, int64_t inc) } #endif /* ! __MACHINE_COUNTER_H__ */ + +#endif /* __i386__ */