PERFORCE change 78888 for review
Peter Wemm
peter at FreeBSD.org
Fri Jun 24 02:53:08 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=78888
Change 78888 by peter at peter_daintree on 2005/06/24 02:52:33
IFC @78887
Affected files ...
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#7 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#39 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#38 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#54 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#129 integrate
.. //depot/projects/hammer/sys/amd64/amd64/support.S#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#65 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#74 integrate
.. //depot/projects/hammer/sys/conf/options#78 integrate
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#17 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#34 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#51 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#40 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#61 integrate
Differences ...
==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.6 2005/03/02 18:40:04 marcel Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.7 2005/06/24 00:50:12 peter Exp $");
#include <sys/param.h>
#include <sys/stat.h>
==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#31 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.86 2005/03/20 10:37:56 pjd Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.87 2005/06/24 00:37:04 peter Exp $");
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
==== //depot/projects/hammer/sys/amd64/amd64/exception.S#39 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.123 2005/05/22 23:28:17 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.124 2005/06/24 00:38:36 peter Exp $
*/
#include "opt_atpic.h"
==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#38 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.14 2005/04/12 23:18:53 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.15 2005/06/24 00:45:01 peter Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#54 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.15 2005/05/22 16:32:02 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17 2005/06/24 00:45:01 peter Exp $");
#include "opt_hwpmc_hooks.h"
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#129 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.636 2005/05/05 18:19:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.637 2005/06/24 00:45:01 peter Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
==== //depot/projects/hammer/sys/amd64/amd64/support.S#31 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.114 2005/04/10 18:12:07 alc Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.115 2005/06/24 00:45:01 peter Exp $
*/
#include "opt_ddb.h"
==== //depot/projects/hammer/sys/amd64/amd64/trap.c#65 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.286 2005/05/30 06:29:28 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.287 2005/06/24 00:16:56 peter Exp $");
/*
* AMD64 Trap and System call handling
==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#74 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.246 2005/04/23 02:32:30 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.247 2005/06/24 00:29:53 peter Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/conf/options#78 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.507 2005/06/21 10:17:54 dumbbell Exp $
+# $FreeBSD: src/sys/conf/options,v 1.508 2005/06/24 00:16:57 peter Exp $
#
# On the handling of kernel options
#
==== //depot/projects/hammer/sys/i386/i386/local_apic.c#17 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.16 2005/04/19 04:01:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.17 2005/06/24 00:16:57 peter Exp $");
#include "opt_hwpmc_hooks.h"
==== //depot/projects/hammer/sys/i386/i386/trap.c#34 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.274 2005/05/30 06:29:28 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.275 2005/06/24 00:16:57 peter Exp $");
/*
* 386 Trap and System call handling
==== //depot/projects/hammer/sys/kern/kern_clock.c#26 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.175 2005/05/30 06:29:29 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.176 2005/06/24 00:16:57 peter Exp $");
#include "opt_compat.h"
#include "opt_hwpmc_hooks.h"
==== //depot/projects/hammer/sys/kern/kern_exec.c#51 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.273 2005/06/09 19:45:08 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.274 2005/06/24 00:16:57 peter Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_ktrace.h"
==== //depot/projects/hammer/sys/kern/sched_4bsd.c#40 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.76 2005/06/09 19:43:08 ups Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.77 2005/06/24 00:16:57 peter Exp $");
#include "opt_hwpmc_hooks.h"
==== //depot/projects/hammer/sys/kern/sched_ule.c#61 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.152 2005/06/07 02:59:16 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.153 2005/06/24 00:16:57 peter Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_sched.h"
More information about the p4-projects
mailing list