diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 5aa26f3f2..1fc7c1f50 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -769,6 +769,7 @@ CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=3
 CONFIG_CONTEXT_SWITCH_TRACER=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_CORTINA_PHY=m
@@ -795,7 +796,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 # CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPU_ISOLATION is not set
+CONFIG_CPU_ISOLATION=y
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
@@ -3626,8 +3627,8 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 # CONFIG_NOA1305 is not set
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ_FULL=y
+# CONFIG_NO_HZ_IDLE is not set
 CONFIG_NO_HZ=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NORTEL_HERMES=m
@@ -5394,7 +5395,7 @@ CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
 CONFIG_TI_ADS8344=m
 # CONFIG_TI_ADS8688 is not set
-CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
@@ -6034,7 +6035,7 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIPERBOARD_ADC is not set
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index 38dd31e9f..1f50c674a 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -768,6 +768,7 @@ CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=3
 CONFIG_CONTEXT_SWITCH_TRACER=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_CORTINA_PHY=m
@@ -794,7 +795,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 # CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPU_ISOLATION is not set
+CONFIG_CPU_ISOLATION=y
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
@@ -3605,8 +3606,8 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 # CONFIG_NOA1305 is not set
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ_FULL=y
+# CONFIG_NO_HZ_IDLE is not set
 CONFIG_NO_HZ=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NORTEL_HERMES=m
@@ -5371,7 +5372,7 @@ CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
 CONFIG_TI_ADS8344=m
 # CONFIG_TI_ADS8688 is not set
-CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
@@ -6011,7 +6012,7 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIPERBOARD_ADC is not set
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m