From owner-p4-projects@FreeBSD.ORG Tue Jun 14 22:49:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9F2716A420; Tue, 14 Jun 2005 22:49:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 735FD16A41C for ; Tue, 14 Jun 2005 22:49:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5543643D49 for ; Tue, 14 Jun 2005 22:49:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EMnJit035835 for ; Tue, 14 Jun 2005 22:49:19 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EMnIXs035832 for perforce@freebsd.org; Tue, 14 Jun 2005 22:49:18 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 22:49:18 GMT Message-Id: <200506142249.j5EMnIXs035832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 22:49:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=78551 Change 78551 by peter@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 __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 #include #include ==== //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 __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 #include #include ==== //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 __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 #include ==== //depot/projects/hammer/sys/kern/kern_exec.c#50 (text+ko) ==== @@ -27,6 +27,7 @@ #include __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 __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 ==== //depot/projects/hammer/sys/kern/sched_ule.c#60 (text+ko) ==== @@ -27,7 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.152 2005/06/07 02:59:16 jeff Exp $"); -#include +#include "opt_hwpmc_hooks.h" +#include "opt_sched.h" #define kse td_sched