patch-2.4.26 linux-2.4.26/arch/i386/kernel/smpboot.c

• Lines: 44
• Date: 2004-04-14 06:05:25.000000000 -0700
• Orig file: linux-2.4.25/arch/i386/kernel/smpboot.c
• Orig date: 2004-02-18 05:36:30.000000000 -0800

diff -urN linux-2.4.25/arch/i386/kernel/smpboot.c linux-2.4.26/arch/i386/kernel/smpboot.c
@@ -51,7 +51,7 @@
 static int smp_b_stepping;
 
 /* Setup configured maximum number of CPUs to activate */
-static int max_cpus = NR_CPUS;
+unsigned int max_cpus = NR_CPUS;
 
 /* Total count of live CPUs */
 int smp_num_cpus = 1;
@@ -77,10 +77,6 @@
  *
  * Command-line option of "nosmp" or "maxcpus=0" will disable SMP
  * activation entirely (the MPS table probe still happens, though).
- *
- * Command-line option of "maxcpus=<NUM>", where <NUM> is an integer
- * greater than 0, limits the maximum number of CPUs activated in
- * SMP mode to <NUM>.
  */
 
 static int __init nosmp(char *str)
@@ -91,14 +87,6 @@
 
 __setup("nosmp", nosmp);
 
-static int __init maxcpus(char *str)
-{
-	get_option(&str, &max_cpus);
-	return 1;
-}
-
-__setup("maxcpus=", maxcpus);
-
 /*
  * Trampoline 80x86 program as an array.
  */
@@ -1120,8 +1108,6 @@
 
 		if (!(phys_cpu_present_map & apicid_to_phys_cpu_present(apicid)))
 			continue;
-		if (max_cpus <= cpucount+1)
-			continue;
 
 		do_boot_cpu(apicid);