patch-2.3.99-pre6 linux/arch/i386/kernel/setup.c

• Lines: 29
• Date: Tue Apr 25 17:45:43 2000
• Orig file: v2.3.99-pre5/linux/arch/i386/kernel/setup.c
• Orig date: Tue Apr 11 15:09:12 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -495,6 +495,10 @@
 			if (!memcmp(from+4, "nopentium", 9)) {
 				from += 9+4;
 				boot_cpu_data.x86_capability &= ~X86_FEATURE_PSE;
+			} else if (!memcmp(from+4, "exactmap", 8)) {
+				from += 8+4;
+				e820.nr_map = 0;
+				usermem = 1;
 			} else {
 				/* If the user specifies memory size, we
 				 * blow away any automatically generated
@@ -1531,8 +1535,7 @@
 	return p - buffer;
 }
 
-int cpus_initialized = 0;
-unsigned long cpu_initialized = 0;
+static unsigned long cpu_initialized __initdata = 0;
 
 /*
  * cpu_init() initializes state that is per-CPU. Some data is already
@@ -1549,7 +1552,6 @@
 		printk("CPU#%d already initialized!\n", nr);
 		for (;;) __sti();
 	}
-	cpus_initialized++;
 	printk("Initializing CPU#%d\n", nr);
 
 	if (cpu_has_vme || cpu_has_tsc || cpu_has_de)