Module Name:	src
Committed By:	ad
Date:		Thu Aug 23 12:13:58 UTC 2007

Modified Files:
	src/sys/arch/amd64/amd64 [vmlocking]: identcpu.c
	src/sys/arch/amd64/conf [vmlocking]: files.amd64
	src/sys/arch/amd64/include [vmlocking]: cpu.h
	src/sys/arch/i386/conf [vmlocking]: files.i386
Added Files:
	src/sys/arch/x86/x86 [vmlocking]: cpu.c
Removed Files:
	src/sys/arch/amd64/amd64 [vmlocking]: cpu.c
	src/sys/arch/i386/i386 [vmlocking]: cpu.c

Log Message:
Merged x86 cpu.c.


To generate a diff of this commit:
cvs rdiff -r1.15.2.4 -r0 src/sys/arch/amd64/amd64/cpu.c
cvs rdiff -r1.11.2.4 -r1.11.2.5 src/sys/arch/amd64/amd64/identcpu.c
cvs rdiff -r1.33.2.4 -r1.33.2.5 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -r1.16.2.4 -r1.16.2.5 src/sys/arch/amd64/include/cpu.h
cvs rdiff -r1.303.2.4 -r1.303.2.5 src/sys/arch/i386/conf/files.i386
cvs rdiff -r1.35.2.8 -r0 src/sys/arch/i386/i386/cpu.c
cvs rdiff -r0 -r1.1.2.1 src/sys/arch/x86/x86/cpu.c

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