From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:32:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 056EB37B405; Wed, 30 Apr 2003 15:32:28 -0700 (PDT) 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 AADF637B401 for ; Wed, 30 Apr 2003 15:32:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D038E43FB1 for ; Wed, 30 Apr 2003 15:32:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3UMWQ0U018394 for ; Wed, 30 Apr 2003 15:32:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMWQCR018386 for perforce@freebsd.org; Wed, 30 Apr 2003 15:32:26 -0700 (PDT) Date: Wed, 30 Apr 2003 15:32:26 -0700 (PDT) Message-Id: <200304302232.h3UMWQCR018386@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 30166 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: Wed, 30 Apr 2003 22:32:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30166 Change 30166 by peter@peter_daintree on 2003/04/30 15:31:40 integrate i386_hammer branch Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/clock.c#12 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#10 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#10 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#32 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#12 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/clock.c,v 1.197 2003/03/24 19:14:46 mdodd Exp $ + * $FreeBSD: src/sys/i386/isa/clock.c,v 1.198 2003/04/29 13:36:02 kan Exp $ */ /* @@ -60,13 +60,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#10 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.171 2002/12/14 16:11:28 phk Exp $ + * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.172 2003/04/30 12:57:39 markm Exp $ */ /* @@ -92,8 +92,6 @@ /* SI_ORDER_MIDDLE is hookable */ SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL); -device_t nexus_dev; - /* * Determine i/o configuration for a machine. */ ==== //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.121 2003/04/10 07:05:24 wes Exp $ + * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.122 2003/04/30 12:23:58 markm Exp $ */ #include "opt_cpu.h" ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#32 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.250 2003/04/24 01:48:59 davidxu Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.251 2003/04/30 17:59:27 jhb Exp $ */ /* @@ -812,7 +812,7 @@ cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - syscallnames[code]); + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); }