The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f6b11f66de563bc0c17890ca4de088b2629563
commit d4f6b11f66de563bc0c17890ca4de088b2629563 Author: Warner Losh <[email protected]> AuthorDate: 2022-10-24 18:11:58 +0000 Commit: Warner Losh <[email protected]> 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
