From owner-p4-projects@FreeBSD.ORG Sun Nov 16 22:15:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB29316A4D3; Sun, 16 Nov 2003 22:15:08 -0800 (PST) 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 AB20C16A4CF for ; Sun, 16 Nov 2003 22:15:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86B0844035 for ; Sun, 16 Nov 2003 22:13:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAH6DtXJ075536 for ; Sun, 16 Nov 2003 22:13:55 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAH6DtpA075533 for perforce@freebsd.org; Sun, 16 Nov 2003 22:13:55 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 16 Nov 2003 22:13:55 -0800 (PST) Message-Id: <200311170613.hAH6DtpA075533@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 Subject: PERFORCE change 42631 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: Mon, 17 Nov 2003 06:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=42631 Change 42631 by peter@peter_overcee on 2003/11/16 22:13:03 IFC @42629 Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#10 integrate .. //depot/projects/hammer/sys/alpha/include/intr.h#6 integrate .. //depot/projects/hammer/sys/alpha/isa/isa.c#8 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#9 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs.c#6 integrate .. //depot/projects/hammer/sys/alpha/pci/cia.c#6 integrate .. //depot/projects/hammer/sys/alpha/pci/t2.c#7 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunami.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#18 integrate .. //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#7 integrate Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/interrupt.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.75 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.76 2003/11/17 06:10:14 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/alpha/include/intr.h#6 (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/alpha/include/intr.h,v 1.10 2001/12/20 23:48:29 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/intr.h,v 1.11 2003/11/17 06:10:14 peter Exp $ */ #ifndef _MACHINE_INTR_H_ ==== //depot/projects/hammer/sys/alpha/isa/isa.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.33 2003/08/22 07:20:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.34 2003/11/17 06:10:14 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.27 2003/08/22 07:20:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/alpha/pci/apecs.c#6 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.23 2003/08/17 06:42:08 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.24 2003/11/17 06:10:14 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/alpha/pci/cia.c#6 (text+ko) ==== @@ -87,7 +87,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.41 2003/08/17 06:42:08 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/alpha/pci/t2.c#7 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.19 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/alpha/pci/tsunami.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.22 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/i386/i386/intr_machdep.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.3 2003/11/14 21:00:32 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.4 2003/11/17 06:10:14 peter Exp $ */ /* ==== //depot/projects/hammer/sys/ia64/ia64/interrupt.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.42 2003/11/12 01:26:02 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.43 2003/11/17 06:10:14 peter Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* ==== //depot/projects/hammer/sys/kern/kern_intr.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.100 2003/11/03 22:42:58 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.101 2003/11/17 06:08:10 peter Exp $"); #include "opt_ddb.h" ==== //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/intr_machdep.h,v 1.2 2003/02/01 07:20:36 benno Exp $ + * $FreeBSD: src/sys/powerpc/include/intr_machdep.h,v 1.3 2003/11/17 06:10:15 peter Exp $ */ #ifndef _MACHINE_INTR_MACHDEP_H_ ==== //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#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/powerpc/powermac/hrowpic.c,v 1.1 2003/06/28 08:52:49 grehan Exp $ + * $FreeBSD: src/sys/powerpc/powermac/hrowpic.c,v 1.2 2003/11/17 06:10:15 peter Exp $ */ /* ==== //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#5 (text+ko) ==== @@ -61,7 +61,7 @@ * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20 * - * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.2 2003/02/01 07:20:36 benno Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.3 2003/11/17 06:10:15 peter Exp $ */ #include ==== //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#6 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powerpc/openpic.c,v 1.8 2003/02/20 01:59:42 grehan Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/openpic.c,v 1.9 2003/11/17 06:10:15 peter Exp $ */ #include ==== //depot/projects/hammer/sys/sys/interrupt.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/interrupt.h,v 1.25 2003/10/24 21:05:30 jhb Exp $ + * $FreeBSD: src/sys/sys/interrupt.h,v 1.26 2003/11/17 06:08:10 peter Exp $ */ #ifndef _SYS_INTERRUPT_H_