From owner-p4-projects@FreeBSD.ORG Sat Jul 10 20:28:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E7D216A4D0; Sat, 10 Jul 2004 20:28:31 +0000 (GMT) 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 094BA16A4CE for ; Sat, 10 Jul 2004 20:28:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02B8E43D1D for ; Sat, 10 Jul 2004 20:28:31 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6AKSUNg038720 for ; Sat, 10 Jul 2004 20:28:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6AKSUNx038717 for perforce@freebsd.org; Sat, 10 Jul 2004 20:28:30 GMT (envelope-from marcel@freebsd.org) Date: Sat, 10 Jul 2004 20:28:30 GMT Message-Id: <200407102028.i6AKSUNx038717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 56984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jul 2004 20:28:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=56984 Change 56984 by marcel@marcel_nfs on 2004/07/10 20:28:24 IFC @56983 (makectx) Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#12 integrate .. //depot/projects/gdb/sys/alpha/include/pcb.h#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/gdb/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/gdb/sys/conf/options#30 integrate .. //depot/projects/gdb/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/gdb/sys/i386/include/pcb.h#4 integrate .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/gdb/sys/ia64/include/pcb.h#4 integrate .. //depot/projects/gdb/sys/sparc64/include/pcb.h#3 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#8 integrate Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#12 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.220 2004/06/11 11:16:17 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.221 2004/07/10 19:55:58 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" ==== //depot/projects/gdb/sys/alpha/include/pcb.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/pcb.h,v 1.9 2003/08/17 06:42:07 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/include/pcb.h,v 1.10 2004/07/10 19:55:58 marcel Exp $ */ /* From: NetBSD: pcb.h,v 1.6 1997/04/06 08:47:33 cgd Exp */ /* ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#17 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.611 2004/07/08 01:31:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.612 2004/07/10 19:55:58 marcel Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/gdb/sys/amd64/include/pcb.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.59 2004/05/16 22:43:57 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.60 2004/07/10 19:55:58 marcel Exp $ */ #ifndef _AMD64_PCB_H_ ==== //depot/projects/gdb/sys/conf/options#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.462 2004/07/08 22:35:34 brian Exp $ +# $FreeBSD: src/sys/conf/options,v 1.463 2004/07/10 19:34:06 marcel Exp $ # # On the handling of kernel options # @@ -30,6 +30,15 @@ # If filename is missing, the default is # opt_.h +# XXX temporary +GDB +KDB opt_global.h +KDB_TRACE opt_kdb.h +KDB_UNATTENDED opt_kdb.h +WITNESS_KDB opt_witness.h +SC_DISABLE_KDBKEY opt_syscons.h + + AAC_DEBUG opt_aac.h AHC_ALLOW_MEMIO opt_aic7xxx.h AHC_TMODE_ENABLE opt_aic7xxx.h ==== //depot/projects/gdb/sys/i386/i386/machdep.c#13 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.592 2004/06/19 12:28:48 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.593 2004/07/10 19:55:59 marcel Exp $"); #include "opt_apic.h" #include "opt_atalk.h" ==== //depot/projects/gdb/sys/i386/include/pcb.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pcb.h,v 1.51 2004/04/07 20:46:05 imp Exp $ + * $FreeBSD: src/sys/i386/include/pcb.h,v 1.52 2004/07/10 19:55:59 marcel Exp $ */ #ifndef _I386_PCB_H_ ==== //depot/projects/gdb/sys/ia64/ia64/machdep.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.178 2004/06/11 11:16:23 phk Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.179 2004/07/10 19:55:59 marcel Exp $ */ #include "opt_compat.h" ==== //depot/projects/gdb/sys/ia64/include/pcb.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/pcb.h,v 1.13 2003/08/12 03:51:53 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/pcb.h,v 1.14 2004/07/10 19:55:59 marcel Exp $ */ #ifndef _MACHINE_PCB_H_ ==== //depot/projects/gdb/sys/sparc64/include/pcb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/pcb.h,v 1.16 2003/04/03 18:28:03 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/pcb.h,v 1.17 2004/07/10 19:56:00 marcel Exp $ */ #ifndef _MACHINE_PCB_H_ ==== //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27 - * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.107 2004/04/07 05:00:01 imp Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.108 2004/07/10 19:55:59 marcel Exp $ */ #include "opt_compat.h"