PERFORCE change 85799 for review
John Baldwin
jhb at FreeBSD.org
Mon Oct 24 14:12:30 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=85799
Change 85799 by jhb at jhb_slimer on 2005/10/24 21:11:37
IFC @85798 - Loop back STOP_NMI changes.
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#9 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#28 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#37 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#31 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#24 integrate
.. //depot/projects/smpng/sys/amd64/include/smp.h#10 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#15 integrate
.. //depot/projects/smpng/sys/conf/options.i386#51 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#50 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#109 integrate
.. //depot/projects/smpng/sys/i386/i386/apic_vector.s#18 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#93 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#87 integrate
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#74 integrate
.. //depot/projects/smpng/sys/i386/include/smp.h#18 integrate
.. //depot/projects/smpng/sys/kern/subr_kdb.c#14 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#43 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#46 integrate
.. //depot/projects/smpng/sys/sys/smp.h#16 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#9 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.103 2005/06/30 05:33:26 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.104 2005/10/24 20:52:26 jhb Exp $
*/
/*
==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#28 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.263 2005/10/24 20:31:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.264 2005/10/24 21:04:17 jhb Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
==== //depot/projects/smpng/sys/amd64/amd64/trap.c#37 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.295 2005/10/14 12:43:43 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.296 2005/10/24 21:04:17 jhb Exp $");
/*
* AMD64 Trap and System call handling
==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#31 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.249 2005/09/27 21:10:10 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
==== //depot/projects/smpng/sys/amd64/conf/NOTES#24 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.45 2005/10/17 18:35:57 jhb Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.46 2005/10/24 21:04:17 jhb Exp $
#
#
==== //depot/projects/smpng/sys/amd64/include/smp.h#10 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/amd64/include/smp.h,v 1.84 2005/04/30 20:00:58 dwhite Exp $
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.85 2005/10/24 21:04:17 jhb Exp $
*
*/
==== //depot/projects/smpng/sys/conf/options.amd64#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.21 2005/06/29 23:23:16 peter Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.22 2005/10/24 21:04:18 jhb Exp $
# Options specific to AMD64 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
==== //depot/projects/smpng/sys/conf/options.i386#51 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.225 2005/07/02 20:06:42 delphij Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.226 2005/10/24 21:04:18 jhb Exp $
# Options specific to the i386 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
==== //depot/projects/smpng/sys/conf/options.pc98#50 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.189 2005/07/02 20:06:42 delphij Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.190 2005/10/24 21:04:18 jhb Exp $
# Options specific to the pc98 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
==== //depot/projects/smpng/sys/i386/conf/NOTES#109 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1208 2005/10/14 18:24:58 jhb Exp $
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1209 2005/10/24 21:04:18 jhb Exp $
#
#
==== //depot/projects/smpng/sys/i386/i386/apic_vector.s#18 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.104 2005/09/28 18:04:11 jhb Exp $
+ * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.105 2005/10/24 20:52:26 jhb Exp $
*/
/*
==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#93 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.255 2005/10/24 20:31:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.256 2005/10/24 21:04:18 jhb Exp $");
#include "opt_apic.h"
#include "opt_cpu.h"
==== //depot/projects/smpng/sys/i386/i386/trap.c#87 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.282 2005/10/14 12:43:45 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.283 2005/10/24 21:04:18 jhb Exp $");
/*
* 386 Trap and System call handling
==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#74 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.263 2005/10/13 23:42:12 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.264 2005/10/24 20:53:52 jhb Exp $");
#include "opt_isa.h"
#include "opt_npx.h"
==== //depot/projects/smpng/sys/i386/include/smp.h#18 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/i386/include/smp.h,v 1.82 2005/04/30 20:00:59 dwhite Exp $
+ * $FreeBSD: src/sys/i386/include/smp.h,v 1.83 2005/10/24 21:04:19 jhb Exp $
*
*/
==== //depot/projects/smpng/sys/kern/subr_kdb.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.14 2005/10/24 20:31:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.15 2005/10/24 21:04:17 jhb Exp $");
#include "opt_kdb.h"
==== //depot/projects/smpng/sys/kern/subr_smp.c#43 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.196 2005/06/30 03:38:10 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.197 2005/10/24 21:04:17 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/smpng/sys/pc98/conf/NOTES#46 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.64 2005/10/14 18:24:58 jhb Exp $
+# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.65 2005/10/24 21:04:19 jhb Exp $
#
#
==== //depot/projects/smpng/sys/sys/smp.h#16 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/sys/smp.h,v 1.84 2005/04/30 20:01:00 dwhite Exp $
+ * $FreeBSD: src/sys/sys/smp.h,v 1.85 2005/10/24 21:04:19 jhb Exp $
*/
#ifndef _SYS_SMP_H_
More information about the p4-projects
mailing list