From 636444d31e8a6fe9711c99cec24e971d05f59efd Mon Sep 17 00:00:00 2001 From: Kernel Build Daemon Date: May 15 2023 10:19:01 +0000 Subject: Merge branch 'master-vanilla-configs' into linux-next --- diff --git a/config/arm64/vanilla b/config/arm64/vanilla index ad8fed8..88e767c 100644 --- a/config/arm64/vanilla +++ b/config/arm64/vanilla @@ -446,11 +446,11 @@ CONFIG_NR_CPUS=480 CONFIG_HOTPLUG_CPU=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=6 -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y diff --git a/config/armv6hl/vanilla b/config/armv6hl/vanilla index 2ac79e0..887d519 100644 --- a/config/armv6hl/vanilla +++ b/config/armv6hl/vanilla @@ -510,7 +510,7 @@ CONFIG_HAVE_ARCH_VMAP_STACK=y # CONFIG_HZ_1000 is not set # CONFIG_HZ_200 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_300=y # CONFIG_HZ_500 is not set # CONFIG_HZ_PERIODIC is not set # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set @@ -3274,8 +3274,8 @@ CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HX711=m -CONFIG_HZ=100 -CONFIG_HZ_100=y +CONFIG_HZ=300 +# CONFIG_HZ_100 is not set CONFIG_HZ_FIXED=0 CONFIG_I2C=y CONFIG_I2C_ALGOBIT=m diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla index 532fc75..104d9d3 100644 --- a/config/armv7hl/vanilla +++ b/config/armv7hl/vanilla @@ -668,12 +668,12 @@ CONFIG_HOTPLUG_CPU=y CONFIG_ARM_PSCI=y CONFIG_HZ_FIXED=0 # CONFIG_HZ_100 is not set -CONFIG_HZ_200=y +# CONFIG_HZ_200 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_300=y # CONFIG_HZ_500 is not set # CONFIG_HZ_1000 is not set -CONFIG_HZ=200 +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y # CONFIG_THUMB2_KERNEL is not set CONFIG_ARM_PATCH_IDIV=y diff --git a/config/i386/vanilla b/config/i386/vanilla index c23f746..041d803 100644 --- a/config/i386/vanilla +++ b/config/i386/vanilla @@ -493,10 +493,10 @@ CONFIG_EFI_HANDOVER_PROTOCOL=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_MAP=y # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y # CONFIG_ARCH_HAS_KEXEC_PURGATORY is not set diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla index 3210f3a..08bd0b3 100644 --- a/config/ppc64/vanilla +++ b/config/ppc64/vanilla @@ -507,11 +507,11 @@ CONFIG_QE_GPIO=y # # Kernel options # -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_PPC_TRANSACTIONAL_MEM=y # CONFIG_LD_HEAD_STUB_CATCH is not set diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla index f036ce4..e4b45c8 100644 --- a/config/ppc64le/vanilla +++ b/config/ppc64le/vanilla @@ -466,11 +466,11 @@ CONFIG_QE_GPIO=y # # Kernel options # -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y # CONFIG_PPC_TRANSACTIONAL_MEM is not set # CONFIG_LD_HEAD_STUB_CATCH is not set diff --git a/config/riscv64/vanilla b/config/riscv64/vanilla index 3eae6bd..04fc8a8 100644 --- a/config/riscv64/vanilla +++ b/config/riscv64/vanilla @@ -361,11 +361,11 @@ CONFIG_FPU=y # # Kernel features # -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y # CONFIG_RISCV_SBI_V01 is not set # CONFIG_RISCV_BOOT_SPINWAIT is not set diff --git a/config/s390x/vanilla b/config/s390x/vanilla index b5c74fc..0227985 100644 --- a/config/s390x/vanilla +++ b/config/s390x/vanilla @@ -352,7 +352,7 @@ CONFIG_BTRFS_ASSERT=y # CONFIG_HYPERV_TIMER is not set # CONFIG_HZ_1000 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_300=y # CONFIG_HZ_PERIODIC is not set # CONFIG_I2C_ALI1535 is not set # CONFIG_I2C_ALI1563 is not set @@ -2067,8 +2067,8 @@ CONFIG_HW_RANDOM_BA431=m CONFIG_HW_RANDOM_S390=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_XIPHERA=m -CONFIG_HZ=100 -CONFIG_HZ_100=y +CONFIG_HZ=300 +# CONFIG_HZ_100 is not set CONFIG_I2C=m CONFIG_I2C_ALGOBIT=m CONFIG_I2C_BOARDINFO=y diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla index 9ec27e6..843e337 100644 --- a/config/x86_64/vanilla +++ b/config/x86_64/vanilla @@ -491,10 +491,10 @@ CONFIG_EFI_MIXED=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_MAP=y # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y