From owner-p4-projects@FreeBSD.ORG Tue Aug 8 00:39:19 2006 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 A0A2C16A4E1; Tue, 8 Aug 2006 00:39:19 +0000 (UTC) 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 4D11A16A4DE for ; Tue, 8 Aug 2006 00:39:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA24B43D46 for ; Tue, 8 Aug 2006 00:39:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k780dIX3088801 for ; Tue, 8 Aug 2006 00:39:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k780dIFe088798 for perforce@freebsd.org; Tue, 8 Aug 2006 00:39:18 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Aug 2006 00:39:18 GMT Message-Id: <200608080039.k780dIFe088798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103414 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, 08 Aug 2006 00:39:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103414 Change 103414 by jb@jb_freebsd2 on 2006/08/08 00:38:54 Put the KDTRACE kernel option in opt_global.h because that is included throughout the kernel build. Affected files ... .. //depot/projects/dtrace/src/sys/conf/options#17 edit .. //depot/projects/dtrace/src/sys/i386/i386/exception.s#7 edit .. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#5 edit .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#11 edit .. //depot/projects/dtrace/src/sys/i386/i386/tsc.c#5 edit .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#9 edit .. //depot/projects/dtrace/src/sys/kern/kern_tc.c#7 edit .. //depot/projects/dtrace/src/sys/kern/link_elf.c#8 edit .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#13 edit .. //depot/projects/dtrace/src/sys/kern/subr_pcpu.c#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tick.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/options#17 (text+ko) ==== @@ -601,7 +601,7 @@ PCFCLOCK_VERBOSE opt_pcfclock.h PCFCLOCK_MAX_RETRIES opt_pcfclock.h -KDTRACE opt_kdtrace.h +KDTRACE opt_global.h KTR opt_global.h KTR_ALQ opt_ktr.h KTR_MASK opt_ktr.h ==== //depot/projects/dtrace/src/sys/i386/i386/exception.s#7 (text+ko) ==== @@ -38,7 +38,6 @@ */ #include "opt_apic.h" -#include "opt_kdtrace.h" #include "opt_npx.h" #include ==== //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_cyclic.h" #include "opt_ddb.h" -#include "opt_kdtrace.h" #include #include ==== //depot/projects/dtrace/src/sys/i386/i386/trap.c#11 (text+ko) ==== @@ -49,7 +49,6 @@ #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_npx.h" #include "opt_trap.h" ==== //depot/projects/dtrace/src/sys/i386/i386/tsc.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.206 2006/08/04 07:56:35 yar Exp $"); #include "opt_clock.h" -#include "opt_kdtrace.h" #include #include ==== //depot/projects/dtrace/src/sys/kern/kern_synch.c#9 (text+ko) ==== @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.281 2006/06/15 06:41:57 davidxu Exp $"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include ==== //depot/projects/dtrace/src/sys/kern/kern_tc.c#7 (text+ko) ==== @@ -10,7 +10,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.177 2006/08/04 07:56:35 yar Exp $"); -#include "opt_kdtrace.h" #include "opt_ntp.h" #include ==== //depot/projects/dtrace/src/sys/kern/link_elf.c#8 (text+ko) ==== @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.90 2006/07/14 22:39:18 jkim Exp $"); #include "opt_gdb.h" -#include "opt_kdtrace.h" #include "opt_mac.h" #include ==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#13 (text+ko) ==== @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.86 2006/07/02 20:53:52 maxim Exp $"); #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #define kse td_sched ==== //depot/projects/dtrace/src/sys/kern/subr_pcpu.c#4 (text+ko) ==== @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD: src/sys/kern/subr_pcpu.c,v 1.8 2005/11/03 21:06:29 jhb Exp $"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/tick.c#3 (text+ko) ==== @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/tick.c,v 1.20 2006/02/11 09:33:07 phk Exp $"); -#include "opt_kdtrace.h" - #include #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#7 (text+ko) ==== @@ -42,7 +42,6 @@ #include "opt_ddb.h" #include "opt_ktr.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_trap_trace.h"