PERFORCE change 63025 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=63025

Change 63025 by peter at peter_daintree on 2004/10/11 22:20:08

	IFC @63022

Affected files ...

.. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#24 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#37 integrate
.. //depot/projects/hammer/sys/kern/kern_sysctl.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_tc.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_xxx.c#9 integrate
.. //depot/projects/hammer/sys/sys/conf.h#24 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#21 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#12 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#24 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.109 2004/06/03 05:58:30 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $");
 
 #include "opt_cpu.h"
 

==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#18 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.24 2004/10/05 18:51:10 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.25 2004/10/11 22:04:15 peter Exp $");
 
 #include "opt_compat.h"
 

==== //depot/projects/hammer/sys/kern/kern_exec.c#37 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.255 2004/10/07 13:50:10 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.256 2004/10/11 22:04:15 peter Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"

==== //depot/projects/hammer/sys/kern/kern_sysctl.c#17 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.159 2004/07/28 06:42:41 kan Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.160 2004/10/11 22:04:15 peter Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"

==== //depot/projects/hammer/sys/kern/kern_tc.c#16 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.162 2004/08/14 08:33:49 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.163 2004/10/11 22:04:15 peter Exp $");
 
 #include "opt_ntp.h"
 

==== //depot/projects/hammer/sys/kern/kern_xxx.c#9 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.42 2004/07/26 07:24:03 cperciva Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.43 2004/10/11 22:04:15 peter Exp $");
 
 #include "opt_compat.h"
 

==== //depot/projects/hammer/sys/sys/conf.h#24 (text+ko) ====

@@ -34,16 +34,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/conf.h,v 1.201 2004/10/01 06:33:39 phk Exp $
+ * $FreeBSD: src/sys/sys/conf.h,v 1.202 2004/10/11 21:56:27 peter Exp $
  */
 
 #ifndef _SYS_CONF_H_
 #define	_SYS_CONF_H_
 
-#ifndef _KERNEL
+#ifdef _KERNEL
+#include <sys/eventhandler.h>
+#else
 #include <sys/queue.h>
-#else
-#include <sys/eventhandler.h>
 #endif
 
 struct tty;

==== //depot/projects/hammer/sys/sys/sysctl.h#21 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/sys/sysctl.h,v 1.132 2004/07/28 07:08:39 kan Exp $
+ * $FreeBSD: src/sys/sys/sysctl.h,v 1.133 2004/10/11 22:04:16 peter Exp $
  */
 
 #ifndef _SYS_SYSCTL_H_

==== //depot/projects/hammer/sys/vm/vm_meter.c#12 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.77 2004/09/04 05:51:54 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.78 2004/10/11 22:04:16 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>