From 656306bc2a114888e95ce8ce37d71aefa1c4344b Mon Sep 17 00:00:00 2001 From: David Mosberger Date: Fri, 23 Jan 2004 01:34:09 -0800 Subject: [PATCH] ia64: Fix merge error: remove duplicate NR_CPUS. --- arch/ia64/Kconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index c2fac72c1966f..89fb4d888fa24 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -414,18 +414,6 @@ config EFI_VARS To use this option, you have to check that the "/proc file system support" (CONFIG_PROC_FS) is enabled, too. -config NR_CPUS - int "Maximum number of CPUs (2-512)" - range 2 512 - depends on SMP - default "64" - help - You should set this to the number of CPUs in your system, but - keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but - only use 2 CPUs on a >2 CPU system. Setting this to a value larger - than 64 will cause the use of a CPU mask array, causing a small - performance hit. - source "fs/Kconfig.binfmt" if !IA64_HP_SIM -- 2.53.0