From owner-p4-projects@FreeBSD.ORG Sat Mar 13 14:38:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5016D16A4D0; Sat, 13 Mar 2004 14:38:52 -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 2866E16A4CE for ; Sat, 13 Mar 2004 14:38:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D77443D2F for ; Sat, 13 Mar 2004 14:38:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DMcpGe068254 for ; Sat, 13 Mar 2004 14:38:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMcob8068251 for perforce@freebsd.org; Sat, 13 Mar 2004 14:38:50 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 14:38:50 -0800 (PST) Message-Id: <200403132238.i2DMcob8068251@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 48917 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, 13 Mar 2004 22:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=48917 Change 48917 by peter@peter_overcee on 2004/03/13 14:37:55 IFC @48916 Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#20 integrate .. //depot/projects/hammer/sys/conf/options.amd64#28 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#44 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#20 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#25 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#26 integrate .. //depot/projects/hammer/sys/sys/syscall.h#25 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#25 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#25 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#20 (text+ko) ==== @@ -232,7 +232,7 @@ # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) ==== //depot/projects/hammer/sys/conf/options.amd64#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.13 2004/03/05 07:56:23 obrien Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.14 2004/03/13 22:16:34 peter Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h ==== //depot/projects/hammer/sys/kern/init_sysent.c#26 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.165 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.166 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/kern/kern_exec.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.238 2004/03/12 21:06:20 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.239 2004/03/13 22:31:38 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/kern_exit.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.224 2004/03/05 22:39:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.225 2004/03/13 22:31:39 peter Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/hammer/sys/kern/kern_fork.c#32 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.221 2004/03/10 00:27:36 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.222 2004/03/13 22:31:39 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/kern_thread.c#44 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.172 2004/03/01 23:07:58 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.173 2004/03/13 22:31:39 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/kern/subr_trap.c#20 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.264 2004/03/05 17:35:28 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.265 2004/03/13 22:31:39 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/syscalls.c#25 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.151 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.152 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ const char *syscallnames[] = { ==== //depot/projects/hammer/sys/kern/syscalls.master#26 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. ==== //depot/projects/hammer/sys/sys/syscall.h#25 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.149 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.150 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ #define SYS_syscall 0 ==== //depot/projects/hammer/sys/sys/syscall.mk#25 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.104 2004/02/03 05:11:31 deischen Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.105 2004/03/13 22:32:17 peter Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/hammer/sys/sys/sysproto.h#25 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.148 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.149 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ #ifndef _SYS_SYSPROTO_H_