From nobody Sun May 08 14:21:45 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 61D941AC4D34; Sun, 8 May 2022 14:21:45 +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 4Kx61j2LLfz3F60; Sun, 8 May 2022 14:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652019705; 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=ZwxBjldXjVhmc4zTlnCOGxuLab739pfzpGmmkXkZ0is=; b=o2SkrvxQ3YdhMiO/i/GJml2/YGfx7NA5kHX8balx2kKiPS2qzwIZawEWYxL4DoBre2V1dj E0l1UIdFiR8fRUwqLBUImD1BC5qaA8/MVko/V+P1krotM4LNAO53EYgy70VNUCojFabxHk 4I2M4LJfzGpV6SkMNmJvnCaD7Qc1ktZjNwLR0yEGgTz4rUQlWmDkXwgYthR/ygH+aAgbHk 28lIIfYUhcnXsEW2HVb/gQTh9Gk1sXXedwS6ocR0b5xactZjZj3JHFMyT04oj3LdFlvncL HxdVcvRKJqH/LE9FZ3YjHjA96Pvu29gKuqNCvtOtV9aR5dZZL6TOkgtnqsYYVQ== 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 30F4226526; Sun, 8 May 2022 14:21:45 +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 248ELjNu037843; Sun, 8 May 2022 14:21:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 248ELjK2037842; Sun, 8 May 2022 14:21:45 GMT (envelope-from git) Date: Sun, 8 May 2022 14:21:45 GMT Message-Id: <202205081421.248ELjK2037842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 332eca05b557 - main - linux(4): Refactor vdso_gettc_x86 includes. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 332eca05b557f4f9d108480688d9c0933f6ed06b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652019705; 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=ZwxBjldXjVhmc4zTlnCOGxuLab739pfzpGmmkXkZ0is=; b=ywtNzIS9i0yWgF4pSMHhDpfuYOFkob9wyo7kwE9eLyIhdSby6fiS7OLxCHCd3keplbUBgq vT8Ck8soPSw6P+TYH2RK6mgm9JWxisoINM2aop6qAmDWjLk40f8ajJK6ffBs8vyZNIyHCk QZOCQwtGzp5XrfQrRA+kcjCRP6Y//nln4H3NfC4NbS/zOdnfZKBxoUxnNqjXtaCe5RxVA3 hs0aWOMw8m5gCgJJm0sVza+v3c1VVKgbNcIocjluiG/nIPb1u/ehG0A8x7wSkCd6LL05fb I88CsTE4X5RS2FJEgGaIAujqQGIkOiOvhSVROl49dZAT8YzacW2xUqWkuLTixg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652019705; a=rsa-sha256; cv=none; b=os4nPcMrCBC/8xIh+fsWQQMlblff+5LjlTnlR59nE0g4E7TjfA/4kQxKdsqcsWoPkE/YEE puFHcNpcOclGRP2XTc57LhxLPoHDXKjCnZp0Aku6YwYE7nvTigjE0yZ3VE3aJkV5qIUhNC 3kRKwD8CctUGC5hm+vOify0MnK4Zy8EFTzbbaJSNJpDT8WZi47dxL8XgNNsUJtMrtj9Jxh TdcB8XE2FNSQLscq8I+LoJOzPkD1+vp+wV1B7VC/O1PwrddS9DYs922oXxeLwmhEMzg1CA bLHCNEnbemr0mH5c5DgeXeZ0c/ed0+tNV4+f1a+l8GPA/jmPziMZZZhB/o0vuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=332eca05b557f4f9d108480688d9c0933f6ed06b commit 332eca05b557f4f9d108480688d9c0933f6ed06b Author: Dmitry Chagin AuthorDate: 2022-05-08 14:20:51 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-08 14:20:51 +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 --- 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) {