Date: Wed, 30 Apr 2003 15:32:26 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30166 for review Message-ID: <200304302232.h3UMWQCR018386@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/time.h> #include <sys/timetc.h> #include <sys/kernel.h> +#include <sys/limits.h> #include <sys/sysctl.h> #include <sys/cons.h> #include <sys/power.h> #include <machine/clock.h> #include <machine/frame.h> -#include <machine/limits.h> #include <machine/md_var.h> #include <machine/psl.h> #include <machine/specialreg.h> ==== //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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304302232.h3UMWQCR018386>