From nobody Fri Jun 17 19:40:07 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 8C95A85CACD; Fri, 17 Jun 2022 19:40:08 +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 4LPqBb74mCz3hBD; Fri, 17 Jun 2022 19:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494808; 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=RF7FYebDiBEDozHa0wJJ2rOS1OpXhNDsOSsm7SHTVMY=; b=xHk4IMa7fYSEZAlDsvmHvg+TfkObFLMHxA7BNuhQR3mCDgltvNN3VXLb7dA7ap4Zi2Tldk nCXZqLSO/N4XR+gFaCZrPyupJzLT4SkrkuiO3wZjxuwOgGjqgDyADdEQmuW1+B5a0cFQP2 rU6pOxEl9XvBU0jQ503MQYGRDIAgx2kcCE7neDFrQH9rBKgOyDMBvVrYzi1coUNXdWG2Rm Myhn+3AAWc9AwIqsoplRyeKKl3L6L12pMBJUZH4rhimfutzOjhr7WQa8FR3YmXekgt25Wv kgT0108zcoVVcU4AmveiRe8hMVvLc96sstoUauG1Lk1Zq7l4QXqK8XsyiiVQrg== 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 273CD25A4E; Fri, 17 Jun 2022 19:40:07 +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 25HJe7ZI019715; Fri, 17 Jun 2022 19:40:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJe7la019713; Fri, 17 Jun 2022 19:40:07 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:07 GMT Message-Id: <202206171940.25HJe7la019713@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: f360bdf68de9 - stable/13 - linux(4): Refactor vdso_gettc_x86 includes. 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: f360bdf68de9cc9b201e9609ac7c7190ed5e4512 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494808; 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=RF7FYebDiBEDozHa0wJJ2rOS1OpXhNDsOSsm7SHTVMY=; b=LdPvDe7QAS/WL9+d9gWx0k3HVpcBRhxxWKF5N1spsUIRpOmBdfMPILMEZTjOSiNRxBW6po Pa0Jm7+ur5/CcbjIAhBZjDb+j3sOSPsfRuKLYqeBIVyKtgVYfjlXlM3I3+STRhDJEgJvvK J979CVWySJ0rJFJt+eNMF4CLZgjuiAY3vtm2i30UGE1S6ub+prjAA3dhY0EHmUdjLroYDa PcoIN35zGlqNjCa6abi6MwPT4Mu2UEWBF6I3gwri/X8mnioYZdCXO648IN/BdjMyCaB1ZB isG4FAwlvI3tkGTLyreU+krIUd8xQ5ikXKtUg6QzVoPvQZibpUp2e5Fh7EX9RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494808; a=rsa-sha256; cv=none; b=IJsDB2skfKBCGbEWFVCYdKqvn9Qbye5HozfB5TAhwtNusFtNgmvQwoVFASMGy3TG9Ydvw9 LwGXEbjlOjAW6Yte+06HWN5II68UrqGneYg6JS5qTscaUSOx72Ti4LrT9maHzKZdu95uLp sh/Ilzm4d72GOaOzDDR9+fcfpaEPnYh/mnWv5dDxDtCPls6MHoblCUPfhNTz7vaJkHKjNP fnpgTCpBtowq8Md89MSUYqVfiaSCdg8I2aeocUZLjI+BfbubiG5UF+P5CJRFFu91Fpskat clT60d8drJzBTzbJjPxkpRO+0s0qUtRdXtzM6MY4CpKrJ15jaJUulsMozN3q6A== 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=f360bdf68de9cc9b201e9609ac7c7190ed5e4512 commit f360bdf68de9cc9b201e9609ac7c7190ed5e4512 Author: Dmitry Chagin AuthorDate: 2022-05-08 14:20:51 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:59 +0000 linux(4): Refactor vdso_gettc_x86 includes. Factor out includes from common vdso_gettc_x86 file to the corresponding MD files. MFC after: 2 weeks (cherry picked from commit 332eca05b557f4f9d108480688d9c0933f6ed06b) --- sys/amd64/linux/linux_vdso_gtod.c | 1 + sys/amd64/linux32/linux32_vdso_gtod.c | 5 +++-- sys/i386/linux/linux_vdso_gtod.c | 1 + sys/x86/linux/linux_vdso_gettc_x86.inc | 13 ------------- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index 57d3f4b45dd4..65e45ce29505 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index 0caf787c9503..bbe15e462c09 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$"); #undef _KERNEL #include -#include -#include +#include +#include +#include #include #include diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index 046b864c54f5..8619a21cd3f4 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include diff --git a/sys/x86/linux/linux_vdso_gettc_x86.inc b/sys/x86/linux/linux_vdso_gettc_x86.inc index ade78a03486b..11c2a531e97e 100644 --- a/sys/x86/linux/linux_vdso_gettc_x86.inc +++ b/sys/x86/linux/linux_vdso_gettc_x86.inc @@ -30,19 +30,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - -#include - -#if defined(__i386__) || defined(COMPAT_LINUX32) -#include -#include -#else -#include -#include -#endif - static inline u_int rdtsc_low(const struct vdso_timehands *th) {