From nobody Tue Apr 16 02:34:46 2024 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 4VJSmk3FH4z5HZpl; Tue, 16 Apr 2024 02:34:46 +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 4VJSmk1FbVz4HmG; Tue, 16 Apr 2024 02:34:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713234886; 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=V+0AOBnI+y1qOGFivfjFCRQxYWy4L/8COSJBtZLfQMA=; b=s+j5zQwvRGcaGkNgQOcMMNMYeavfkoYvVGCO2xFLeqP8Erh6ZtGgtWvzrVpBmKuw3vFepf PK68X5jvlU+h+MliZ/OM4BcUxfyVx+2K9YRlZwSdVhBGUWpd2lC2j+iRo5E1QJPTSNguk9 HuiCwixK3XVA9z2EoqmtjYr7GI5XpvFds7TxxDF8/du+4H450H+8lh6Q7JD8Cm1KVqAE1G kJF1yyoMT4DDhLojrdCKTMqHhhlD6y+EuuE6wRFSu1jPlPa16MBNVVNdjp21VU1wD+bDjY px82B+8QWKQwFzx9uTRsCW2siJnJoh4ZW41rR+wfLS81vPYNcAwdgJ3WuCu/Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713234886; a=rsa-sha256; cv=none; b=IG8AVFvSnG2JIHxU7OQpBSJ22FBdSB7cHhRVybrKfKr5C22gWTPBBzg+CMPJdO793mhFp3 xiAA4v/6tvytyxaEzlV/AcxLf2f8GlNZW25L6Qa4+oQnVYz2kHYzyHhELF2tJwdfI6O+t+ o0v2OjPoaJ0cdmOyCJZsuEMjkD5YWME70bLv5+FkN4/QUEF8FP+LfDb5zYywisGAjQaQq6 YkfheEYYkW4YMTNDRweqO6801nO04S2nTEHnGxQ/taCJYwrJA+YsKa9OkHhMP3hpDSExZv oxbdJXVcSH4pjsK0xM1fb6BofJztqcnYN8carQOBCUt5uyxTmYYwCfFlis93dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713234886; 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=V+0AOBnI+y1qOGFivfjFCRQxYWy4L/8COSJBtZLfQMA=; b=EfK0fzxXX2sVrbZG3HN8vziZL7IXq3Ch74XR+lDFASlzU3y0hv8IvLs9456F78gUP+N5d5 xL5STLGyEgxXeWHJlTLEIcdfTH27n31DOu2c2k6BVE40ZLAZMm4E4JzqyaZWON6HtEU5u3 /JOoasU23Ago4GBQh0kDu819fS+BwD7jVUeKY6CGXIVgLHo6DIHbqjxLoy3D+mvXhFA6bV V6decnmI54vrIbMGQOanojVqp0968fy996Qewo8mjbp85uCC03HyRZtBF9fbcgkNhhNhPZ DE38SUjZMEt/qT7NeGjFYWIhyNqHTp+iZ/gJfEYkbk4/jNx0UOI2ohge3jj51g== 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 4VJSmk0skbzQ3m; Tue, 16 Apr 2024 02:34:46 +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 43G2YkP3037666; Tue, 16 Apr 2024 02:34:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G2YkiI037663; Tue, 16 Apr 2024 02:34:46 GMT (envelope-from git) Date: Tue, 16 Apr 2024 02:34:46 GMT Message-Id: <202404160234.43G2YkiI037663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5417db3a9739 - stable/14 - stand: Retire setting hw.eisa_slots. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5417db3a9739c47520cf3651caeb1e869bb49243 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5417db3a9739c47520cf3651caeb1e869bb49243 commit 5417db3a9739c47520cf3651caeb1e869bb49243 Author: Warner Losh AuthorDate: 2023-11-24 17:58:44 +0000 Commit: Warner Losh CommitDate: 2024-04-16 02:32:05 +0000 stand: Retire setting hw.eisa_slots. When the eisa code was removed in 2017, prior to the stable/12 branch, setting hw.eisa_slots became a nop. The oldest supported branch doesn't have eisa at all. The need to set it manually on boot disappeared largely by 2000... Sponsored by: Netflix (cherry picked from commit 21795c374aceb685dbdb1bd18c7a5c41c3cf0baf) --- stand/forth/menu-commands.4th | 2 -- stand/lua/core.lua | 2 -- stand/lua/core.lua.8 | 1 - 3 files changed, 5 deletions(-) diff --git a/stand/forth/menu-commands.4th b/stand/forth/menu-commands.4th index decf3fdf6fa4..8121272114d0 100644 --- a/stand/forth/menu-commands.4th +++ b/stand/forth/menu-commands.4th @@ -127,7 +127,6 @@ also menu-namespace also menu-command-helpers s" set hw.ata.ata_dma=0" evaluate s" set hw.ata.atapi_dma=0" evaluate s" set hw.ata.wc=0" evaluate - s" set hw.eisa_slots=0" evaluate s" set kern.eventtimer.periodic=1" evaluate s" set kern.geom.part.check_integrity=0" evaluate ; @@ -137,7 +136,6 @@ also menu-namespace also menu-command-helpers s" hw.ata.ata_dma" unsetenv s" hw.ata.atapi_dma" unsetenv s" hw.ata.wc" unsetenv - s" hw.eisa_slots" unsetenv s" kern.eventtimer.periodic" unsetenv s" kern.geom.part.check_integrity" unsetenv ; diff --git a/stand/lua/core.lua b/stand/lua/core.lua index e7ffdc091c0c..85896183d98f 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -177,7 +177,6 @@ function core.setSafeMode(safe_mode) loader.setenv("hw.ata.ata_dma", "0") loader.setenv("hw.ata.atapi_dma", "0") loader.setenv("hw.ata.wc", "0") - loader.setenv("hw.eisa_slots", "0") loader.setenv("kern.eventtimer.periodic", "1") loader.setenv("kern.geom.part.check_integrity", "0") else @@ -185,7 +184,6 @@ function core.setSafeMode(safe_mode) loader.unsetenv("hw.ata.ata_dma") loader.unsetenv("hw.ata.atapi_dma") loader.unsetenv("hw.ata.wc") - loader.unsetenv("hw.eisa_slots") loader.unsetenv("kern.eventtimer.periodic") loader.unsetenv("kern.geom.part.check_integrity") end diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8 index cb52ae9f1b30..b9af93758818 100644 --- a/stand/lua/core.lua.8 +++ b/stand/lua/core.lua.8 @@ -127,7 +127,6 @@ Sets or unsets .Ev hw.ata.ata_dma , .Ev hw.ata.atapi_dma , .Ev hw.ata.wc , -.Ev hw.eisa_slots , .Ev kern.eventtimer.periodic , and .Ev kern.geom.part.check_integrity .