diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 15aa189672..c7e7682d1f 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -64,6 +64,26 @@ config KERNEL_RISCV_PMU_SBI
 	bool
 	depends on riscv64
 
+config KERNEL_NR_CPUS
+	int "Maximum number of CPUs (2-512)" if TARGET_x86
+	range 2 512 if TARGET_x86
+	default 512 if TARGET_x86_64
+	default 8 if TARGET_x86
+	help
+	  Maximum number of CPUs supported by the kernel.
+	  Each CPU allocates approximately 100-200KB of RAM for
+	  per-CPU data structures.
+
+	  Sample values:
+	    4   - Ultra-low-level desktops e.g. Intel N150
+	    8   - Low-level desktops e.g. Intel N305
+	    16  - Mid-level dekstops e.g. AMD Ryzen 7
+	    32  - High-level desktops e.g. AMD Ryzen 9/Intel Core i9
+	    384 - High-level server e.g. AMD EPYC 9965
+
+	  Lower values reduce memory usage. Set to match your hardware
+	  for optimal memory efficiency.
+
 config KERNEL_X86_VSYSCALL_EMULATION
 	bool "Enable vsyscall emulation"
 	depends on x86_64
diff --git a/target/linux/x86/config-6.18 b/target/linux/x86/config-6.18
index 9930e45c50..0486c5749a 100644
--- a/target/linux/x86/config-6.18
+++ b/target/linux/x86/config-6.18
@@ -328,10 +328,6 @@ CONFIG_NLS=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_IDLE=y
-CONFIG_NR_CPUS=1
-CONFIG_NR_CPUS_DEFAULT=1
-CONFIG_NR_CPUS_RANGE_BEGIN=1
-CONFIG_NR_CPUS_RANGE_END=1
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OF is not set