From nobody Thu Aug 17 20:55:10 2023 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 4RRchb2vP7z4q7qs; Thu, 17 Aug 2023 20:55:11 +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 4RRchb2Fwtz4Qnb; Thu, 17 Aug 2023 20:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692305711; 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=XMWOaGU7HRwecw6o3uTg98lTm2HKva5o+qvTOgyEMNM=; b=lSDoEelFedCtDxsIPZBHpWHssmA0ldVu3e1vXDx+c4+zGH6MnKlfvXGARqy7uKYUdTghO4 msaFS0ilfDRiy4NFS6KXXTegc8+skJ+fhHn+TiGW2yTSHv/4gnvTgT+p8kXF2WvRd6rl77 4HCcrIH6Wbalp7hUwA/Hif6VstV8c/tL1gNy59NsFcjQR1R5USZ7s5KhsYOYPblMzoERQ1 XWowVHdlBfBMubnhY4Qncqzz3u4sJQ0Kfon8XEqo3aopSYWIrfIxNSOEPyEF4n/vhpLdnC hy1vkxmboyb40e7/ZdBHceavOBjBMjFKU//ebXa0+zchtcx31ywoj2dx/p+x5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692305711; 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=XMWOaGU7HRwecw6o3uTg98lTm2HKva5o+qvTOgyEMNM=; b=olYXnEE97g1cSRPuUFRDSh9feoFiyh/nRLDMj8Goy+XC5yRu6Az8B4ZQBNrlkZztQisQs4 wzQrSwZEL73k4vHXpYYNNIoOqQMBgNffcoARxB9WSPW9ErSOyiHSQzIUS0SoBwTlGeKNZS BcCHbTZQJb1Wsp0adIJGNnOCiFI/3y72qNVm6EYAXBbb4KTWggnDxIbFgBIflwnDlBOLkO iHDqCfQ6HlplLH1g9G85ZLjSfMyVCgkTwXkNceeMjI5YP7qqep8rdeEEtcTWz6Nu9LxoIe O3oe/Qzqgd/H3CSrnvrH/8R5kchOAzoGtp3tN2vYZgh1AKP8WlvGzuQQ4sKlJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692305711; a=rsa-sha256; cv=none; b=chHBIzpwEGVGPObidvSPttnBlhuTaFVy3LBqeHHwBNYdfS10ZiwGwlE2UtQbzblhIXqhHQ 0dLQDFCALkDuSB5xQx0yZIaOZd73tjTCBnMy0qiTzrHcGbQTOwfj13nWrGEeLh4NZWwcJh BgfH74h7KCLMXi8tq08WiWNiHGq1JJKcZj6Air0C4ltD/l3c7z156UqgRntnjLzN81AVK/ /kBX9L2TjSM2UU2kKkXWBwXUcBCF46wnagOIGKlUN5WPG/CfZHc3gCiEzIH+GPtIVyV2Cc i0oNj9LkNralFoJqaGq3Sp8TygL7MNe293mAz+NzcohwUT/Coe/lxYiKiXxCNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRchb0vwXzphx; Thu, 17 Aug 2023 20:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HKtAfV079098; Thu, 17 Aug 2023 20:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HKtA1N079095; Thu, 17 Aug 2023 20:55:10 GMT (envelope-from git) Date: Thu, 17 Aug 2023 20:55:10 GMT Message-Id: <202308172055.37HKtA1N079095@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: 270e01d4686e - main - linux(4): Fix leftovers after 2ff63af9 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: 270e01d4686ea99ac9760a2cebb84d848352e28b Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=270e01d4686ea99ac9760a2cebb84d848352e28b commit 270e01d4686ea99ac9760a2cebb84d848352e28b Author: Dmitry Chagin AuthorDate: 2023-08-17 20:54:00 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 20:54:00 +0000 linux(4): Fix leftovers after 2ff63af9 --- sys/amd64/linux32/linux32_vdso_gtod.c | 1 - sys/arm64/linux/linux.h | 2 -- sys/arm64/linux/linux_vdso_gtod.c | 1 - sys/compat/linux/linux_persona.h | 2 -- sys/compat/linux/linux_timer.c | 1 + sys/compat/linux/linux_videodev2_compat.h | 3 --- sys/compat/linux/linux_videodev_compat.h | 3 --- 7 files changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index 9f01e5241025..3552f37bae8e 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ - #include #include #include diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index 9d08e3bb28e9..d612ba8e5d9e 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -/* - */ #ifndef _ARM64_LINUX_H_ #define _ARM64_LINUX_H_ diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index 466f4ccaa2e9..eef6022dbae3 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ - #include #include #include diff --git a/sys/compat/linux/linux_persona.h b/sys/compat/linux/linux_persona.h index c3d669c8ea6b..18aef6f02d76 100644 --- a/sys/compat/linux/linux_persona.h +++ b/sys/compat/linux/linux_persona.h @@ -1,5 +1,3 @@ -/* - */ #ifndef LINUX_PERSONALITY_H #define LINUX_PERSONALITY_H diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index bfa17d7e8aa5..66fd309a9485 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -27,6 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include #include #include diff --git a/sys/compat/linux/linux_videodev2_compat.h b/sys/compat/linux/linux_videodev2_compat.h index d9c3b3d07373..cd7ca5f002e1 100644 --- a/sys/compat/linux/linux_videodev2_compat.h +++ b/sys/compat/linux/linux_videodev2_compat.h @@ -1,6 +1,3 @@ -/* - */ - /* * This file defines compatibility versions of several video structures * defined in the Linux videodev2.h header (linux_videodev2.h). The diff --git a/sys/compat/linux/linux_videodev_compat.h b/sys/compat/linux/linux_videodev_compat.h index 0d612fb6f976..c35a59d2ecf8 100644 --- a/sys/compat/linux/linux_videodev_compat.h +++ b/sys/compat/linux/linux_videodev_compat.h @@ -1,6 +1,3 @@ -/* - */ - /* * This file defines compatibility versions of several video structures * defined in the Linux videodev.h header (linux_videodev.h). The