diff --git a/wally-pipelined/linux-testgen/buildroot-config-src/linux.config b/wally-pipelined/linux-testgen/buildroot-config-src/linux.config
index 8a241e78e..7ec83e7ee 100644
--- a/wally-pipelined/linux-testgen/buildroot-config-src/linux.config
+++ b/wally-pipelined/linux-testgen/buildroot-config-src/linux.config
@@ -18,6 +18,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 # General setup
 #
+CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
@@ -56,7 +57,6 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 # end of Timers subsystem
@@ -75,24 +75,19 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_PSI is not set
 # end of CPU/Task time and stats accounting
 
-# CONFIG_CPU_ISOLATION is not set
-
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
+CONFIG_TINY_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
+CONFIG_TINY_SRCU=y
 # end of RCU Subsystem
 
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_IKHEADERS is not set
 CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
 
@@ -174,7 +169,6 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-# CONFIG_SLUB_CPU_PARTIAL is not set
 # CONFIG_PROFILING is not set
 # end of General setup
 
@@ -187,7 +181,7 @@ CONFIG_MMU=y
 CONFIG_ZONE_DMA32=y
 CONFIG_VA_BITS=39
 CONFIG_PA_BITS=56
-CONFIG_PAGE_OFFSET=0xffffffe000000000
+CONFIG_PAGE_OFFSET=0xffffffff80000000
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -220,11 +214,9 @@ CONFIG_ARCH_RV64I=y
 # CONFIG_CMODEL_MEDLOW is not set
 CONFIG_CMODEL_MEDANY=y
 CONFIG_MODULE_SECTIONS=y
-# CONFIG_MAXPHYSMEM_2GB is not set
-CONFIG_MAXPHYSMEM_128GB=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=8
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_MAXPHYSMEM_2GB=y
+# CONFIG_MAXPHYSMEM_128GB is not set
+# CONFIG_SMP is not set
 CONFIG_TUNE_GENERIC=y
 CONFIG_RISCV_ISA_C=y
 CONFIG_FPU=y
@@ -379,11 +371,7 @@ CONFIG_MQ_IOSCHED_KYBER=y
 
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_ARCH_HAS_MMIOWB=y
-CONFIG_MMIOWB=y
 
 #
 # Executable file formats
@@ -416,6 +404,7 @@ CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_FRONTSWAP is not set
 # CONFIG_CMA is not set
@@ -464,7 +453,6 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
 # end of Generic Driver Options
 
 #
@@ -1468,7 +1456,6 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_NULL is not set
 CONFIG_CRYPTO_NULL2=y
-# CONFIG_CRYPTO_PCRYPT is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
@@ -1650,7 +1637,6 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_CPUMASK_OFFSTACK is not set
 # CONFIG_IRQ_POLL is not set
 CONFIG_LIBFDT=y
 CONFIG_UCS2_STRING=y
@@ -1746,7 +1732,6 @@ CONFIG_DEBUG_VM_PGTABLE=y
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # end of Memory Debugging
@@ -1822,7 +1807,6 @@ CONFIG_DEBUG_SG=y
 # CONFIG_RCU_SCALE_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_REF_SCALE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_EQS_DEBUG=y
 # end of RCU Debugging