From nobody Mon Jun 13 17:36: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 9405C83592D; Mon, 13 Jun 2022 17:36: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 4LMJdV32GMz4tkD; Mon, 13 Jun 2022 17:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141774; 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=bVYJsh2SbTJsCezn57tjH1WBALXLZG8iANxPGB7pF4s=; b=T/QowdDmkUtmh3dpem5xPxWMC9Cbcndc7Mh0KzeihvW5ScEzzcDg6NSJDruD3LrYoOd2/7 XXhVE94MbD2+wni6LYlyyyZVqRaWXuQZjnGp8LRfkNJ944/G05XDiYRpI3yfQm6dQ/WrT5 t8YTsHtzkgBcH20W/tdA0Grb7u73buErbYIhCMrYU9c96+k09b1pzDMssXYm1cSIdjv+q9 t0/QJ6lf6p4nSwsh0ZR28eR6u/ubht9UArWERupTQsDCuJWFwEUAu/00Qr0Ugq7w+N/16+ LbxvfabiemjAa25V+bECSFiThXBkkjmq9gqY4w+UjrbVXA2Jk+ZRrS6lt7O+zA== 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 AE1581A0E8; Mon, 13 Jun 2022 17:36: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 25DHaDsG061526; Mon, 13 Jun 2022 17:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHaDR6061525; Mon, 13 Jun 2022 17:36:13 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:13 GMT Message-Id: <202206131736.25DHaDR6061525@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: 5ea3094e6a75 - main - amd64: -m32 support for machine/md_var.h 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ea3094e6a755b931d144f30a824e2fed10a8a33 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141774; 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=bVYJsh2SbTJsCezn57tjH1WBALXLZG8iANxPGB7pF4s=; b=NHsp4+ZeO1Y2N8jKoBhw34AFh6d+rhpiJXLE4IxIQMctS0MDMykOHDmuKLQ/bfjAehgmxq qLmai0wcPoHF4BTeCfMFF2ekrF1BOCwYAckwJ3tajMEJaWYz/Aw3t3m4W1HqqEd0vuIB+X plxuHTAAjHemuKaDZNYY+oPcm7I/OdGnM6OWSPCwLeeEyJR9aXAtH9eM2SCDYU4kpx+To2 8gW+3a5rh4HJMj/vD6L/wi/L4kIYn92o8i8MJc0TYq+Wk7ue1gGrkruD1CHp9ayYF/yhs/ pNm88JoAiqZ9waK4LA3pePm6ZrpnVpPiGUAiTnCOnDVX8KnHcYz4ee/xVTSfAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141774; a=rsa-sha256; cv=none; b=xWaXiQtfOgk//0DoNPt9oIkBf7SB4xqN7Qmikaz5p9s1BZn0pALRdlRrficF5TJ31g70m4 jgDJTazwk1xRhfL1Z+3EAeT0c+CQqCfLK8B4XXQr45NyjvY3h/HvCjsU4M0E5aq5YEAm6s A7fKqSRcR4RtL9FSJDS7TvKcoNiPHY8bJrfGNWpbvt87XZL3MnoeTKyPnkiBPKsOF/b3Dv vjGL2jLYzZc2IZJTqeECoLgrN4xyzA61twfO1zLb7o/rKMQlGSaxUcDuhcUMG1pEi1AUa/ tfz6WqMIgIyLc+MuGXOe04lNyVlnpG0P05ovhH6OVBLRlbaIqC3q7dXqhoD5eQ== 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=5ea3094e6a755b931d144f30a824e2fed10a8a33 commit 5ea3094e6a755b931d144f30a824e2fed10a8a33 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/md_var.h Install the i386 md_var.h under /usr/include/i386 on amd64 and include when targeting i386. This is a mostly kernel-only header required by procstat's ZFS support. It is pulled in by the i386 machine/counter.h. Reviewed by: jhb, imp --- include/i386/Makefile | 1 + sys/amd64/include/md_var.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/i386/Makefile b/include/i386/Makefile index 58c619f4dbdf..b5f5a23eb906 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -15,6 +15,7 @@ INCS= \ # This should be fixed. INCS+= \ counter.h \ + md_var.h \ pcpu.h \ pcpu_aux.h INCSDIR= ${INCLUDEDIR}/i386 diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 53358600dc79..196836b5baea 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -31,6 +31,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_MD_VAR_H_ #define _MACHINE_MD_VAR_H_ @@ -95,3 +99,5 @@ int set_fpcontext(struct thread *td, struct __mcontext *mcp, char *xfpustate, size_t xfpustate_len); #endif /* !_MACHINE_MD_VAR_H_ */ + +#endif /* __i386__ */