Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.67.4.1
retrieving revision 1.72
diff -u -p -r1.67.4.1 -r1.72
--- src/sys/arch/i386/i386/locore.S	2008/05/16 02:22:34	1.67.4.1
+++ src/sys/arch/i386/i386/locore.S	2008/05/03 05:56:44	1.72
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.67.4.1 2008/05/16 02:22:34 yamt Exp $	*/
+/*	$NetBSD: locore.S,v 1.72 2008/05/03 05:56:44 yamt Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -134,7 +134,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.67.4.1 2008/05/16 02:22:34 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.72 2008/05/03 05:56:44 yamt Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
@@ -204,7 +204,6 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1
 	.data
 
 	.globl	_C_LABEL(cpu)
-	.globl	_C_LABEL(cpuid_level)
 	.globl	_C_LABEL(esym)
 	.globl	_C_LABEL(eblob)
 	.globl	_C_LABEL(atdevbase)
@@ -237,7 +236,6 @@ _C_LABEL(lapic_tpr):
 #endif
 
 _C_LABEL(cpu):		.long	0	# are we 80486, Pentium, or..
-_C_LABEL(cpuid_level):	.long	0
 _C_LABEL(atdevbase):	.long	0	# location of start of iomem in virtual
 _C_LABEL(proc0uarea):	.long	0
 _C_LABEL(PDPpaddr):	.long	0	# paddr of PDP, for libkvm
@@ -311,7 +309,7 @@ _C_LABEL(Multiboot_Header):
 	movw	%ax,%fs
 	movw	%ax,%gs
 	decl	%eax
-	movl	%eax,RELOC(cpuid_level)
+	movl	%eax,RELOC(cpu_info_primary)+CPU_INFO_LEVEL
 
 	/* Find out our CPU type. */
 
@@ -471,7 +469,7 @@ trycyrix486:
 try586:	/* Use the `cpuid' instruction. */
 	xorl	%eax,%eax
 	cpuid
-	movl	%eax,RELOC(cpuid_level)
+	movl	%eax,RELOC(cpu_info_primary)+CPU_INFO_LEVEL
 
 2:
 	/*
@@ -750,11 +748,11 @@ start:
 	movw	%ax,%fs
 	movw	%ax,%gs
 	decl	%eax
-	movl	%eax,RELOC(cpuid_level)
+	movl	%eax,RELOC(cpu_info_primary)+CPU_INFO_LEVEL
 
 	xorl	%eax,%eax
 	cpuid
-	movl	%eax,RELOC(cpuid_level)
+	movl	%eax,RELOC(cpu_info_primary)+CPU_INFO_LEVEL
 
 	call	xen_pmap_bootstrap
 	/*