PERFORCE change 1199799 for review

[John Baldwin]

http://p4web.freebsd.org/@@1199799?ac=10

Change 1199799 by jhb at jhb_ralph on 2014/09/04 02:36:12

	Add a merged identcpu.c.

Affected files ...

.. //depot/projects/smpng/sys/conf/files.amd64#105 edit
.. //depot/projects/smpng/sys/conf/files.i386#163 edit
.. //depot/projects/smpng/sys/conf/files.pc98#121 edit
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#47 edit
.. //depot/projects/smpng/sys/i386/include/md_var.h#43 edit
.. //depot/projects/smpng/sys/x86/x86/identcpu.c#1 add

Differences ...

==== //depot/projects/smpng/sys/conf/files.amd64#105 (text+ko) ====

@@ -103,7 +103,6 @@
 amd64/amd64/exception.S		standard
 amd64/amd64/fpu.c		standard
 amd64/amd64/gdb_machdep.c	optional	gdb
-amd64/amd64/identcpu.c		standard
 amd64/amd64/in_cksum.c		optional	inet | inet6
 amd64/amd64/initcpu.c		standard
 amd64/amd64/io.c		optional	io
@@ -542,6 +541,7 @@
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
 x86/x86/fdt_machdep.c		optional	fdt
+x86/x86/identcpu.c		standard
 x86/x86/intr_machdep.c		standard
 x86/x86/io_apic.c		standard
 x86/x86/legacy.c		standard

==== //depot/projects/smpng/sys/conf/files.i386#163 (text+ko) ====

@@ -443,7 +443,6 @@
 i386/i386/gdb_machdep.c		optional gdb
 i386/i386/geode.c		optional cpu_geode
 i386/i386/i686_mem.c		optional mem
-i386/i386/identcpu.c		standard
 i386/i386/in_cksum.c		optional inet | inet6
 i386/i386/initcpu.c		standard
 i386/i386/io.c			optional io
@@ -581,6 +580,7 @@
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
 x86/x86/fdt_machdep.c		optional fdt
+x86/x86/identcpu.c		standard
 x86/x86/intr_machdep.c		standard
 x86/x86/io_apic.c		optional apic
 x86/x86/legacy.c		optional native

==== //depot/projects/smpng/sys/conf/files.pc98#121 (text+ko) ====

@@ -140,7 +140,6 @@
 i386/i386/exception.s		standard
 i386/i386/gdb_machdep.c		optional gdb
 i386/i386/i686_mem.c		optional mem
-i386/i386/identcpu.c		standard
 i386/i386/in_cksum.c		optional inet | inet6
 i386/i386/initcpu.c		standard
 i386/i386/io.c			optional io
@@ -248,6 +247,7 @@
 x86/x86/busdma_bounce.c		standard
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
+x86/x86/identcpu.c		standard
 x86/x86/intr_machdep.c		standard
 x86/x86/io_apic.c		optional apic
 x86/x86/legacy.c		standard

==== //depot/projects/smpng/sys/i386/i386/initcpu.c#47 (text+ko) ====

@@ -95,6 +95,7 @@
 u_int	cpu_mxcsr_mask;		/* Valid bits in mxcsr */
 #endif
 u_int	cpu_clflush_line_size = 32;
+u_int	cpu_stdext_feature;
 u_int	cpu_mon_mwait_flags;	/* MONITOR/MWAIT flags (CPUID.05H.ECX) */
 u_int	cpu_mon_min_size;	/* MONITOR minimum range size, bytes */
 u_int	cpu_mon_max_size;	/* MONITOR minimum range size, bytes */

==== //depot/projects/smpng/sys/i386/include/md_var.h#43 (text+ko) ====

@@ -48,6 +48,7 @@
 extern	u_int	via_feature_rng;
 extern	u_int	via_feature_xcrypt;
 extern	u_int	cpu_clflush_line_size;
+extern	u_int	cpu_stdext_feature;
 extern	u_int	cpu_fxsr;
 extern	u_int	cpu_high;
 extern	u_int	cpu_id;