From nobody Thu Oct 17 18:52:48 2024 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 4XTxmJ2scgz5ZLrX; Thu, 17 Oct 2024 18:52:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTxmJ23WXz4PM3; Thu, 17 Oct 2024 18:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729191168; 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=TRIuptZP01I7OHpnQhMiXyVm0LMWVDZ7kfDhGZ5/UBg=; b=Heu2douUVKobW2228lNecDLqfNYVTxgvyg1X1wd5T9nv+JpsCohSgsYF+iuon3y9pVbCb4 mOAdunr4aROIi7ZXq0bMQR5N8RPgWt7E3kH91Uf3ctXopUwHj4bmMFH1/68EDbfMkcYK0C J+xI5lavot2rvZHETZ5p3JEBzm5zOIJ8OtcFQ3RS7kR/AJCCGU9S7jkVbX+xu77XCrJf+9 dZSQJPFLL9kyF5YIqsbmBCtSnCGpaOFhVVgM/0d5QfSNwNBAPnVNYgkiVkc56ZG0p95ghI iRwBFt62XFMZKNyM4BzoQzSAwasAjG1CR6WGVrhVl7LLl5OLgzfvX7Qw42mE7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729191168; 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=TRIuptZP01I7OHpnQhMiXyVm0LMWVDZ7kfDhGZ5/UBg=; b=tr1LDbW63nvdZ3qOL0CFRj4iAn2T+CgmsRQkcOdhr4H+8g0MQaMuUKR1ylUNZVjwSfM+hp NhzIybnmiRcRMKg9OJAngWxRYFTx5emScfiL1DotYL+uLntUlZm6Rz3O5lCtKqlaJssfHA WH1Mskuanj7vO7aMJW1dkl/nalJo1pNg1wecovJ0+0IBdKm1J/S/Xj2PrdYfhqBkw7MM5c nIKOPkJQyOq1fu2ZE4sC30Hnmdxy61mj8VhtmEjTBh9o8Cgk0wwf+iVd4sF2UGRlfnRMcc AQ0n318JdMaCwrmTAiFE71kvAv/KOu1GuFY5lV0zMBF2vrytWryzx2r2WHAjeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729191168; a=rsa-sha256; cv=none; b=l24XuToWznNlt/cy8+lUIwiy1hNPK1KdkQcFl3QAffxHIpSjxfHrV/FUBv+Z/tGLSZ/xa8 uIp68I5F4q/VlizA2R9U6mjA0Dpqcol+XIbzvXrkJHbmtWHNh4Gx4opl0+QrLhaqukQZT1 ON017dTv2d4MLkUGhM6+PMxm7VQKgXzrXrDZ7aBhmvsxp4Q3ESn9ay8IwwRPKbE1LRuQ9a thF+/q3vpEwDOU0qFq5E5HbmeSV5Azt1E3gfIP+hRduwwY3HieMsBmibUD8SljzsOvR9F+ byUba36cuSb8vvTNq/lusxWYjyBESNg3/ApXYgtUsK7Ii6yryxXHS9/0VNP3Ew== 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 4XTxmJ1fzqz12BF; Thu, 17 Oct 2024 18:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HIqm4r070783; Thu, 17 Oct 2024 18:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HIqmmo070780; Thu, 17 Oct 2024 18:52:48 GMT (envelope-from git) Date: Thu, 17 Oct 2024 18:52:48 GMT Message-Id: <202410171852.49HIqmmo070780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f11c79fc0046 - main - Revert "modules: Add missing opt_*.h files for stand-alone compile" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f11c79fc0046c1579faf7cdf6505c51846cc5709 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f11c79fc0046c1579faf7cdf6505c51846cc5709 commit f11c79fc0046c1579faf7cdf6505c51846cc5709 Author: Warner Losh AuthorDate: 2024-10-17 18:49:42 +0000 Commit: Warner Losh CommitDate: 2024-10-17 18:52:32 +0000 Revert "modules: Add missing opt_*.h files for stand-alone compile" This reverts commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb. I'd overlooked 06c07e1203324bfe8ab4526c82dbb750864272d5 when I updated a branch I'd previously committed but not updated. My search for this in my tree before the commit was to a stale file... Sponsored by: Netflix --- sys/modules/linux/Makefile | 2 -- sys/modules/linux64/Makefile | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 36dfbbe2192f..eb4e17ec706b 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -33,7 +33,6 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_uid16.c \ linux_vdso.c \ linux_xattr.c \ - opt_compat.h \ opt_inet.h \ opt_inet6.h \ opt_ktrace.h \ @@ -42,7 +41,6 @@ SRCS= linux${SFX}_dummy_machdep.c \ bus_if.h \ device_if.h \ vnode_if.h - .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_dummy_x86.c VDSODEPS=linux_vdso_gettc_x86.inc diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 119d90126ab3..b23891a65a4f 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -28,17 +28,14 @@ SRCS= linux_dummy_machdep.c \ linux_vdso.c \ linux_timer.c \ linux_xattr.c \ - opt_compat.h \ - opt_inet6.h \ opt_ktrace.h \ + opt_inet6.h \ opt_posix.h \ - opt_usb.h \ bus_if.h \ device_if.h \ vnode_if.h \ linux_support.S \ linux_vdso_inc.S - .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_dummy_x86.c .endif