PERFORCE change 78551 for review

[Peter Wemm]

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

Change 78551 by peter at peter_overcee on 2005/06/14 22:48:58

	There is no reason at all why HWPMC_HOOKS needs to be in opt_global.h
	and force a universal recompile if the option is changed.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#51 edit
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#63 edit
.. //depot/projects/hammer/sys/conf/options#76 edit
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#16 edit
.. //depot/projects/hammer/sys/i386/i386/trap.c#33 edit
.. //depot/projects/hammer/sys/kern/kern_clock.c#25 edit
.. //depot/projects/hammer/sys/kern/kern_exec.c#50 edit
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#39 edit
.. //depot/projects/hammer/sys/kern/sched_ule.c#60 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#51 (text+ko) ====

@@ -34,6 +34,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.15 2005/05/22 16:32:02 peter Exp $");
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

==== //depot/projects/hammer/sys/amd64/amd64/trap.c#63 (text+ko) ====

@@ -46,6 +46,7 @@
 
 #include "opt_clock.h"
 #include "opt_cpu.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_ktrace.h"
 

==== //depot/projects/hammer/sys/conf/options#76 (text+ko) ====

@@ -707,4 +707,4 @@
 LOOKUP_SHARED		opt_vfs.h
 
 # HWPMC options
-HWPMC_HOOKS		opt_global.h
+HWPMC_HOOKS

==== //depot/projects/hammer/sys/i386/i386/local_apic.c#16 (text+ko) ====

@@ -34,6 +34,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.16 2005/04/19 04:01:23 jkoshy Exp $");
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

==== //depot/projects/hammer/sys/i386/i386/trap.c#33 (text+ko) ====

@@ -46,6 +46,7 @@
 
 #include "opt_clock.h"
 #include "opt_cpu.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_ktrace.h"
 #include "opt_npx.h"

==== //depot/projects/hammer/sys/kern/kern_clock.c#25 (text+ko) ====

@@ -37,9 +37,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.175 2005/05/30 06:29:29 jkoshy Exp $");
 
+#include "opt_compat.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_ntp.h"
 #include "opt_watchdog.h"
-#include "opt_compat.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -27,6 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.273 2005/06/09 19:45:08 jkoshy Exp $");
 
+#include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
 #include "opt_mac.h"
 

==== //depot/projects/hammer/sys/kern/sched_4bsd.c#39 (text+ko) ====

@@ -35,6 +35,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.76 2005/06/09 19:43:08 ups Exp $");
 
+#include "opt_hwpmc_hooks.h"
+
 #define kse td_sched
 
 #include <sys/param.h>

==== //depot/projects/hammer/sys/kern/sched_ule.c#60 (text+ko) ====

@@ -27,7 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.152 2005/06/07 02:59:16 jeff Exp $");
 
-#include <opt_sched.h>
+#include "opt_hwpmc_hooks.h"
+#include "opt_sched.h"
 
 #define kse td_sched