From nobody Mon Oct 24 18:13:53 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 4Mx39Z0bXmz4gNJ4; Mon, 24 Oct 2022 18:13:54 +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 4Mx39Z00Dyz3q6Q; Mon, 24 Oct 2022 18:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666635234; 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=HuKhJKlBbC/xqq3FachEYY5Tkt6479qItrWmeY0l44Y=; b=syiAE5IvebzCLuk5Z5H7Ln+FcXw6p0WfhuA5B5D+zoTQnoSnnYae/5vNEtHepCuUNdKoKE 6vKyRcL1/nYaAEfOvv+wsLS7bXI48DDhVtpVPovYJAf4y63h4kQUCE7YHyO2QqYjUgj0/3 K93e7tIqjYAfG5SY1/DojPscx38KZ9u5KwvqGcpkBEtQsXL6Zbf5/XK5uyJZ/lBBwGfO+u ENr3Fl9uWKNGlaB8+XFguLqNjeuO5UXtolwbBWltl9FfIzqe5BqMxxpYHM4tSXIZ1TbHqx BBYbjnq76J7veFtQlma5aZyeXwLnEN3ehKolb++2Qv7kJUYtv2KDH1Jc1+eJ/Q== 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 4Mx39Y6CsZzK85; Mon, 24 Oct 2022 18:13:53 +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 29OIDrfw088387; Mon, 24 Oct 2022 18:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OIDrmE088386; Mon, 24 Oct 2022 18:13:53 GMT (envelope-from git) Date: Mon, 24 Oct 2022 18:13:53 GMT Message-Id: <202210241813.29OIDrmE088386@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: d4f6b11f66de - main - DEFAULTS: move intrng to DEFAULTS for its platforms. 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4f6b11f66de563bc0c17890ca4de088b2629563 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666635234; 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=HuKhJKlBbC/xqq3FachEYY5Tkt6479qItrWmeY0l44Y=; b=YgIPfO/82vAgmRkOaIP0bBOgCorxjH+HxBHWug6aBqCCxNa0SOf4mRcoUkFSPnsBW9bVwB UZIq20XYhk3DjF7ROUBb82sLjqRVv/XbC5dg+xjXT7ByW6qDLGxTysAXHADc8xYhxRA3ny oOk3V3M3WjIk0MeScDM42FbcKfEeayDAPZpmnbmuVMR5MId76o6vp/Sytrr5xWC+jIOr7X t+PgeQ1+4ZXKQIrjfQ2Za/vaw5kR0SnnG+GIIiHx/B31Xh7Jl6+mC/P692PJgSfmpk8IXp QTzVBbxUQdE4yIjJJyppF39h5o6Q2bOlt17D9U0jvRsOXlEjyYzuS4tHYeeDIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666635234; a=rsa-sha256; cv=none; b=e/xloqtaDpEYb2Xx/A7wLEkEaM+3Pn+FQobGlsWspkC09OJEiAmgTGNbBvNvBNr61CJYNl xu+EtQxVO2be0d5A8yFBWVWEUHiWMAjPQTsgLJyl6+PyPz7Cw3uiVCYJSo7EMpRNtlJlyS FPlVtJuaz78yEjIrfnpi4Kc/ismL95bXe/5f6apGWcpfTPA4KDqGRxAP7DxdHxVsDDFSeK 06gwm1qm0z4E6n0nBv0mAS+tibNqUqFKeOYffTpHVh6fvZofChb3qGPGwcLVh1MCXaSE0C r/cK4IYxGaUFp6TBjN8uGsQZCz4RmvPSdK8lHzDR3X95+cv/WgYKslp7D7IJsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f6b11f66de563bc0c17890ca4de088b2629563 commit d4f6b11f66de563bc0c17890ca4de088b2629563 Author: Warner Losh AuthorDate: 2022-10-24 18:11:58 +0000 Commit: Warner Losh CommitDate: 2022-10-24 18:13:03 +0000 DEFAULTS: move intrng to DEFAULTS for its platforms. Sponsored by: Netflix Reviewed by: manu, kevans Differential Revision: https://reviews.freebsd.org/D37107 --- sys/arm/conf/DEFAULTS | 2 +- sys/arm/conf/std.armv6 | 1 - sys/arm/conf/std.armv7 | 1 - sys/arm64/conf/DEFAULTS | 1 + sys/arm64/conf/std.arm64 | 1 - sys/riscv/conf/DEFAULTS | 1 + sys/riscv/conf/GENERIC | 1 - 7 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS index e5533850aa36..4eeb2b7090d2 100644 --- a/sys/arm/conf/DEFAULTS +++ b/sys/arm/conf/DEFAULTS @@ -7,4 +7,4 @@ device mem # Default congestion control algorithm options CC_CUBIC # include CUBIC congestion control - +options INTRNG # All arm systems use INTRNG these days diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index 4826980da480..17087f30f4f1 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -3,7 +3,6 @@ # $FreeBSD$ options HZ=1000 -options INTRNG # All arm systems use INTRNG these days options PREEMPTION # Enable kernel thread preemption options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 9412a8e92855..8ace5c01eeab 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -3,7 +3,6 @@ # $FreeBSD$ options HZ=1000 -options INTRNG # All arm systems use INTRNG these days options PREEMPTION # Enable kernel thread preemption options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking diff --git a/sys/arm64/conf/DEFAULTS b/sys/arm64/conf/DEFAULTS index b0d2aa6c473b..db76185154e1 100644 --- a/sys/arm64/conf/DEFAULTS +++ b/sys/arm64/conf/DEFAULTS @@ -17,3 +17,4 @@ options GEOM_PART_GPT options CC_CUBIC # include CUBIC congestion control options NEW_PCIB +options INTRNG diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index e24b7f417034..6480ca6530e4 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -65,7 +65,6 @@ options VFP # Floating-point support options RACCT # Resource accounting framework options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default options RCTL # Resource limits -options INTRNG options LINUX_BOOT_ABI # Boot using booti command from U-Boot options PERTHREAD_SSP # Per-thread SSP canary diff --git a/sys/riscv/conf/DEFAULTS b/sys/riscv/conf/DEFAULTS index ccc4eff8fcf0..363186d28904 100644 --- a/sys/riscv/conf/DEFAULTS +++ b/sys/riscv/conf/DEFAULTS @@ -17,3 +17,4 @@ options GEOM_PART_GPT options CC_CUBIC # include CUBIC congestion control options NEW_PCIB +options INTRNG diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index cf4460c7bf2e..2e35a49825d4 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -77,7 +77,6 @@ options RACCT # Resource accounting framework options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default options RCTL # Resource limits options SMP -options INTRNG # RISC-V SBI console device rcons