From owner-p4-projects@FreeBSD.ORG Sun Apr 30 00:04:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE78816A404; Sun, 30 Apr 2006 00:04:00 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AABE716A409 for ; Sun, 30 Apr 2006 00:03:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3555443D46 for ; Sun, 30 Apr 2006 00:03:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U03wGE030247 for ; Sun, 30 Apr 2006 00:03:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U03w62030241 for perforce@freebsd.org; Sun, 30 Apr 2006 00:03:58 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Apr 2006 00:03:58 GMT Message-Id: <200604300003.k3U03w62030241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 00:04:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=96384 Change 96384 by jb@jb_freebsd2 on 2006/04/30 00:03:09 These compatibility headers are no longer required now that the definitions are in the standard FreeBSD headers. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/param.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/stat.h#3 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/time.h#3 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/types.h#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 30 00:08:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7F3B16A403; Sun, 30 Apr 2006 00:08:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B05CD16A401 for ; Sun, 30 Apr 2006 00:08:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60EAD43D45 for ; Sun, 30 Apr 2006 00:08:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U0848H030395 for ; Sun, 30 Apr 2006 00:08:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U084b9030392 for perforce@freebsd.org; Sun, 30 Apr 2006 00:08:04 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Apr 2006 00:08:04 GMT Message-Id: <200604300008.k3U084b9030392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 00:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=96385 Change 96385 by jb@jb_freebsd2 on 2006/04/30 00:07:52 Put all DTrace providers under sys/modules/dtrace. Affected files ... .. //depot/projects/dtrace/src/sys/modules/fasttrap/Makefile#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 30 00:13:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E2F416A407; Sun, 30 Apr 2006 00:13:20 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 692A816A400 for ; Sun, 30 Apr 2006 00:13:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FFB043D6E for ; Sun, 30 Apr 2006 00:13:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U0DK43032990 for ; Sun, 30 Apr 2006 00:13:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U0DJCl032982 for perforce@freebsd.org; Sun, 30 Apr 2006 00:13:19 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Apr 2006 00:13:19 GMT Message-Id: <200604300013.k3U0DJCl032982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 00:13:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=96386 Change 96386 by jb@jb_freebsd2 on 2006/04/30 00:12:19 Put all the DTrace providers under one directory. It makes more sense to keep them grouped this way because most people won't recognise them as DTrace providers from their names. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#9 (text+ko) ==== @@ -1,26 +1,7 @@ # $FreeBSD# -.PATH: ${.CURDIR}/../../cddl/dev/dtrace -.PATH: ${.CURDIR}/../../cddl/dev/dtrace/${MACHINE_ARCH} +.include -KMOD= dtrace -SRCS= dtrace.c dtrace_mutex.c dtrace_asm.S dis_tables.c instr_size.c -SRCS+= bus_if.h device_if.h vnode_if.h +SUBDIR= dtrace -CFLAGS+= -I${.CURDIR}/../../cddl/dev/dtrace \ - -I${.CURDIR}/../../cddl/dev/dtrace/${MACHINE_ARCH} \ - -I${.CURDIR}/../../contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../contrib \ - -I${.CURDIR}/../.. -DDIS_MEM -D_SOLARIS_C_SOURCE - -CFLAGS+= -DDEBUG - -load : - kldload dtrace - kldstat - -unload : - kldunload dtrace - kldstat - -.include +.include From owner-p4-projects@FreeBSD.ORG Sun Apr 30 00:14:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D21416A40F; Sun, 30 Apr 2006 00:14:23 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 595AB16A404 for ; Sun, 30 Apr 2006 00:14:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAE6943D70 for ; Sun, 30 Apr 2006 00:14:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U0ELNj033685 for ; Sun, 30 Apr 2006 00:14:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U0ELA0033682 for perforce@freebsd.org; Sun, 30 Apr 2006 00:14:21 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Apr 2006 00:14:21 GMT Message-Id: <200604300014.k3U0ELA0033682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 00:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=96387 Change 96387 by jb@jb_freebsd2 on 2006/04/30 00:14:15 New dtrace module build directory in the land of providers. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 30 01:06:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63FA516A403; Sun, 30 Apr 2006 01:06:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 27C2916A400 for ; Sun, 30 Apr 2006 01:06:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E83CB43D46 for ; Sun, 30 Apr 2006 01:06:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U16OSA082627 for ; Sun, 30 Apr 2006 01:06:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U16OcL082624 for perforce@freebsd.org; Sun, 30 Apr 2006 01:06:24 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Apr 2006 01:06:24 GMT Message-Id: <200604300106.k3U16OcL082624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 01:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=96388 Change 96388 by jb@jb_freebsd2 on 2006/04/30 01:05:58 Add DTrace support to the generic kernel by default. This adds very little bloat because it only contains hooks for the dtrace device and DTrace provider devices to use. The bulk of the DTrace kernel infrastructure is located in the dtrace device module. Affected files ... .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/conf/GENERIC#4 (text+ko) ==== @@ -62,6 +62,7 @@ # Debugging for use in -current options KDB # Enable kernel debugger support. +options KDTRACE # Enable kernel DTrace support. options DDB # Support DDB. options GDB # Support remote GDB. options INVARIANTS # Enable calls of extra sanity checking From owner-p4-projects@FreeBSD.ORG Sun Apr 30 01:53:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DB1316A40F; Sun, 30 Apr 2006 01:53:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4BA8B16A401 for ; Sun, 30 Apr 2006 01:53:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E200643D45 for ; Sun, 30 Apr 2006 01:53:23 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U1rNfS007838 for ; Sun, 30 Apr 2006 01:53:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U1rMfV007816 for perforce@freebsd.org; Sun, 30 Apr 2006 01:53:22 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Apr 2006 01:53:22 GMT Message-Id: <200604300153.k3U1rMfV007816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 01:53:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=96390 Change 96390 by jb@jb_freebsd2 on 2006/04/30 01:52:27 Merge from current. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#2 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#4 integrate .. //depot/projects/dtrace/src/bin/sh/input.c#2 integrate .. //depot/projects/dtrace/src/bin/sh/var.c#2 integrate .. //depot/projects/dtrace/src/etc/Makefile#2 integrate .. //depot/projects/dtrace/src/etc/cached.conf#1 branch .. //depot/projects/dtrace/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/dtrace/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/cached#1 branch .. //depot/projects/dtrace/src/etc/rc.d/nsswitch#3 integrate .. //depot/projects/dtrace/src/include/nsswitch.h#2 integrate .. //depot/projects/dtrace/src/include/rpc/rpcent.h#2 integrate .. //depot/projects/dtrace/src/lib/libc/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/include/nscache.h#1 branch .. //depot/projects/dtrace/src/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/net/gethostnamadr.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/getnetnamadr.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/getproto.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/getprotoent.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/getprotoname.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/getservbyname.c#3 delete .. //depot/projects/dtrace/src/lib/libc/net/getservbyport.c#3 delete .. //depot/projects/dtrace/src/lib/libc/net/getservent.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/name6.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/net/netdb_private.h#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/nscache.c#1 branch .. //depot/projects/dtrace/src/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/dtrace/src/lib/libdisk/disk.c#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_getschedparam.c#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutexattr.c#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/dtrace/src/release/Makefile#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/dtrace/src/sbin/dumpon/dumpon.c#2 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#4 integrate .. //depot/projects/dtrace/src/share/man/man4/ath.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/bge.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/rr232x.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/snd_via8233.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/wi.4#2 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#3 integrate .. //depot/projects/dtrace/src/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/dtrace/src/share/man/man9/sysctl.9#1 branch .. //depot/projects/dtrace/src/share/man/man9/sysctl_add_oid.9#2 integrate .. //depot/projects/dtrace/src/share/man/man9/sysctl_ctx_init.9#2 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#2 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x14.fnt#2 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x16.fnt#2 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x8.fnt#2 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-thin-8x16.fnt#2 integrate .. //depot/projects/dtrace/src/share/termcap/termcap.src#2 integrate .. //depot/projects/dtrace/src/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#6 integrate .. //depot/projects/dtrace/src/sys/conf/files#8 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#3 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#3 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/dtrace/src/sys/conf/options#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/dtrace/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/dtrace/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/dtrace/src/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/dtrace/src/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/dtrace/src/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/puc/puc_ebus.c#2 delete .. //depot/projects/dtrace/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/puc/puc_sbus.c#2 delete .. //depot/projects/dtrace/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/puc/pucvar.h#2 delete .. //depot/projects/dtrace/src/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/README#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/array.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/him.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/list.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/dtrace/src/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/puc/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/sio/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/sk/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace/src/sys/pci/if_sk.c#2 delete .. //depot/projects/dtrace/src/sys/pci/if_skreg.h#2 delete .. //depot/projects/dtrace/src/sys/pci/xmaciireg.h#2 delete .. //depot/projects/dtrace/src/sys/pci/yukonreg.h#2 delete .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/dtrace/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/rman.h#2 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/dtrace/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/lorder/lorder.1#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/systat.1#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/vmstat.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agent.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agent.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agents/Makefile.inc#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cached.8#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cached.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cached.conf.5#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/config.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/config.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/debug.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/debug.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/hashtable.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/log.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/log.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/parser.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/parser.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/protocol.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/protocol.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/query.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/query.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/singletons.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/cached/singletons.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/mergemaster/mergemaster.8#2 integrate .. //depot/projects/dtrace/src/usr.sbin/mergemaster/mergemaster.sh#2 integrate .. //depot/projects/dtrace/www/en/commercial/consult.xml#3 integrate .. //depot/projects/dtrace/www/en/developers.sgml#3 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#3 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#3 integrate .. //depot/projects/dtrace/www/en/index.xsl#2 integrate .. //depot/projects/dtrace/www/en/layout/css/layout.css#2 integrate .. //depot/projects/dtrace/www/en/projects/busdma/index.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#3 integrate .. //depot/projects/dtrace/www/en/projects/netperf/cluster.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2005.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#5 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/schedule.sgml#2 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/todo.sgml#3 integrate .. //depot/projects/dtrace/www/fr/java/index.sgml#2 integrate .. //depot/projects/dtrace/www/fr/mailto.sgml#2 integrate .. //depot/projects/dtrace/www/fr/news/status/status.sgml#2 integrate .. //depot/projects/dtrace/www/fr/snapshots/index.sgml#2 integrate .. //depot/projects/dtrace/www/fr/where.sgml#2 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + &a.mike; (2001 - 2006) + + + + &a.roger; (1999 - 2006) + + + + &a.mheinen; (2002 - 2006) + + + &a.nsayer; (1999 - 2006) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.73 2005/09/12 17:14:28 yar Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.74 2006/04/28 12:39:55 blackend Exp $ --> @@ -1833,7 +1833,7 @@ Use: The SGML source for the Handbook in English can be - found in /usr/doc/en/handbook/. The first + found in /usr/doc/en/handbook/. The first file is called handbook.sgml in that directory. You should also see a Makefile and a number of files with a .ent ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -32,7 +32,7 @@ (MAC) facilities. Mandatory Access Control allows new access control modules to be loaded, implementing new security policies. Some provide protections of a narrow subset of the - system, hardening a particular service Others provide + system, hardening a particular service. Others provide comprehensive labeled security across all subjects and objects. The mandatory part of the definition comes from the fact that the enforcement of @@ -159,6 +159,16 @@ + high water mark: A high water mark + policy is one which permits the raising of security levels + for the purpose of accessing higher level information. In + most cases, the original level is restored after the process + is complete. Currently, the &os; MAC + framework does not have a policy for this, but the definition + is included for completeness. + + + integrity: Integrity, as a key concept, is the level of trust which can be placed on data. As the integrity of the data is elevated, so does the ability @@ -186,6 +196,16 @@ + low water mark: A low water mark + policy is one which permits lowering of the security levels + for the purpose of accessing information which is less + secure. In most cases, the original security level of the + user is restored after the process is complete. The only + security policy module in &os; to use this is + &man.mac.lomac.4;. + + + multilabel: The property is a file system option which can be set in single user mode using the @@ -835,21 +855,50 @@ Planning the Security Configuration - As with implementing any technology, there must be a planning - phase. During this time is it best an administrator looks at - their plight as a whole and defines exactly what is needed. - Examine thoroughly what requirements exist, how to accomplish - the final goal. How must information be classified or restricted, - what users should be given access and which MAC - module or modules will be required to achieve this goal. + Whenever a new technology is implemented, a planning phase is + always a good idea. During the planning stages, an administrator + should in general look at the big picture, trying + to keep in view at least the following: + + + + The implementation requirements; + + + + The implementation goals; + + + + For MAC installations, these include: + + + + How to classify information and resources available on + the target systems. + + + + What sorts of information or resources to restrict + access to along with the type of restrictions that should be + applied. + + + + Which MAC module or modules will be + required to achieve this goal. + + - Although it is always possible to reconfigure and change the - system resources and security settings, it is inconvenient to + It is always possible to reconfigure and change the + system resources and security settings, it is quite often very inconvenient to search through the system and fix existing files and user accounts. Planning helps to ensure a trouble-free and efficient trusted system implementation. A trial run of the trusted system, including the configuration, is often vital and definitely - beneficial before. The idea of just letting loose on a system + beneficial before a MAC + implementation is used on production systems. The idea of just + letting loose on a system with MAC is like setting up for failure. Different environments may have explicit needs and ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -649,7 +649,10 @@ Les sections suivantes fournissent des instructions de base sur l'utilisation du catalogue des logiciels portés pour installer - et désinstaller des programmes sur votre système. + et désinstaller des programmes sur votre système. + Une description détaillée des cibles make et + de variables d'environnement est disponible dans la page de + manuel &man.ports.7;. Obtenir le catalogue des logiciels portés @@ -668,72 +671,6 @@ obtenir le catalogue des logiciels portés: - La méthode Sysinstall - - Cette méthode implique l'utilisation à nouveau de - sysinstall pour installer - manuellement le catalogue des logiciels portés. - - - En tant que root, lancez - sysinstall - (/stand/sysinstall dans les versions de - &os; antérieure à 5.2) comme montré - ci-dessous: - - &prompt.root; /stand/sysinstall - - - - Faites défiler l'écran vers le bas et - sélectionnez Configure, - appuyez sur Entrée. - - - - Faites défiler l'écran vers le bas et - sélectionnez Distributions, - appuyez sur Entrée. - - - - Faites défiler l'écran vers le bas jusqu'à - ports, appuyez sur - Espace. - - - - Remontez jusqu'à Exit, - appuyez sur Entrée. - - - - Choisissez le support d'installation désiré, - comme un CDROM, par FTP, etc... - - - - Remontez jusqu'à Exit - et appuyez sur Enter. - - - - Appuyez sur la touche X pour quitter - sysinstall. - - - - Une autre alternative pour obtenir et garder à jour votre - catalogue des logiciels portés est d'utiliser - CVSup. Jetez un coup d'oeil au - fichier CVSup du catalogue des - logiciels portés, - /usr/share/examples/cvsup/ports-supfile. - Consultez Utiliser CVSup () pour plus d'information sur l'utilisation de - CVSup et ce fichier. - - La méthode CVSup C'est une méthode rapide pour récupérer @@ -815,6 +752,148 @@ pour autant recompiler vos logiciels. + + + La méthode Portsnap + + Portsnap est un + système alternatif de distribution du catalogue des + logiciels portés. Il a été fourni pour + la première fois avec &os; 6.0. Sur les + systèmes plus anciens vous pouvez l'installer + à partir du logiciel pré-compilé + sysutils/portsnap: + + &prompt.root; pkg_add -r portsnap + + Veuillez vous reporter à la section + Utiliser Portsnap pour une + description détaillée de toutes les + caractéristiques de + Portsnap. + + + Depuis &os; 6.1-RELEASE et avec les versions + récentes pré-compilées ou + portées de Portsnap, + vous pouvez sans risque passer cette étape. Le + répertoire /usr/ports sera + créé automatiquement à la + première utilisation de la commande + &man.portsnap.8;. Avec les versions + précédentes de + Portsnap, vous devrez + créé un répertoire /usr/ports s'il n'existe + pas: + + &prompt.root; mkdir /usr/ports + + + + Téléchargez un instantané + compressé du catalogue des logiciels portés + dans le répertoire /var/db/portsnap. Vous pouvez + vous déconnecter de l'Internet, si vous le + désirez, après cette opération: + + &prompt.root; portsnap fetch + + + + Si vous exécutez + Portsnap pour la première + fois, il faut extraire l'instantané dans le + répertoire /usr/ports: + + &prompt.root; portsnap extract + + Si votre répertoire /usr/ports contient + déjà une version du catalogue des logiciels + portés et que vous désirez juste mettre + à jour, utilisez plutôt la commande: + + &prompt.root; portsnap update + + + + + La méthode Sysinstall + + Cette méthode implique l'utilisation de + sysinstall pour installer le + catalogue des logiciels portés à partir du + disque d'installation. Il faut noter que la version du + catalogue qui sera installée est la version datant de + la publication de votre disque d'installation. Si vous + disposez d'un accès à l'Internet, vous devriez + toujours utiliser une des méthodes + précédemment exposées. + + + En tant que root, lancez + sysinstall + (/stand/sysinstall dans les versions de + &os; antérieure à 5.2) comme montré + ci-dessous: + + &prompt.root; /stand/sysinstall + + + + Faites défiler l'écran vers le bas et + sélectionnez Configure, + appuyez sur Entrée. + + + + Faites défiler l'écran vers le bas et + sélectionnez Distributions, + appuyez sur Entrée. + + + + Faites défiler l'écran vers le bas jusqu'à + ports, appuyez sur + Espace. + + + + Remontez jusqu'à Exit, + appuyez sur Entrée. + + + + Choisissez le support d'installation désiré, + comme un CDROM, par FTP, etc. + + + + Remontez jusqu'à Exit + et appuyez sur Enter. + + + + Appuyez sur la touche X pour quitter + sysinstall. + + + + Une autre alternative pour obtenir et garder à jour votre + catalogue des logiciels portés est d'utiliser + CVSup. Jetez un coup d'oeil au + fichier CVSup du catalogue des + logiciels portés, + /usr/share/examples/cvsup/ports-supfile. + Consultez Utiliser CVSup () pour plus d'information sur l'utilisation de + CVSup et ce fichier. + @@ -938,29 +1017,13 @@ manuel &man.portaudit.1; et &man.periodic.8;. - - Installer des logiciels portés à partir d'un - CDROM + Le catalogue des logiciels portés suppose que vous + disposez d'une connection active à l'Internet. Si ce n'est + pas le cas, vous devez placer manuellement une copie + du distfile dans le répertoire /usr/ports/distfiles. - - logiciels portés - installation à partir d'un CDROM - - Les images des CDROM officiels du Projet FreeBSD ne - contiennent plus les distfiles. Ils prennent beaucoup - d'espace qui est bien mieux utilisé par les logiciels - pré-compilés. Les CDROMs comme ceux du FreeBSD PowerPak - incluent les distfiles, et vous pouvez les commander - auprès d'un vendeur comme FreeBSD Mall. Cette - section suppose que vous disposez d'un tel jeu de - CDROM. - - Placez votre CDROM FreeBSD dans le lecteur. Montez-le sur - /cdrom (Si vous utilisez un point de - montage différent, positionnez la variable - CD_MOUNTPTS). Pour - commencer, rendez-vous dans le répertoire du logiciel + Pour commencer, rendez-vous dans le répertoire du logiciel porté que vous voulez installer: &prompt.root; cd /usr/ports/sysutils/lsof @@ -975,7 +1038,7 @@ &prompt.root; make >> lsof_4.57D.freebsd.tar.gz doesn't seem to exist in /usr/ports/distfiles/. ->> Attempting to fetch from file:/cdrom/ports/distfiles/. +>> Attempting to fetch from ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/. ===> Extracting for lsof-4.57 ... [extraction output snipped] @@ -1023,12 +1086,24 @@ attention à tout avertissement qui pourrait apparaître. + Il est conseillé de supprimer le sous-répertoire de + travail, qui contient tous les fichiers temporaires utilisés + lors de la compilation. Non seulement cela consomme de + l'espace disque, mais cela posera problème plus tard lors de + la mise à jour vers une nouvelle version du logiciel + porté. + + &prompt.root; make clean +===> Cleaning for lsof-4.57 +&prompt.root; + - Vous pouvez vous économiser une étape - supplémentaire en lançant juste - make install à la place de - make et make install - sous forme de deux étapes séparées. + Vous pouvez vous économiser deux étapes + supplémentaires en lançant juste + make install clean à la place de + make, make install + et make clean + sous la forme de trois étapes séparées. @@ -1046,84 +1121,35 @@ Cette commande fonctionnera pour les interpréteurs de commandes comme tcsh. Utilisez la commande hash -r pour les - interpréteurs tels que sh ou - shells/bash. + interpréteurs tels que sh. Consultez la documentation de votre interpréteur de commandes pour plus d'information. - - Soyez conscient que les licences de quelques logiciels - portés ne permettent pas leur présence sur le CDROM. - Cela peut être dû à la nécessité - de remplir un formulaire - d'enregistrement avant le téléchargement, ou que la - redistribution n'est pas permise, ou toute autre raison. Si vous désirez - installer un logiciel porté qui n'est pas disponible sur le - CDROM, vous devrez vous connecter afin d'effectuer cela - (voir la section - suivante). + Certains DVD-ROMs comme le &os; Toolkit de FreeBSD Mall + contiennent des distfiles. + Ils peuvent être utilisés avec le catalogue des logiciels + portés. + Montez le DVD-ROM sous /cdrom. Si vous + utilisez un point de montage différent, positionnez la + variable &man.make.1; CD_MOUNTPTS. Les + distfiles nécessaires seront automatiquement utilisés s'ils + sont présent sur le disque. + + + Soyez conscient que les licences de quelques logiciels + portés n'autorisent pas leur présence sur le + CD-ROM. Cela peut être dû à la + nécessité de remplir un formulaire + d'enregistrement avant le téléchargement, ou + que la redistribution n'est pas permise, ou toute autre + raison. Si vous désirez installer un logiciel + porté qui n'est pas disponible sur le CD-ROM, vous + devrez vous connecter afin de récupérer les + fichiers nécessaires. - - - - Installer des logiciels portés à partir - d'Internet - - Comme pour la section précédente, cette section - suppose que vous avez une connexion internet qui fonctionne. Si ce - n'est pas le cas, vous devrez effectuer l'installation par CDROM, ou mettre - manuellement une copie des sources dans le répertoire - /usr/ports/distfiles. - - L'installation d'un logiciel porté à partir - d'Internet est effectuée de la même manière - que si vous installiez à partir - d'un CDROM. La seule différence entre les deux est que le - distfile est téléchargé sur Internet - plutôt qu'obtenu sur le CDROM. - - Les étapes impliquées sont identiques: - &prompt.root; make install ->> lsof_4.57D.freebsd.tar.gz doesn't seem to exist in /usr/ports/distfiles/. ->> Attempting to fetch from ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/. -Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100% -439860 bytes transferred in 18.0 seconds (23.90 kBps) -===> Extracting for lsof-4.57 -... -[extraction output snipped] -... ->> Checksum OK for lsof_4.57D.freebsd.tar.gz. -===> Patching for lsof-4.57 -===> Applying FreeBSD patches for lsof-4.57 -===> Configuring for lsof-4.57 -... -[configure output snipped] -... -===> Building for lsof-4.57 -... -[compilation output snipped] -... -===> Installing for lsof-4.57 -... -[installation output snipped] -... -===> Generating temporary packing list -===> Compressing manual pages for lsof-4.57 -===> Registering installation for lsof-4.57 -===> SECURITY NOTE: - This port has installed the following binaries which execute with - increased privileges. -&prompt.root; - - Comme vous pouvez le voir, la seule différence est la - ligne qui indique où le système a - récupéré les sources du - logiciel porté. - Le catalogue des logiciels portés utilise &man.fetch.1; pour télécharger les fichiers, qui respecte diverses variables d'environnement, dont FTP_PASSIVE_MODE, @@ -1199,20 +1225,19 @@ role="package">mail/sylpheed-claws. Un message sera affiché quand de telles options sont disponibles. - Modifier les répertoires par défaut des logiciels portés Il est parfois utile (ou obligatoire) d'utiliser des - répertoires différents pour les archives et le - catalogue des logiciels portés. Les variables - PORTSDIR et PREFIX + répertoires de travail ou cible différents. + Les variables + WRKDIRPREFIX et PREFIX permettent de modifier les répertoires par défaut. Par exemple: - &prompt.root; make PORTSDIR=/usr/home/example/ports install + &prompt.root; make WRKDIRPREFIX=/usr/home/example/ports install compilera le logiciel dans le répertoire Et bien sûr - &prompt.root; make PORTSDIR=../ports PREFIX=../local install + &prompt.root; make WRKDIRPREFIX=../ports PREFIX=../local install combinera les deux (c'est trop long pour tenir sur cette page, mais cela devrait vous donner une idée @@ -1272,82 +1297,31 @@ porté. Nous désinstallerons notre exemple précédent (qui était lsof pour ceux d'entre vous qui n'ont pas - suivi). Comme pour l'installation de logiciels portés, la - première chose que vous devez faire et de vous rendre dans le - répertoire du logiciel porté, - /usr/ports/sysutils/lsof. Après avoir - changé de répertoire, vous êtes prêt pour - désinstaller - lsof. C'est fait grâce à la commande - make deinstall: + suivi). Les logiciels portés sont supprimés de + la même manière que pour les logiciels + pré-compilés (comme décrit dans la + section Utiliser le + système des logiciels + pré-compilés) en utilisant la commande + &man.pkg.delete.1;: - &prompt.root; cd /usr/ports/sysutils/lsof -&prompt.root; make deinstall -===> Deinstalling for lsof-4.57 - - C'était relativement facile. Vous avez retiré - lsof de votre système. - Si vous désirez le - réinstaller, vous pouvez le faire en lançant make - reinstall depuis le répertoire - /usr/ports/sysutils/lsof. - - La séquence make deinstall et - make reinstall ne fonctionnera pas une fois - que vous avez lancé make clean. Si vous - voulez déinstaller un logiciel porté après - le nettoyage, - utilisez &man.pkg.delete.1; comme décrit dans la - section Utiliser le système - des logiciels pré-compilés du Manuel. + &prompt.root; pkg_delete lsof-4.57 - - Logiciels portés et espace disque >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 30 05:43:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21E0116A400; Sun, 30 Apr 2006 05:43:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 93E4A16A401 for ; Sun, 30 Apr 2006 05:43:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12E7943D4C for ; Sun, 30 Apr 2006 05:43:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U5h3vU044985 for ; Sun, 30 Apr 2006 05:43:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U5h3lq044979 for perforce@freebsd.org; Sun, 30 Apr 2006 05:43:03 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Apr 2006 05:43:03 GMT Message-Id: <200604300543.k3U5h3lq044979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 05:43:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=96396 Change 96396 by jb@jb_freebsd2 on 2006/04/30 05:42:27 Create all the dtrace device nodes below /dev/dtrace so that provides don't use the same name space as other devices. This exposes a quirk with the device cloning code. The first time after booting that /dev/dtrace/dtrace is opened, the clone function gets the name 'dtrace' it then creates /dev/dtrace/dtrace1. If the module is unloaded and reloaded, the next time that /dev/dtrace/dtrace is opened, the clone function gets the name 'dtrace/dtrace'. This is non-intuitive. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#9 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#9 (text) ==== @@ -782,7 +782,7 @@ dfp->df_size = size; } - (void) snprintf(path, sizeof (path), "/dev/%s", p1); + (void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1); if ((fd = open(path, O_RDONLY)) == -1) continue; /* failed to open driver; just skip it */ @@ -919,17 +919,13 @@ */ dt_provmod_open(&provmod, &df); -#if defined(sun) dtfd = open("/dev/dtrace/dtrace", O_RDWR); -#else - dtfd = open("/dev/dtrace", O_RDWR | O_DEBUG); -#endif err = errno; /* save errno from opening dtfd */ #if defined(sun) ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR); #else - ftfd = open("/dev/fasttrap", O_RDWR); + ftfd = open("/dev/dtrace/fasttrap", O_RDWR); #endif fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */ ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#4 (text+ko) ==== @@ -33,11 +33,20 @@ dtrace_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev) { int u; + size_t len; if (*dev != NULL) return; - if (strlen(name) != 6 || bcmp(name,"dtrace",6) != 0) + len = strlen(name); + + if (len != 6 && len != 13) + return; + + if (bcmp(name,"dtrace",6) != 0) + return; + + if (len == 13 && bcmp(name,"dtrace/dtrace",13) != 0) return; /* Allocate a unique minor number. */ @@ -45,9 +54,9 @@ /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) - /* Create the /dev/dtraceNN entry. */ + /* Create the /dev/dtrace/dtraceNN entry. */ *dev = make_dev_cred(&dtrace_cdevsw, unit2minor(u), cred, - UID_ROOT, GID_WHEEL, 0600, "dtrace%d", u); + UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace%d", u); if (*dev != NULL) { dev_ref(*dev); (*dev)->si_flags |= SI_CHEAPCLONE; From owner-p4-projects@FreeBSD.ORG Sun Apr 30 16:33:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31EA816A430; Sun, 30 Apr 2006 16:33:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EFE7116A42B for ; Sun, 30 Apr 2006 16:33:52 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46B0143D48 for ; Sun, 30 Apr 2006 16:33:52 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3UGXqXp016054 for ; Sun, 30 Apr 2006 16:33:52 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3UGXl5k015958 for perforce@freebsd.org; Sun, 30 Apr 2006 16:33:47 GMT (envelope-from scottl@freebsd.org) Date: Sun, 30 Apr 2006 16:33:47 GMT Message-Id: <200604301633.k3UGXl5k015958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 96409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 16:33:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=96409 Change 96409 by scottl@scottl-junior on 2006/04/30 16:33:22 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/clock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/GENERIC#7 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/cpu.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/kdb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/pcpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/isa/isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_dummy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_proto.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_syscall.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysent.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysvec.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/syscalls.master#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/pcibus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/gdb_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asmacros.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/bus.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/kdb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/trap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/in_cksum.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/atomic.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/in_cksum.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/obio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/alpha/common/Makefile.common#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/beastie.4th#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/libi386.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/gatea20.c#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.alpha#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.alpha#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.i386#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.ia64#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_norm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_thread.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdHardware.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cmbat.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_powerres.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrvar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_drv.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drm.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_ds.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_ds.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_mm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/LICENSE#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/README#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/en/midway.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/exca/exca.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/if_ic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_disk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_ioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfivar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_reg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/patm/if_patm_attach.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbbreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_ebus.c#6 delete .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_sbus.c#6 delete .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucvar.h#4 delete .. //depot/projects/scottl-camlock/src/sys/dev/ral/if_ral.c#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ral/if_ral_pccard.c#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/if_ralreg.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ral/if_ralvar.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/README#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/array.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/him.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/list.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sab/sab.c#7 delete .. //depot/projects/scottl-camlock/src/sys/dev/sab/sab82532reg.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/safe/safe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe_ebus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe_macio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe_sbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_core.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_dev_sab82532.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_dev_z8530.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_ebus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_scc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_powerpc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_sab82532.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_z8530.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/hid.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/gdb/gdb_cons.c#1 branch .. //depot/projects/scottl-camlock/src/sys/gdb/gdb_int.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/gdb/gdb_main.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_bsd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_disk.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_slice.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3_ctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/exception.s#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/geode.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/io_apic.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/kdb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/md_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/minidump.h#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/npx.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.master#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/nexus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/kdb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/imgact_aout.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_environment.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mac.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_module.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/md5c.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/serdev_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_kdb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_prf.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_proto.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_dock/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/ath/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/bce/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/ce/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cp/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_gif/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ipfilter/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ipfw/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mfi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/pf/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/pflog/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/puc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ral/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/scc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/sio/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/sk/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/smbfs/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/uart/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_arc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_media.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ppp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/raw_cb.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_usrreq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netatm/atm_aal5.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netatm/atm_proto.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netatm/atm_socket.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netatm/atm_usrreq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netatm/atm_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/netflow/netflow.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_output.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/keydb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/keysock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_tcp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/README#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/ipx_input.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/ipx_ip.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/ipx_pcb.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/ipx_pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netkey/keysock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netnatm/natm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netnatm/natm_pcb.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_crypt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_smb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_diskless.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfsrvcache.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/crypto.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/ppc.c#4 delete .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/ppcreg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/include/minidump.h#1 branch .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_sk.c#6 delete .. //depot/projects/scottl-camlock/src/sys/pci/if_skreg.h#6 delete .. //depot/projects/scottl-camlock/src/sys/pci/xmaciireg.h#3 delete .. //depot/projects/scottl-camlock/src/sys/pci/yukonreg.h#3 delete .. //depot/projects/scottl-camlock/src/sys/posix4/ksched.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/posix4/p1003_1b.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/bus.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/hrowpic.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorth.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/iobus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_vfs.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/ebus/ebus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/fhc/clkbrd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/fhc/clkbrdreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/kdb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/nexus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/tick.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/aio.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/buf.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bufobj.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bus.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/cdefs.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/clock.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/disk.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/event.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/filedesc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/gmon.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/hash.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/linker.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lock.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mac.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mac_policy.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/md5.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/module.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/pmc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/protosw.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/rman.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/serial.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sx.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/turnstile.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/umtx.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_inode.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/Makefile#6 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $ +# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $ + +.include # The boot loader -.if !defined(NO_BOOT) +.if ${MK_BOOT} != "no" .if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif ==== //depot/projects/scottl-camlock/src/sys/alpha/alpha/clock.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.45 2006/03/28 21:20:11 jhb Exp $"); #include "opt_clock.h" @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -89,8 +90,6 @@ device_t clockdev; int clockinitted; -int tickfix; -int tickfixinterval; int adjkerntz; /* local offset from GMT in seconds */ int disable_rtc_set; /* disable resettodr() if != 0 */ int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ @@ -103,15 +102,8 @@ #define TIMER_FREQ 1193182 #endif u_int32_t timer_freq = TIMER_FREQ; -int timer0_max_count; -static u_int32_t i8254_lastcount; -static u_int32_t i8254_offset; -static int i8254_ticked; -static int clkintr_pending = 0; - extern int cycles_per_sec; -extern int ncpus; static timecounter_get_t i8254_get_timecount; static timecounter_get_t alpha_get_timecount; @@ -128,7 +120,7 @@ static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - ~0u, /* counter_mask */ + 0xffff, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; @@ -142,22 +134,6 @@ /* static u_char timer0_state; */ static u_char timer2_state; -/* - * Algorithm for missed clock ticks from Linux/alpha. - */ - -/* - * Shift amount by which scaled_ticks_per_cycle is scaled. Shifting - * by 48 gives us 16 bits for HZ while keeping the accuracy good even - * for large CPU clock rates. - */ -#define FIX_SHIFT 48 - -static u_int64_t scaled_ticks_per_cycle; -static u_int32_t max_cycles_per_tick; -static u_int32_t last_time; - -static void handleclock(int usermode, uintfptr_t pc); static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); @@ -176,6 +152,7 @@ calibrate_clocks(cycles_per_sec, &pcc, &freq); cycles_per_sec = pcc; + set_cputicker(read_cycle_count, cycles_per_sec, 0); /* * XXX: TurboLaser doesn't have an i8254 counter. @@ -206,7 +183,6 @@ freq, timer_freq); } set_timer_freq(timer_freq, hz); - i8254_timecounter.tc_frequency = timer_freq; out: #ifdef EVCNT_COUNTERS @@ -235,21 +211,12 @@ void cpu_initclocks() { - u_int32_t freq; if (clockdev == NULL) panic("cpu_initclocks: no clock attached"); tick = 1000000 / hz; /* number of microseconds between interrupts */ - tickfix = 1000000 - (hz * tick); - if (tickfix) { - int ftp; - ftp = min(ffs(tickfix), ffs(hz)); - tickfix >>= (ftp - 1); - tickfixinterval = hz >> (ftp - 1); - } - /* * Establish the clock interrupt; it's a special case. * @@ -262,24 +229,18 @@ * hardclock, which would then fall over because p->p_stats * isn't set at that time. */ - freq = cycles_per_sec; - last_time = alpha_rpcc(); - scaled_ticks_per_cycle = ((u_int64_t)hz << FIX_SHIFT) / freq; - max_cycles_per_tick = 2*freq / hz; /* * XXX: TurboLaser doesn't have an i8254 counter. * XXX: A replacement is needed, and another method * XXX: of determining this would be nice. */ - if (hwrpb->rpb_type != ST_DEC_21000) { + if (hwrpb->rpb_type != ST_DEC_21000) tc_init(&i8254_timecounter); - platform.clockintr = handleclock; - } else - platform.clockintr = hardclock; + platform.clockintr = hardclock; - if (ncpus == 1) { - alpha_timecounter.tc_frequency = freq; + if (mp_ncpus == 1) { + alpha_timecounter.tc_frequency = cycles_per_sec; tc_init(&alpha_timecounter); } @@ -375,7 +336,7 @@ if (count == 0) goto fail; if (count > prev_count) - tot_count += prev_count - (count - timer0_max_count); + tot_count += prev_count - (count - 0xffff); else tot_count += prev_count - count; prev_count = count; @@ -410,40 +371,16 @@ static void set_timer_freq(u_int freq, int intr_freq) { - int new_timer0_max_count; mtx_lock_spin(&clock_lock); timer_freq = freq; - new_timer0_max_count = TIMER_DIV(intr_freq); - if (new_timer0_max_count != timer0_max_count) { - timer0_max_count = new_timer0_max_count; - outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); - outb(TIMER_CNTR0, timer0_max_count & 0xff); - outb(TIMER_CNTR0, timer0_max_count >> 8); - } + i8254_timecounter.tc_frequency = timer_freq; + outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); + outb(TIMER_CNTR0, 0); + outb(TIMER_CNTR0, 0); mtx_unlock_spin(&clock_lock); } -static void -handleclock(int usermode, uintfptr_t pc) -{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 30 16:48:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D0CD16A404; Sun, 30 Apr 2006 16:48:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C554E16A402 for ; Sun, 30 Apr 2006 16:48:13 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A79443D45 for ; Sun, 30 Apr 2006 16:48:13 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3UGmDrP031820 for ; Sun, 30 Apr 2006 16:48:13 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3UGmBWR031817 for perforce@freebsd.org; Sun, 30 Apr 2006 16:48:11 GMT (envelope-from scottl@freebsd.org) Date: Sun, 30 Apr 2006 16:48:11 GMT Message-Id: <200604301648.k3UGmBWR031817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 96413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 16:48:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=96413 Change 96413 by scottl@scottl-junior on 2006/04/30 16:47:26 Revert the previous attempt at a CAM topology lock. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_debug.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_dvcfg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_iu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low_pisa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low_pisa.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_message.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targetio.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_cnfg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_fc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_inb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_init.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_ioc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_lan.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_log_fc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_log_sas.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_raid.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_sas.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_targ.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_tool.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_type.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_debug.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_reg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/FILES#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/dsbr100io.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehcireg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehcivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/hid.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/hid.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_auereg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cdcereg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cuereg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_kue.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_kuereg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ruereg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_udavreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/kue_fw.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohcireg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohcivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/rio500_usb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hsreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubser.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubser.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucycom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/udbp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uftdireg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ugen.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ugraphire_rdesc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhcireg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhcivar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhub.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umct.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ums.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uplcom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/urio.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_ethersubr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mem.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbcdc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi_util.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi_util.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvisor.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uxb360gp_rdesc.h#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#4 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#5 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_debug.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#8 (text+ko) ==== @@ -121,6 +121,7 @@ lun_id_t lun_id; cam_status status; u_int init_level; + int s; init_level = 0; /* @@ -185,7 +186,7 @@ if (status != CAM_REQ_CMP) goto failure; - mtx_lock(&cam_topo_lock); + s = splsoftcam(); cur_periph = TAILQ_FIRST(&(*p_drv)->units); while (cur_periph != NULL && cur_periph->unit_number < periph->unit_number) @@ -197,7 +198,8 @@ TAILQ_INSERT_TAIL(&(*p_drv)->units, periph, unit_links); (*p_drv)->generation++; } - mtx_unlock(&cam_topo_lock); + + splx(s); init_level++; @@ -212,9 +214,9 @@ /* Initialized successfully */ break; case 3: - mtx_lock(&cam_topo_lock); + s = splsoftcam(); TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); - mtx_unlock(&cam_topo_lock); + splx(s); xpt_remove_periph(periph); /* FALLTHROUGH */ case 2: @@ -242,20 +244,21 @@ { struct periph_driver **p_drv; struct cam_periph *periph; + int s; for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (name != NULL && (strcmp((*p_drv)->driver_name, name) != 0)) continue; - mtx_lock(&cam_topo_lock); + s = splsoftcam(); TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) { if (xpt_path_comp(periph->path, path) == 0) { - mtx_unlock(&cam_topo_lock); + splx(s); return(periph); } } - mtx_unlock(&cam_topo_lock); + splx(s); if (name != NULL) return(NULL); } @@ -265,14 +268,14 @@ cam_status cam_periph_acquire(struct cam_periph *periph) { + int s; if (periph == NULL) return(CAM_REQ_CMP_ERR); - /* XXX atomic increment instead? */ - mtx_lock(&cam_topo_lock); + s = splsoftcam(); periph->refcount++; - mtx_unlock(&cam_topo_lock); + splx(s); return(CAM_REQ_CMP); } @@ -280,17 +283,17 @@ void cam_periph_release(struct cam_periph *periph) { + int s; if (periph == NULL) return; - /* camperiphfree() will release the mutex. */ - mtx_lock(&cam_topo_lock); + s = splsoftcam(); if ((--periph->refcount == 0) && (periph->flags & CAM_PERIPH_INVALID)) { camperiphfree(periph); - } else - mtx_unlock(&cam_topo_lock); + } + splx(s); } @@ -308,10 +311,11 @@ { struct cam_periph *periph; char *periph_name; + int s; int i, val, dunit, r; const char *dname, *strval; - mtx_lock(&cam_topo_lock); + s = splsoftcam(); periph_name = p_drv->driver_name; for (;;newunit++) { @@ -357,7 +361,7 @@ if (r != 0) break; } - mtx_unlock(&cam_topo_lock); + splx(s); return (newunit); } @@ -412,7 +416,9 @@ void cam_periph_invalidate(struct cam_periph *periph) { + int s; + s = splsoftcam(); /* * We only call this routine the first time a peripheral is * invalidated. The oninvalidate() routine is always called at @@ -425,43 +431,36 @@ periph->flags |= CAM_PERIPH_INVALID; periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND; - /* camperiphfree() will release the mutex. */ - mtx_lock(&cam_topo_lock); if (periph->refcount == 0) camperiphfree(periph); - else if (periph->refcount < 0) { - mtx_unlock(&cam_topo_lock); + else if (periph->refcount < 0) printf("cam_invalidate_periph: refcount < 0!!\n"); - } + splx(s); } -/* - * The topology lock must be held on entry and will be released before return. - */ static void camperiphfree(struct cam_periph *periph) { + int s; struct periph_driver **p_drv; - mtx_assert(&cam_topo_lock, MA_OWNED); - for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { - if (strcmp((*p_drv)->driver_name, periph->periph_name) == 0) { - TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); - (*p_drv)->generation++; + if (strcmp((*p_drv)->driver_name, periph->periph_name) == 0) break; - } } - mtx_unlock(&cam_topo_lock); - if (*p_drv == NULL) { printf("camperiphfree: attempt to free non-existant periph\n"); return; } - + if (periph->periph_dtor != NULL) periph->periph_dtor(periph); + s = splsoftcam(); + TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); + (*p_drv)->generation++; + splx(s); + xpt_remove_periph(periph); if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) { ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#5 (text+ko) ==== @@ -129,21 +129,6 @@ struct buf *bp[CAM_PERIPH_MAXMAPS]; }; -typedef enum { - WORK_EXECUTE_CCB, - WORK_XPT_SCHED, - WORK_PERIPH_SCHED -} cam_periph_workflags; - -struct cam_periph_workitem { - TAILQ_ENTRY(cam_periph_workitem) work_link; - cam_periph_workflags command; - void *data1; - void *data2; - void (*cbfcnp)(void *); - void *cbdata; -}; - cam_status cam_periph_alloc(periph_ctor_t *periph_ctor, periph_oninv_t *periph_oninvalidate, periph_dtor_t *periph_dtor, ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#4 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#4 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#20 (text+ko) ==== @@ -635,7 +635,6 @@ typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t; static cam_isrq_t cam_bioq; static struct mtx cam_bioq_lock; -struct mtx cam_topo_lock; /* "Pool" of inactive ccbs managed by xpt_alloc_ccb and xpt_free_ccb */ static SLIST_HEAD(,ccb_hdr) ccb_freeq; @@ -1419,7 +1418,6 @@ STAILQ_INIT(&highpowerq); mtx_init(&cam_bioq_lock, "CAM BIOQ lock", NULL, MTX_DEF); - mtx_init(&cam_topo_lock, "XPT Topology lock", NULL, MTX_DEF); /* * The xpt layer is, itself, the equivelent of a SIM. @@ -1555,7 +1553,7 @@ s = splsoftcam(); camq_resize(&device->drvq, device->drvq.array_size - 1); - atomic_add_int(&device->generation, 1); + device->generation++; SLIST_REMOVE(periph_head, periph, cam_periph, periph_links); @@ -3348,6 +3346,7 @@ } case XPT_DEV_MATCH: { + int s; dev_pos_type position_type; struct ccb_dev_match *cdm; @@ -3356,7 +3355,7 @@ /* * Prevent EDT changes while we traverse it. */ - mtx_lock(&cam_topo_lock); + s = splcam(); /* * There are two ways of getting at information in the EDT. * The first way is via the primary EDT tree. It starts @@ -3404,7 +3403,7 @@ break; } - mtx_unlock(&cam_topo_lock); + splx(s); if (cdm->status == CAM_DEV_MATCH_ERROR) start_ccb->ccb_h.status = CAM_REQ_CMP_ERR; @@ -3467,7 +3466,6 @@ csa->ccb_h.path->device->refcount++; } - mtx_lock(&cam_topo_lock); if ((added & AC_FOUND_DEVICE) != 0) { /* * Get this peripheral up to date with all @@ -3482,7 +3480,6 @@ */ xpt_for_all_busses(xptsetasyncbusfunc, cur_entry); } - mtx_unlock(&cam_topo_lock); splx(s); start_ccb->ccb_h.status = CAM_REQ_CMP; break; @@ -4028,6 +4025,7 @@ void xpt_merge_ccb(union ccb *master_ccb, union ccb *slave_ccb) { + GIANT_REQUIRED; /* * Pull fields that are valid for peripheral drivers to set @@ -4044,6 +4042,7 @@ void xpt_setup_ccb(struct ccb_hdr *ccb_h, struct cam_path *path, u_int32_t priority) { + GIANT_REQUIRED; CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_setup_ccb\n")); ccb_h->pinfo.priority = priority; @@ -4055,7 +4054,7 @@ ccb_h->target_id = CAM_TARGET_WILDCARD; if (path->device) { ccb_h->target_lun = path->device->lun_id; - atomic_add_int(&ccb_h->pinfo.generation, 1); + ccb_h->pinfo.generation = ++path->device->ccbq.queue.generation; } else { ccb_h->target_lun = CAM_TARGET_WILDCARD; } @@ -4071,6 +4070,8 @@ struct cam_path *path; cam_status status; + GIANT_REQUIRED; + path = (struct cam_path *)malloc(sizeof(*path), M_CAMXPT, M_NOWAIT); if (path == NULL) { @@ -4087,33 +4088,6 @@ } static cam_status -xpt_clone_path(struct cam_path *old_path_ptr, struct cam_path **new_path_ptr) -{ - struct cam_path *path; - - path = (struct cam_path *)malloc(sizeof(*path), M_CAMXPT, M_NOWAIT); - - if (path == NULL) - return (CAM_RESRC_UNAVAIL); - - mtx_lock(&cam_topo_lock); - path->periph = old_path_ptr->periph; - path->bus = old_path_ptr->bus; - path->target = old_path_ptr->target; - path->device = old_path_ptr->device; - if (path->bus != NULL) - path->bus->refcount++; - if (path->target != NULL) - path->target->refcount++; - if (path->device != NULL) - path->device->refcount++; - mtx_unlock(&cam_topo_lock); - - *new_path_ptr = path; - return (CAM_REQ_CMP); -} - -static cam_status xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph, path_id_t path_id, target_id_t target_id, lun_id_t lun_id) { @@ -4121,6 +4095,7 @@ struct cam_et *target; struct cam_ed *device; cam_status status; + int s; status = CAM_REQ_CMP; /* Completed without error */ target = NULL; /* Wildcarded */ @@ -4130,7 +4105,7 @@ * We will potentially modify the EDT, so block interrupts * that may attempt to create cam paths. */ - mtx_lock(&cam_topo_lock); + s = splcam(); bus = xpt_find_bus(path_id); if (bus == NULL) { status = CAM_PATH_INVALID; @@ -4164,7 +4139,7 @@ } } } - mtx_unlock(&cam_topo_lock); + splx(s); /* * Only touch the user's data if we are successful. @@ -4176,14 +4151,12 @@ new_path->device = device; CAM_DEBUG(new_path, CAM_DEBUG_TRACE, ("xpt_compile_path\n")); } else { - mtx_lock(&cam_topo_lock); if (device != NULL) xpt_release_device(bus, target, device); if (target != NULL) xpt_release_target(bus, target); if (bus != NULL) xpt_release_bus(bus); - mtx_unlock(&cam_topo_lock); } return (status); } @@ -4192,8 +4165,6 @@ xpt_release_path(struct cam_path *path) { CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_release_path\n")); - - mtx_lock(&cam_topo_lock); if (path->device != NULL) { xpt_release_device(path->bus, path->target, path->device); path->device = NULL; @@ -4206,12 +4177,12 @@ xpt_release_bus(path->bus); path->bus = NULL; } - mtx_unlock(&cam_topo_lock); } void xpt_free_path(struct cam_path *path) { + GIANT_REQUIRED; CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_free_path\n")); xpt_release_path(path); @@ -4226,6 +4197,7 @@ int xpt_path_comp(struct cam_path *path1, struct cam_path *path2) { + GIANT_REQUIRED; int retval = 0; @@ -4261,6 +4233,7 @@ void xpt_print_path(struct cam_path *path) { + GIANT_REQUIRED; if (path == NULL) printf("(nopath): "); @@ -4295,6 +4268,8 @@ { struct sbuf sb; + GIANT_REQUIRED; + sbuf_new(&sb, str, str_len, 0); if (path == NULL) @@ -4331,6 +4306,7 @@ path_id_t xpt_path_path_id(struct cam_path *path) { + GIANT_REQUIRED; return(path->bus->path_id); } @@ -4338,6 +4314,7 @@ target_id_t xpt_path_target_id(struct cam_path *path) { + GIANT_REQUIRED; if (path->target != NULL) return (path->target->target_id); @@ -4348,6 +4325,7 @@ lun_id_t xpt_path_lun_id(struct cam_path *path) { + GIANT_REQUIRED; if (path->device != NULL) return (path->device->lun_id); @@ -4358,6 +4336,7 @@ struct cam_sim * xpt_path_sim(struct cam_path *path) { + GIANT_REQUIRED; return (path->bus->sim); } @@ -4365,6 +4344,7 @@ struct cam_periph* xpt_path_periph(struct cam_path *path) { + GIANT_REQUIRED; return (path->periph); } @@ -4541,9 +4521,7 @@ } /* Release the reference count held while registered. */ - mtx_lock(&cam_topo_lock); xpt_release_bus(bus_path.bus); - mtx_unlock(&cam_topo_lock); xpt_release_path(&bus_path); /* Recheck for more completed CCBs. */ @@ -4627,9 +4605,8 @@ } void -xpt_async(u_int32_t async_code, struct cam_path *opath, void *async_arg) +xpt_async(u_int32_t async_code, struct cam_path *path, void *async_arg) { - struct cam_path *path; struct cam_eb *bus; struct cam_et *target, *next_target; struct cam_ed *device, *next_device; @@ -4640,13 +4617,6 @@ CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_async\n")); /* - * The caller owns the path object that was passed in. Clone - * it so that we don't risk having it disappear on us. - */ - if (xpt_clone_path(opath, &path) != CAM_REQ_CMP) - return; - - /* * Most async events come from a CAM interrupt context. In * a few cases, the error recovery code at the peripheral layer, * which may run from our SWI or a process context, may signal @@ -4713,7 +4683,6 @@ xpt_async_bcast(&xpt_periph->path->device->asyncs, async_code, path, async_arg); splx(s); - xpt_free_path(path); } static void @@ -4945,7 +4914,6 @@ sim->c_handle); sim->flags &= ~CAM_SIM_REL_TIMEOUT_PENDING; } - mtx_lock(&cam_topo_lock); bus = xpt_find_bus(sim->path_id); splx(s); @@ -4953,12 +4921,9 @@ /* * Now that we are unfrozen run the send queue. */ - mtx_unlock(&cam_topo_lock); xpt_run_dev_sendq(bus); - mtx_lock(&cam_topo_lock); } xpt_release_bus(bus); - mtx_unlock(&cam_topo_lock); } else splx(s); } else @@ -5009,6 +4974,8 @@ { union ccb *new_ccb; + GIANT_REQUIRED; + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK); return (new_ccb); } @@ -5018,6 +4985,8 @@ { union ccb *new_ccb; + GIANT_REQUIRED; + new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_NOWAIT); return (new_ccb); } @@ -5066,14 +5035,17 @@ static void xpt_release_bus(struct cam_eb *bus) { + int s; - mtx_assert(&cam_topo_lock, MA_OWNED); + s = splcam(); if ((--bus->refcount == 0) && (TAILQ_FIRST(&bus->et_entries) == NULL)) { TAILQ_REMOVE(&xpt_busses, bus, links); bus_generation++; + splx(s); free(bus, M_CAMXPT); - } + } else + splx(s); } static struct cam_et * @@ -5081,7 +5053,6 @@ { struct cam_et *target; - mtx_assert(&cam_topo_lock, MA_OWNED); target = (struct cam_et *)malloc(sizeof(*target), M_CAMXPT, M_NOWAIT); if (target != NULL) { struct cam_et *cur_target; @@ -5116,15 +5087,18 @@ static void xpt_release_target(struct cam_eb *bus, struct cam_et *target) { + int s; - mtx_assert(&cam_topo_lock, MA_OWNED); + s = splcam(); if ((--target->refcount == 0) && (TAILQ_FIRST(&target->ed_entries) == NULL)) { TAILQ_REMOVE(&bus->et_entries, target, links); bus->generation++; + splx(s); free(target, M_CAMXPT); xpt_release_bus(bus); - } + } else + splx(s); } static struct cam_ed * @@ -5137,7 +5111,6 @@ struct cam_devq *devq; cam_status status; - mtx_assert(&cam_topo_lock, MA_OWNED); if (SIM_DEAD(bus->sim)) return (NULL); @@ -5233,8 +5206,9 @@ xpt_release_device(struct cam_eb *bus, struct cam_et *target, struct cam_ed *device) { + int s; - mtx_assert(&cam_topo_lock, MA_OWNED); + s = splcam(); if ((--device->refcount == 0) && ((device->flags & CAM_DEV_UNCONFIGURED) != 0)) { struct cam_devq *devq; @@ -5255,11 +5229,13 @@ devq = bus->sim->devq; cam_devq_resize(devq, devq->alloc_queue.array_size - 1); } + splx(s); camq_fini(&device->drvq); camq_fini(&device->ccbq.queue); free(device, M_CAMXPT); xpt_release_target(bus, target); - } + } else + splx(s); } static u_int32_t @@ -5292,7 +5268,6 @@ { struct cam_eb *bus; - mtx_assert(&cam_topo_lock, MA_OWNED); for (bus = TAILQ_FIRST(&xpt_busses); bus != NULL; bus = TAILQ_NEXT(bus, links)) { @@ -5309,7 +5284,6 @@ { struct cam_et *target; - mtx_assert(&cam_topo_lock, MA_OWNED); for (target = TAILQ_FIRST(&bus->et_entries); target != NULL; target = TAILQ_NEXT(target, links)) { @@ -5326,7 +5300,6 @@ { struct cam_ed *device; - mtx_assert(&cam_topo_lock, MA_OWNED); for (device = TAILQ_FIRST(&target->ed_entries); device != NULL; device = TAILQ_NEXT(device, links)) { @@ -7016,12 +6989,10 @@ /* * Scan all installed busses. */ - mtx_lock(&cam_topo_lock); xpt_for_all_busses(xptconfigbuscountfunc, NULL); if (busses_to_config == 0) { /* Call manually because we don't have any busses */ - mtx_unlock(&cam_topo_lock); xpt_finishconfig(xpt_periph, NULL); } else { if (busses_to_reset > 0 && scsi_delay >= 2000) { @@ -7029,7 +7000,6 @@ "devices to settle\n", scsi_delay/1000); } xpt_for_all_busses(xptconfigfunc, NULL); - mtx_unlock(&cam_topo_lock); } } @@ -7095,9 +7065,7 @@ * attached. For any devices like that, announce the * passthrough driver so the user will see something. */ - mtx_lock(&cam_topo_lock); xpt_for_all_devices(xptpassannouncefunc, NULL); - mtx_unlock(&cam_topo_lock); /* Release our hook so that the boot can continue. */ config_intrhook_disestablish(xpt_config_hook); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#7 (text+ko) ==== @@ -37,9 +37,6 @@ /* Functions accessed by the peripheral drivers */ #ifdef _KERNEL - -extern struct mtx cam_topo_lock; - void xpt_polled_action(union ccb *ccb); union ccb *xpt_alloc_ccb(void); union ccb *xpt_alloc_ccb_nowait(void); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#4 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#6 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.h#2 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#5 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.h#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#8 (text+ko) ==== @@ -44,9 +44,6 @@ #include #include #include -#include -#include -#include #include @@ -516,13 +513,6 @@ static SLIST_HEAD(,da_softc) softc_list; -static struct proc *da_proc; -static struct mtx da_workmtx; -static int da_workflags; -static TAILQ_HEAD(, cam_periph_workitem) da_worklist; - -#define DA_FLAG_EXIT 0x1 - static int daopen(struct disk *dp) { @@ -815,64 +805,13 @@ } static void -dawork(void *dummy) -{ - struct cam_periph_workitem *work; - - mtx_lock(&da_workmtx); - while ((da_workflags & DA_FLAG_EXIT) == 0) { - if ((work = TAILQ_FIRST(&da_worklist)) == NULL) { - msleep(&da_worklist, &da_workmtx, PRIBIO, "dawork", 0); - continue; - } - TAILQ_REMOVE(&da_worklist, work, work_link); - mtx_unlock(&da_workmtx); - - switch(work->command) { - case WORK_EXECUTE_CCB: - mtx_lock(&Giant); - xpt_action((union ccb *)work->data1); - mtx_unlock(&Giant); - break; - case WORK_XPT_SCHED: - mtx_lock(&Giant); - xpt_schedule((struct cam_periph *)work->data1, - (uint32_t)(uintptr_t)(work->data2)); - mtx_unlock(&Giant); - break; -#if 0 - case WORK_PERIPH_SCHED: - mtx_lock(&Giant); - daschedule((struct cam_periph *)work-data1); - mtx_unlock(&Giant); - break; -#endif - default: - panic("Unknown CAM work item %d\n", work->command); - } - - if (work->cbfcnp != NULL) - work->cbfcnp(work->cbdata); - mtx_unlock(&da_workmtx); - } - mtx_unlock(&da_workmtx); - - kthread_exit(0); -} - -static void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 30 17:06:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B10B16A416; Sun, 30 Apr 2006 17:06:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8269316A415 for ; Sun, 30 Apr 2006 17:06:43 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C92E43D70 for ; Sun, 30 Apr 2006 17:06:37 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3UH6bmk043717 for ; Sun, 30 Apr 2006 17:06:37 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3UH6aTd043714 for perforce@freebsd.org; Sun, 30 Apr 2006 17:06:36 GMT (envelope-from scottl@freebsd.org) Date: Sun, 30 Apr 2006 17:06:36 GMT Message-Id: <200604301706.k3UH6aTd043714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 96417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 17:06:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=96417 Change 96417 by scottl@scottl-junior on 2006/04/30 17:05:53 Take a stab at fixing the problems with crashdumps. xpt_done assumes that it is always safe to call swi_sched, even when in a panic state where the scheduler is in an unknown state. swi_sched should be fixed to not blow up the scheduler in this scenario, but we also need to make CAM more deterministic. So when a periph goes into poll driving more, mark a flag so that xpt_done knows not to bother with swi_sched. It would be better to set this flag on a per-CCB basis, but there are no more bits available in the ccb flags field. That will be fixed later as part of the camlock work. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#6 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#21 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#9 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#6 (text+ko) ==== @@ -113,6 +113,7 @@ #define CAM_PERIPH_INVALID 0x08 #define CAM_PERIPH_NEW_DEV_FOUND 0x10 #define CAM_PERIPH_RECOVERY_INPROG 0x20 +#define CAM_PERIPH_POLLED 0x40 u_int32_t immediate_priority; u_int32_t refcount; SLIST_HEAD(, ccb_hdr) ccb_list; /* For "immediate" requests */ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#21 (text+ko) ==== @@ -4959,7 +4959,9 @@ sim_links.tqe); done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; mtx_unlock(&cam_bioq_lock); - swi_sched(cambio_ih, 0); + if ((done_ccb->ccb_h.path->periph->flags & + CAM_PERIPH_POLLED) == 0) + swi_sched(cambio_ih, 0); break; default: panic("unknown periph type %d", ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#9 (text+ko) ==== @@ -734,6 +734,7 @@ return (ENXIO); if (length > 0) { + periph->flags |= CAM_PERIPH_POLLED; xpt_setup_ccb(&csio.ccb_h, periph->path, /*priority*/1); csio.ccb_h.ccb_state = DA_CCB_DUMP; scsi_read_write(&csio, @@ -759,10 +760,11 @@ else printf("status == 0x%x, scsi status == 0x%x\n", csio.ccb_h.status, csio.scsi_status); + periph->flags |= CAM_PERIPH_POLLED; return(EIO); } return(0); - } + } /* * Sync the disk cache contents to the physical media. @@ -801,6 +803,7 @@ } } } + periph->flags &= ~CAM_PERIPH_POLLED; return (0); } From owner-p4-projects@FreeBSD.ORG Sun Apr 30 17:07:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A7C516A410; Sun, 30 Apr 2006 17:07:40 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 579CA16A40B for ; Sun, 30 Apr 2006 17:07:40 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 021FA43D72 for ; Sun, 30 Apr 2006 17:07:39 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3UH7cT8043749 for ; Sun, 30 Apr 2006 17:07:38 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3UH7c5C043746 for perforce@freebsd.org; Sun, 30 Apr 2006 17:07:38 GMT (envelope-from scottl@freebsd.org) Date: Sun, 30 Apr 2006 17:07:38 GMT Message-Id: <200604301707.k3UH7c5C043746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 96418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2006 17:07:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=96418 Change 96418 by scottl@scottl-junior on 2006/04/30 17:06:56 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/os_bsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/advansys/advansys.c,v 1.29 2005/05/29 04:42:16 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/advansys/advansys.c,v 1.30 2006/04/30 16:44:41 scottl Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#5 (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/dev/hptmv/osbsd.h,v 1.5 2005/09/07 23:33:26 scottl Exp $ + * $FreeBSD: src/sys/dev/hptmv/osbsd.h,v 1.6 2006/04/30 16:44:41 scottl Exp $ */ #ifndef _OSBSD_H_ #define _OSBSD_H_ ==== //depot/projects/scottl-camlock/src/sys/dev/rr232x/os_bsd.h#2 (text) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/rr232x/os_bsd.h,v 1.1 2006/04/27 20:22:45 scottl Exp $ + * $FreeBSD: src/sys/dev/rr232x/os_bsd.h,v 1.2 2006/04/30 16:44:41 scottl Exp $ */ #ifndef _OS_BSD_H @@ -82,7 +82,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.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/dev/twa/tw_osl_cam.c,v 1.5 2005/11/08 22:51:43 vkashyap Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_cam.c,v 1.6 2006/04/30 16:46:11 scottl Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Mon May 1 00:47:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D9CE16A405; Mon, 1 May 2006 00:47:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 342AC16A400 for ; Mon, 1 May 2006 00:47:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5DB643D48 for ; Mon, 1 May 2006 00:47:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k410lYao020394 for ; Mon, 1 May 2006 00:47:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k410lYuJ020391 for perforce@freebsd.org; Mon, 1 May 2006 00:47:34 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 00:47:34 GMT Message-Id: <200605010047.k410lYuJ020391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 00:47:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=96455 Change 96455 by jb@jb_freebsd2 on 2006/05/01 00:46:33 Add fields to 'struct sysent' to support DTrace's syscall provider (implemented in the systrace module). Add build code to generate a new file called 'systrace_args.c' which is included by the systrace device driver. DTrace uses 64-bit registers so the FreeBSD syscall parameters need to be converted to that size. This differs from Solaris because Solaris has one group of 64-bit syscalls and another for 32-bit syscalls. On FreeBSD 32-bit architectures, some syscall arguments are actually 64-bits, like off_t, for example. The generated function is intended to convert from the FreeBSD syscall argument structures to a 64-bit array, doing sign-extension where required. In the case of syscalls registered by loaded modules, if the module wants to support DTracing it's arguments, then it has to provide a function to convert the arguments to the DTrace array. Without that function, the loaded syscall can be traced, but it is assumed by DTrace to have no available arguments. The module uses the 'sy_systrace_args_func' in 'struct sysent' to register the conversion function. On Solaris, Sun went to the trouble not to change the size of 'struct sysent' so that they would retain binary compatibility. On FreeBSD, 'struct sysent' was changed for 6.0. If people think it is a big issue changing it again for 7.0, I'll have to revisit this. For the time being it's neat this way. 8-) Affected files ... .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#2 edit .. //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#2 edit .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#1 add .. //depot/projects/dtrace/src/sys/sys/sysent.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/init_sysent.c#2 (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.211 2006/03/23 08:48:37 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp */ #include "opt_compat.h" @@ -29,470 +29,470 @@ /* The casts are bogus but will do for now. */ struct sysent sysent[] = { - { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4 }, /* 7 = wait4 */ - { compat(SYF_MPSAFE | AS(ocreat_args),creat), AUE_O_CREAT }, /* 8 = old creat */ - { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ - { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = obsolete execv */ - { SYF_MPSAFE | AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR }, /* 12 = chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD }, /* 14 = mknod */ - { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ - { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ - { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ - { compat4(SYF_MPSAFE | AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT }, /* 18 = old getfsstat */ - { compat(SYF_MPSAFE | AS(olseek_args),lseek), AUE_LSEEK }, /* 19 = old lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ - { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ - { SYF_MPSAFE | AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG }, /* 27 = recvmsg */ - { SYF_MPSAFE | AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG }, /* 28 = sendmsg */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM }, /* 29 = recvfrom */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT }, /* 30 = accept */ - { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME }, /* 31 = getpeername */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME }, /* 32 = getsockname */ - { SYF_MPSAFE | AS(access_args), (sy_call_t *)access, AUE_ACCESS }, /* 33 = access */ - { SYF_MPSAFE | AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS }, /* 34 = chflags */ - { SYF_MPSAFE | AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS }, /* 35 = fchflags */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill, AUE_KILL }, /* 37 = kill */ - { compat(SYF_MPSAFE | AS(ostat_args),stat), AUE_STAT }, /* 38 = old stat */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 39 = getppid */ - { compat(SYF_MPSAFE | AS(olstat_args),lstat), AUE_LSTAT }, /* 40 = old lstat */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 43 = getegid */ - { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ - { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE }, /* 45 = ktrace */ - { compat(SYF_MPSAFE | AS(osigaction_args),sigaction), AUE_SIGACTION }, /* 46 = old sigaction */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ - { compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK }, /* 48 = old sigprocmask */ - { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN }, /* 49 = getlogin */ - { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN }, /* 50 = setlogin */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { compat(SYF_MPSAFE | 0,sigpending), AUE_SIGPENDING }, /* 52 = old sigpending */ - { SYF_MPSAFE | AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGPENDING }, /* 53 = sigaltstack */ - { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL }, /* 54 = ioctl */ - { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT }, /* 55 = reboot */ - { SYF_MPSAFE | AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE }, /* 56 = revoke */ - { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK }, /* 57 = symlink */ - { SYF_MPSAFE | AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK }, /* 58 = readlink */ - { SYF_MPSAFE | AS(execve_args), (sy_call_t *)execve, AUE_EXECVE }, /* 59 = execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { compat(SYF_MPSAFE | AS(ofstat_args),fstat), AUE_FSTAT }, /* 62 = old fstat */ - { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo), AUE_NULL }, /* 63 = old getkerninfo */ - { compat(SYF_MPSAFE | 0,getpagesize), AUE_O_GETPAGESIZE }, /* 64 = old getpagesize */ - { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 65 = msync */ - { SYF_MPSAFE | 0, (sy_call_t *)vfork, AUE_VFORK }, /* 66 = vfork */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 67 = obsolete vread */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 68 = obsolete vwrite */ - { SYF_MPSAFE | AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK }, /* 69 = sbrk */ - { SYF_MPSAFE | AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK }, /* 70 = sstk */ - { compat(SYF_MPSAFE | AS(ommap_args),mmap), AUE_MMAP }, /* 71 = old mmap */ - { SYF_MPSAFE | AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE }, /* 72 = vadvise */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 73 = munmap */ - { SYF_MPSAFE | AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 74 = mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete vlimit */ - { SYF_MPSAFE | AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE }, /* 78 = mincore */ - { SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS }, /* 79 = getgroups */ - { SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS }, /* 80 = setgroups */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ - { SYF_MPSAFE | AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER }, /* 83 = setitimer */ - { compat(SYF_MPSAFE | 0,wait), AUE_WAIT4 }, /* 84 = old wait */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 85 = swapon */ - { SYF_MPSAFE | AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER }, /* 86 = getitimer */ - { compat(SYF_MPSAFE | AS(gethostname_args),gethostname), AUE_SYSCTL }, /* 87 = old gethostname */ - { compat(SYF_MPSAFE | AS(sethostname_args),sethostname), AUE_SYSCTL }, /* 88 = old sethostname */ - { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 91 = getdopt */ - { SYF_MPSAFE | AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL }, /* 92 = fcntl */ - { SYF_MPSAFE | AS(select_args), (sy_call_t *)select, AUE_SELECT }, /* 93 = select */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = setdopt */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ - { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ - { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ - { compat(SYF_MPSAFE | AS(accept_args),accept), AUE_ACCEPT }, /* 99 = old accept */ - { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ - { compat(SYF_MPSAFE | AS(osend_args),send), AUE_SEND }, /* 101 = old send */ - { compat(SYF_MPSAFE | AS(orecv_args),recv), AUE_RECV }, /* 102 = old recv */ - { compat(SYF_MPSAFE | AS(osigreturn_args),sigreturn), AUE_SIGRETURN }, /* 103 = old sigreturn */ - { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ - { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ - { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ - { compat(SYF_MPSAFE | AS(osigvec_args),sigvec), AUE_NULL }, /* 108 = old sigvec */ - { compat(SYF_MPSAFE | AS(osigblock_args),sigblock), AUE_NULL }, /* 109 = old sigblock */ - { compat(SYF_MPSAFE | AS(osigsetmask_args),sigsetmask), AUE_NULL }, /* 110 = old sigsetmask */ - { compat(SYF_MPSAFE | AS(osigsuspend_args),sigsuspend), AUE_NULL }, /* 111 = old sigsuspend */ - { compat(SYF_MPSAFE | AS(osigstack_args),sigstack), AUE_NULL }, /* 112 = old sigstack */ - { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg), AUE_RECVMSG }, /* 113 = old recvmsg */ - { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg), AUE_SENDMSG }, /* 114 = old sendmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ - { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = gettimeofday */ - { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 117 = getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = resuba */ - { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ - { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ - { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 122 = settimeofday */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { compat(SYF_MPSAFE | AS(recvfrom_args),recvfrom), AUE_RECVFROM }, /* 125 = old recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ - { SYF_MPSAFE | AS(rename_args), (sy_call_t *)rename, AUE_RENAME }, /* 128 = rename */ - { compat(SYF_MPSAFE | AS(otruncate_args),truncate), AUE_TRUNCATE }, /* 129 = old truncate */ - { compat(SYF_MPSAFE | AS(oftruncate_args),ftruncate), AUE_FTRUNCATE }, /* 130 = old ftruncate */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ - { SYF_MPSAFE | AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO }, /* 132 = mkfifo */ - { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ - { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ - { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ - { SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME }, /* 140 = adjtime */ - { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername), AUE_GETPEERNAME }, /* 141 = old getpeername */ - { compat(SYF_MPSAFE | 0,gethostid), AUE_SYSCTL }, /* 142 = old gethostid */ - { compat(SYF_MPSAFE | AS(osethostid_args),sethostid), AUE_SYSCTL }, /* 143 = old sethostid */ - { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT }, /* 144 = old getrlimit */ - { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT }, /* 145 = old setrlimit */ - { compat(SYF_MPSAFE | AS(okillpg_args),killpg), AUE_KILLPG }, /* 146 = old killpg */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ - { SYF_MPSAFE | AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL }, /* 148 = quotactl */ - { compat(SYF_MPSAFE | 0,quota), AUE_O_QUOTA }, /* 149 = old quota */ - { compat(SYF_MPSAFE | AS(getsockname_args),getsockname), AUE_GETSOCKNAME }, /* 150 = old getsockname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ - { SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ - { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES }, /* 156 = old getdirentries */ - { compat4(SYF_MPSAFE | AS(freebsd4_statfs_args),statfs), AUE_STATFS }, /* 157 = old statfs */ - { compat4(SYF_MPSAFE | AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS }, /* 158 = old fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ - { SYF_MPSAFE | AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH }, /* 160 = lgetfh */ - { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH }, /* 161 = getfh */ - { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL }, /* 162 = getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 163 = setdomainname */ - { SYF_MPSAFE | AS(uname_args), (sy_call_t *)uname, AUE_NULL }, /* 164 = uname */ - { SYF_MPSAFE | AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL }, /* 165 = sysarch */ - { SYF_MPSAFE | AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL }, /* 166 = rtprio */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = nosys */ - { SYF_MPSAFE | AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 169 = semsys */ - { SYF_MPSAFE | AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 170 = msgsys */ - { SYF_MPSAFE | AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 171 = shmsys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 172 = nosys */ - { SYF_MPSAFE | AS(pread_args), (sy_call_t *)pread, AUE_PREAD }, /* 173 = pread */ - { SYF_MPSAFE | AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE }, /* 174 = pwrite */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 175 = nosys */ - { SYF_MPSAFE | AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_ADJTIME }, /* 176 = ntp_adjtime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 177 = sfork */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 178 = getdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 179 = setdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 180 = nosys */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 181 = setgid */ - { SYF_MPSAFE | AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID }, /* 182 = setegid */ - { SYF_MPSAFE | AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID }, /* 183 = seteuid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 184 = lfs_bmapv */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 185 = lfs_markv */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 186 = lfs_segclean */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 187 = lfs_segwait */ - { SYF_MPSAFE | AS(stat_args), (sy_call_t *)stat, AUE_STAT }, /* 188 = stat */ - { SYF_MPSAFE | AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT }, /* 189 = fstat */ - { SYF_MPSAFE | AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT }, /* 190 = lstat */ - { SYF_MPSAFE | AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF }, /* 191 = pathconf */ - { SYF_MPSAFE | AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF }, /* 192 = fpathconf */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 193 = nosys */ - { SYF_MPSAFE | AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT }, /* 194 = getrlimit */ - { SYF_MPSAFE | AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT }, /* 195 = setrlimit */ - { SYF_MPSAFE | AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES }, /* 196 = getdirentries */ - { SYF_MPSAFE | AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP }, /* 197 = mmap */ - { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = __syscall */ - { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK }, /* 199 = lseek */ - { SYF_MPSAFE | AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE }, /* 200 = truncate */ - { SYF_MPSAFE | AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE }, /* 201 = ftruncate */ - { SYF_MPSAFE | AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL }, /* 202 = __sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 203 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 204 = munlock */ - { SYF_MPSAFE | AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE }, /* 205 = undelete */ - { SYF_MPSAFE | AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES }, /* 206 = futimes */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 207 = getpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 208 = newreboot */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 209 = poll */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 210 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 211 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 212 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 213 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 214 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 215 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 216 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 217 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 218 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 219 = lkmnosys */ - { SYF_MPSAFE | AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 220 = __semctl */ - { SYF_MPSAFE | AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 221 = semget */ - { SYF_MPSAFE | AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 222 = semop */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = semconfig */ - { SYF_MPSAFE | AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 224 = msgctl */ - { SYF_MPSAFE | AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 225 = msgget */ - { SYF_MPSAFE | AS(msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 226 = msgsnd */ - { SYF_MPSAFE | AS(msgrcv_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 227 = msgrcv */ - { SYF_MPSAFE | AS(shmat_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 228 = shmat */ - { SYF_MPSAFE | AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 229 = shmctl */ - { SYF_MPSAFE | AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 230 = shmdt */ - { SYF_MPSAFE | AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 231 = shmget */ - { SYF_MPSAFE | AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL }, /* 232 = clock_gettime */ - { SYF_MPSAFE | AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_NULL }, /* 233 = clock_settime */ - { SYF_MPSAFE | AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL }, /* 234 = clock_getres */ - { SYF_MPSAFE | AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL }, /* 235 = ktimer_create */ - { SYF_MPSAFE | AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL }, /* 236 = ktimer_delete */ - { SYF_MPSAFE | AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL }, /* 237 = ktimer_settime */ - { SYF_MPSAFE | AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL }, /* 238 = ktimer_gettime */ - { SYF_MPSAFE | AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL }, /* 239 = ktimer_getoverrun */ - { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 240 = nanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 241 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 243 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 244 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 245 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 246 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = nosys */ - { SYF_MPSAFE | AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL }, /* 248 = ntp_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = nosys */ - { SYF_MPSAFE | AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT }, /* 250 = minherit */ - { SYF_MPSAFE | AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK }, /* 251 = rfork */ - { SYF_MPSAFE | AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL }, /* 252 = openbsd_poll */ - { SYF_MPSAFE | 0, (sy_call_t *)issetugid, AUE_ISSETUGID }, /* 253 = issetugid */ - { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 254 = lchown */ - { SYF_MPSAFE | AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 255 = aio_read */ - { SYF_MPSAFE | AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 256 = aio_write */ - { SYF_MPSAFE | AS(lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 257 = lio_listio */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 258 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 259 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 260 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 261 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 262 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 263 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 264 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = nosys */ - { SYF_MPSAFE | AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS }, /* 272 = getdents */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = nosys */ - { SYF_MPSAFE | AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD }, /* 274 = lchmod */ - { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 275 = netbsd_lchown */ - { SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES }, /* 276 = lutimes */ - { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 277 = netbsd_msync */ - { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_STAT }, /* 278 = nstat */ - { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT }, /* 279 = nfstat */ - { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT }, /* 280 = nlstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = nosys */ - { SYF_MPSAFE | AS(preadv_args), (sy_call_t *)preadv, AUE_NULL }, /* 289 = preadv */ - { SYF_MPSAFE | AS(pwritev_args), (sy_call_t *)pwritev, AUE_NULL }, /* 290 = pwritev */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = nosys */ - { compat4(SYF_MPSAFE | AS(freebsd4_fhstatfs_args),fhstatfs), AUE_FHSTATFS }, /* 297 = old fhstatfs */ - { SYF_MPSAFE | AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN }, /* 298 = fhopen */ - { SYF_MPSAFE | AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT }, /* 299 = fhstat */ - { SYF_MPSAFE | AS(modnext_args), (sy_call_t *)modnext, AUE_NULL }, /* 300 = modnext */ - { SYF_MPSAFE | AS(modstat_args), (sy_call_t *)modstat, AUE_NULL }, /* 301 = modstat */ - { SYF_MPSAFE | AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL }, /* 302 = modfnext */ - { SYF_MPSAFE | AS(modfind_args), (sy_call_t *)modfind, AUE_NULL }, /* 303 = modfind */ - { SYF_MPSAFE | AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD }, /* 304 = kldload */ - { SYF_MPSAFE | AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD }, /* 305 = kldunload */ - { SYF_MPSAFE | AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL }, /* 306 = kldfind */ - { SYF_MPSAFE | AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL }, /* 307 = kldnext */ - { SYF_MPSAFE | AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL }, /* 308 = kldstat */ - { SYF_MPSAFE | AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL }, /* 309 = kldfirstmod */ - { SYF_MPSAFE | AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID }, /* 310 = getsid */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 311 = setresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 312 = setresgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 313 = obsolete signanosleep */ - { SYF_MPSAFE | AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 314 = aio_return */ - { SYF_MPSAFE | AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 315 = aio_suspend */ - { SYF_MPSAFE | AS(aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 316 = aio_cancel */ - { SYF_MPSAFE | AS(aio_error_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 317 = aio_error */ - { SYF_MPSAFE | AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 318 = oaio_read */ - { SYF_MPSAFE | AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 319 = oaio_write */ - { SYF_MPSAFE | AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 320 = olio_listio */ - { SYF_MPSAFE | 0, (sy_call_t *)yield, AUE_NULL }, /* 321 = yield */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 322 = obsolete thr_sleep */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 323 = obsolete thr_wakeup */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 324 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 325 = munlockall */ - { SYF_MPSAFE | AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_NULL }, /* 326 = __getcwd */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 327 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 328 = sched_getparam */ - { SYF_MPSAFE | AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL }, /* 329 = sched_setscheduler */ - { SYF_MPSAFE | AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL }, /* 330 = sched_getscheduler */ - { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 331 = sched_yield */ - { SYF_MPSAFE | AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL }, /* 332 = sched_get_priority_max */ - { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL }, /* 333 = sched_get_priority_min */ - { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 334 = sched_rr_get_interval */ - { SYF_MPSAFE | AS(utrace_args), (sy_call_t *)utrace, AUE_NULL }, /* 335 = utrace */ - { compat4(SYF_MPSAFE | AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE }, /* 336 = old sendfile */ - { SYF_MPSAFE | AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL }, /* 337 = kldsym */ - { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail, AUE_JAIL }, /* 338 = jail */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 339 = pioctl */ - { SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK }, /* 340 = sigprocmask */ - { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND }, /* 341 = sigsuspend */ - { compat4(SYF_MPSAFE | AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION }, /* 342 = old sigaction */ - { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING }, /* 343 = sigpending */ - { compat4(SYF_MPSAFE | AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN }, /* 344 = old sigreturn */ - { SYF_MPSAFE | AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT }, /* 345 = sigtimedwait */ - { SYF_MPSAFE | AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL }, /* 346 = sigwaitinfo */ - { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL }, /* 347 = __acl_get_file */ - { SYF_MPSAFE | AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL }, /* 348 = __acl_set_file */ - { SYF_MPSAFE | AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL }, /* 349 = __acl_get_fd */ - { SYF_MPSAFE | AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL }, /* 350 = __acl_set_fd */ - { SYF_MPSAFE | AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL }, /* 351 = __acl_delete_file */ - { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ - { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ - { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ - { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ - { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ - { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ - { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ - { SYF_MPSAFE | AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 359 = aio_waitcomplete */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 360 = getresuid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 361 = getresgid */ - { SYF_MPSAFE | 0, (sy_call_t *)kqueue, AUE_NULL }, /* 362 = kqueue */ - { SYF_MPSAFE | AS(kevent_args), (sy_call_t *)kevent, AUE_NULL }, /* 363 = kevent */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 364 = __cap_get_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 365 = __cap_set_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 366 = __cap_get_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 367 = __cap_get_file */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ - { AS(nosys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 370 = lkmressys */ - { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ - { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ - { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ - { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ - { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ - { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS }, /* 376 = eaccess */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT }, /* 378 = nmount */ - { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ - { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ - { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ - { SYF_MPSAFE | AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt, AUE_NULL }, /* 382 = kse_thr_interrupt */ - { SYF_MPSAFE | AS(kse_release_args), (sy_call_t *)kse_release, AUE_NULL }, /* 383 = kse_release */ - { SYF_MPSAFE | AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL }, /* 384 = __mac_get_proc */ - { SYF_MPSAFE | AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL }, /* 385 = __mac_set_proc */ - { SYF_MPSAFE | AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL }, /* 386 = __mac_get_fd */ - { SYF_MPSAFE | AS(__mac_get_file_args), (sy_call_t *)__mac_get_file, AUE_NULL }, /* 387 = __mac_get_file */ - { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL }, /* 388 = __mac_set_fd */ - { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file, AUE_NULL }, /* 389 = __mac_set_file */ - { SYF_MPSAFE | AS(kenv_args), (sy_call_t *)kenv, AUE_NULL }, /* 390 = kenv */ - { SYF_MPSAFE | AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS }, /* 391 = lchflags */ - { SYF_MPSAFE | AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL }, /* 392 = uuidgen */ - { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE }, /* 393 = sendfile */ - { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL }, /* 394 = mac_syscall */ - { SYF_MPSAFE | AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT }, /* 395 = getfsstat */ - { SYF_MPSAFE | AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS }, /* 396 = statfs */ - { SYF_MPSAFE | AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS }, /* 397 = fstatfs */ - { SYF_MPSAFE | AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL }, /* 398 = fhstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 399 = nosys */ - { SYF_MPSAFE | AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 400 = ksem_close */ - { SYF_MPSAFE | AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 401 = ksem_post */ - { SYF_MPSAFE | AS(ksem_wait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 402 = ksem_wait */ - { SYF_MPSAFE | AS(ksem_trywait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 403 = ksem_trywait */ - { SYF_MPSAFE | AS(ksem_init_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 404 = ksem_init */ - { SYF_MPSAFE | AS(ksem_open_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 405 = ksem_open */ - { SYF_MPSAFE | AS(ksem_unlink_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 406 = ksem_unlink */ - { SYF_MPSAFE | AS(ksem_getvalue_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 407 = ksem_getvalue */ - { SYF_MPSAFE | AS(ksem_destroy_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 408 = ksem_destroy */ - { SYF_MPSAFE | AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid, AUE_NULL }, /* 409 = __mac_get_pid */ - { SYF_MPSAFE | AS(__mac_get_link_args), (sy_call_t *)__mac_get_link, AUE_NULL }, /* 410 = __mac_get_link */ - { SYF_MPSAFE | AS(__mac_set_link_args), (sy_call_t *)__mac_set_link, AUE_NULL }, /* 411 = __mac_set_link */ - { SYF_MPSAFE | AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_NULL }, /* 412 = extattr_set_link */ - { SYF_MPSAFE | AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_NULL }, /* 413 = extattr_get_link */ - { SYF_MPSAFE | AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_NULL }, /* 414 = extattr_delete_link */ - { SYF_MPSAFE | AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL }, /* 415 = __mac_execve */ - { SYF_MPSAFE | AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION }, /* 416 = sigaction */ - { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN }, /* 417 = sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 418 = __xstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 419 = __xfstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 420 = __xlstat */ - { SYF_MPSAFE | AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL }, /* 421 = getcontext */ - { SYF_MPSAFE | AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL }, /* 422 = setcontext */ - { SYF_MPSAFE | AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL }, /* 423 = swapcontext */ - { SYF_MPSAFE | AS(swapoff_args), (sy_call_t *)swapoff, AUE_SWAPOFF }, /* 424 = swapoff */ - { SYF_MPSAFE | AS(__acl_get_link_args), (sy_call_t *)__acl_get_link, AUE_NULL }, /* 425 = __acl_get_link */ - { SYF_MPSAFE | AS(__acl_set_link_args), (sy_call_t *)__acl_set_link, AUE_NULL }, /* 426 = __acl_set_link */ - { SYF_MPSAFE | AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link, AUE_NULL }, /* 427 = __acl_delete_link */ - { SYF_MPSAFE | AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link, AUE_NULL }, /* 428 = __acl_aclcheck_link */ - { SYF_MPSAFE | AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT }, /* 429 = sigwait */ - { SYF_MPSAFE | AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL }, /* 430 = thr_create */ - { SYF_MPSAFE | AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL }, /* 431 = thr_exit */ - { SYF_MPSAFE | AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL }, /* 432 = thr_self */ - { SYF_MPSAFE | AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL }, /* 433 = thr_kill */ - { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL }, /* 434 = _umtx_lock */ - { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL }, /* 435 = _umtx_unlock */ - { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL }, /* 436 = jail_attach */ - { SYF_MPSAFE | AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_NULL }, /* 437 = extattr_list_fd */ - { SYF_MPSAFE | AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_NULL }, /* 438 = extattr_list_file */ - { SYF_MPSAFE | AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_NULL }, /* 439 = extattr_list_link */ - { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin, AUE_NULL }, /* 440 = kse_switchin */ - { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 441 = ksem_timedwait */ - { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL }, /* 442 = thr_suspend */ - { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL }, /* 443 = thr_wake */ - { SYF_MPSAFE | AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_NULL }, /* 444 = kldunloadf */ - { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit, AUE_AUDIT }, /* 445 = audit */ - { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON }, /* 446 = auditon */ - { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID }, /* 447 = getauid */ - { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID }, /* 448 = setauid */ - { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT }, /* 449 = getaudit */ - { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT }, /* 450 = setaudit */ - { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR }, /* 451 = getaudit_addr */ - { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR }, /* 452 = setaudit_addr */ - { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl, AUE_AUDITCTL }, /* 453 = auditctl */ - { SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL }, /* 454 = _umtx_op */ - { SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL }, /* 455 = thr_new */ - { SYF_MPSAFE | AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL }, /* 456 = sigqueue */ - { SYF_MPSAFE | AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 457 = kmq_open */ - { SYF_MPSAFE | AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 458 = kmq_setattr */ - { SYF_MPSAFE | AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 459 = kmq_timedreceive */ - { SYF_MPSAFE | AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 460 = kmq_timedsend */ - { SYF_MPSAFE | AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 461 = kmq_notify */ - { SYF_MPSAFE | AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 462 = kmq_unlink */ - { SYF_MPSAFE | AS(abort2_args), (sy_call_t *)abort2, AUE_NULL }, /* 463 = abort2 */ - { SYF_MPSAFE | AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL }, /* 464 = thr_set_name */ - { SYF_MPSAFE | AS(aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 465 = aio_fsync */ + { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = syscall */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0 }, /* 2 = fork */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ + { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ + { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0 }, /* 7 = wait4 */ + { compat(SYF_MPSAFE | AS(ocreat_args),creat), AUE_O_CREAT, NULL, 0, 0 }, /* 8 = old creat */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0 }, /* 9 = link */ + { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 11 = obsolete execv */ + { SYF_MPSAFE | AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = mknod */ + { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = chmod */ + { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0 }, /* 16 = chown */ + { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ + { compat4(SYF_MPSAFE | AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0 }, /* 18 = old getfsstat */ + { compat(SYF_MPSAFE | AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0 }, /* 19 = old lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = getpid */ + { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = mount */ + { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = unmount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0 }, /* 24 = getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 25 = geteuid */ + { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = ptrace */ + { SYF_MPSAFE | AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0 }, /* 27 = recvmsg */ + { SYF_MPSAFE | AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0 }, /* 28 = sendmsg */ + { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0 }, /* 29 = recvfrom */ + { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0 }, /* 30 = accept */ + { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0 }, /* 31 = getpeername */ + { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0 }, /* 32 = getsockname */ + { SYF_MPSAFE | AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = access */ + { SYF_MPSAFE | AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0 }, /* 34 = chflags */ + { SYF_MPSAFE | AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0 }, /* 35 = fchflags */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ + { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0 }, /* 37 = kill */ + { compat(SYF_MPSAFE | AS(ostat_args),stat), AUE_STAT, NULL, 0, 0 }, /* 38 = old stat */ + { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0 }, /* 39 = getppid */ + { compat(SYF_MPSAFE | AS(olstat_args),lstat), AUE_LSTAT, NULL, 0, 0 }, /* 40 = old lstat */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 43 = getegid */ + { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0 }, /* 44 = profil */ + { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0 }, /* 45 = ktrace */ + { compat(SYF_MPSAFE | AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 46 = old sigaction */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0 }, /* 47 = getgid */ + { compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0 }, /* 48 = old sigprocmask */ + { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0 }, /* 49 = getlogin */ + { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0 }, /* 50 = setlogin */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ + { compat(SYF_MPSAFE | 0,sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old sigpending */ + { SYF_MPSAFE | AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGPENDING, NULL, 0, 0 }, /* 53 = sigaltstack */ + { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ + { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ + { SYF_MPSAFE | AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ + { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ + { SYF_MPSAFE | AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0 }, /* 58 = readlink */ + { SYF_MPSAFE | AS(execve_args), (sy_call_t *)execve, AUE_EXECVE, NULL, 0, 0 }, /* 59 = execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ + { compat(SYF_MPSAFE | AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0 }, /* 62 = old fstat */ + { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0 }, /* 63 = old getkerninfo */ + { compat(SYF_MPSAFE | 0,getpagesize), AUE_O_GETPAGESIZE, NULL, 0, 0 }, /* 64 = old getpagesize */ + { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0 }, /* 65 = msync */ + { SYF_MPSAFE | 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0 }, /* 66 = vfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 67 = obsolete vread */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 68 = obsolete vwrite */ + { SYF_MPSAFE | AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0 }, /* 69 = sbrk */ + { SYF_MPSAFE | AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0 }, /* 70 = sstk */ + { compat(SYF_MPSAFE | AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0 }, /* 71 = old mmap */ + { SYF_MPSAFE | AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0 }, /* 72 = vadvise */ + { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 73 = munmap */ + { SYF_MPSAFE | AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 74 = mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 75 = madvise */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 76 = obsolete vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 77 = obsolete vlimit */ + { SYF_MPSAFE | AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0 }, /* 78 = mincore */ + { SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 79 = getgroups */ + { SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 80 = setgroups */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 81 = getpgrp */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 82 = setpgid */ + { SYF_MPSAFE | AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 83 = setitimer */ + { compat(SYF_MPSAFE | 0,wait), AUE_WAIT4, NULL, 0, 0 }, /* 84 = old wait */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 85 = swapon */ + { SYF_MPSAFE | AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 86 = getitimer */ + { compat(SYF_MPSAFE | AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0 }, /* 87 = old gethostname */ + { compat(SYF_MPSAFE | AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0 }, /* 88 = old sethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0 }, /* 89 = getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 90 = dup2 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 91 = getdopt */ + { SYF_MPSAFE | AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 92 = fcntl */ + { SYF_MPSAFE | AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0 }, /* 93 = select */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 94 = setdopt */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 96 = setpriority */ + { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0 }, /* 97 = socket */ + { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0 }, /* 98 = connect */ + { compat(SYF_MPSAFE | AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0 }, /* 99 = old accept */ + { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 100 = getpriority */ + { compat(SYF_MPSAFE | AS(osend_args),send), AUE_SEND, NULL, 0, 0 }, /* 101 = old send */ + { compat(SYF_MPSAFE | AS(orecv_args),recv), AUE_RECV, NULL, 0, 0 }, /* 102 = old recv */ + { compat(SYF_MPSAFE | AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 103 = old sigreturn */ + { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0 }, /* 104 = bind */ + { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0 }, /* 105 = setsockopt */ + { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0 }, /* 106 = listen */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 107 = obsolete vtimes */ + { compat(SYF_MPSAFE | AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0 }, /* 108 = old sigvec */ + { compat(SYF_MPSAFE | AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0 }, /* 109 = old sigblock */ + { compat(SYF_MPSAFE | AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0 }, /* 110 = old sigsetmask */ + { compat(SYF_MPSAFE | AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0 }, /* 111 = old sigsuspend */ + { compat(SYF_MPSAFE | AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0 }, /* 112 = old sigstack */ + { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0 }, /* 113 = old recvmsg */ + { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0 }, /* 114 = old sendmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 115 = obsolete vtrace */ + { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0 }, /* 116 = gettimeofday */ + { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 117 = getrusage */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0 }, /* 118 = getsockopt */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 119 = resuba */ + { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0 }, /* 120 = readv */ + { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0 }, /* 121 = writev */ + { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 122 = settimeofday */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 123 = fchown */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 124 = fchmod */ + { compat(SYF_MPSAFE | AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0 }, /* 125 = old recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 127 = setregid */ + { SYF_MPSAFE | AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0 }, /* 128 = rename */ + { compat(SYF_MPSAFE | AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0 }, /* 129 = old truncate */ + { compat(SYF_MPSAFE | AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0 }, /* 130 = old ftruncate */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 131 = flock */ + { SYF_MPSAFE | AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0 }, /* 132 = mkfifo */ + { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0 }, /* 133 = sendto */ + { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0 }, /* 134 = shutdown */ + { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0 }, /* 135 = socketpair */ + { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 136 = mkdir */ + { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 137 = rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES, NULL, 0, 0 }, /* 138 = utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 139 = obsolete 4.2 sigreturn */ + { SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME, NULL, 0, 0 }, /* 140 = adjtime */ + { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0 }, /* 141 = old getpeername */ + { compat(SYF_MPSAFE | 0,gethostid), AUE_SYSCTL, NULL, 0, 0 }, /* 142 = old gethostid */ + { compat(SYF_MPSAFE | AS(osethostid_args),sethostid), AUE_SYSCTL, NULL, 0, 0 }, /* 143 = old sethostid */ + { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0 }, /* 144 = old getrlimit */ + { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0 }, /* 145 = old setrlimit */ + { compat(SYF_MPSAFE | AS(okillpg_args),killpg), AUE_KILLPG, NULL, 0, 0 }, /* 146 = old killpg */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 147 = setsid */ + { SYF_MPSAFE | AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 148 = quotactl */ + { compat(SYF_MPSAFE | 0,quota), AUE_O_QUOTA, NULL, 0, 0 }, /* 149 = old quota */ + { compat(SYF_MPSAFE | AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0 }, /* 150 = old getsockname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 151 = sem_lock */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 152 = sem_wakeup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 153 = asyncdaemon */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 154 = nosys */ + { SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 155 = nfssvc */ + { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 156 = old getdirentries */ + { compat4(SYF_MPSAFE | AS(freebsd4_statfs_args),statfs), AUE_STATFS, NULL, 0, 0 }, /* 157 = old statfs */ + { compat4(SYF_MPSAFE | AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0 }, /* 158 = old fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 159 = nosys */ + { SYF_MPSAFE | AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH, NULL, 0, 0 }, /* 160 = lgetfh */ + { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0 }, /* 161 = getfh */ + { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 162 = getdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 163 = setdomainname */ + { SYF_MPSAFE | AS(uname_args), (sy_call_t *)uname, AUE_NULL, NULL, 0, 0 }, /* 164 = uname */ + { SYF_MPSAFE | AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL, NULL, 0, 0 }, /* 165 = sysarch */ + { SYF_MPSAFE | AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL, NULL, 0, 0 }, /* 166 = rtprio */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 167 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 168 = nosys */ + { SYF_MPSAFE | AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 169 = semsys */ + { SYF_MPSAFE | AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 170 = msgsys */ + { SYF_MPSAFE | AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 171 = shmsys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 172 = nosys */ + { SYF_MPSAFE | AS(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0 }, /* 173 = pread */ + { SYF_MPSAFE | AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 174 = pwrite */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 175 = nosys */ + { SYF_MPSAFE | AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 178 = getdescriptor */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 179 = setdescriptor */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 180 = nosys */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 181 = setgid */ + { SYF_MPSAFE | AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0 }, /* 182 = setegid */ + { SYF_MPSAFE | AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0 }, /* 183 = seteuid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 184 = lfs_bmapv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 185 = lfs_markv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 186 = lfs_segclean */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 187 = lfs_segwait */ + { SYF_MPSAFE | AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0 }, /* 188 = stat */ + { SYF_MPSAFE | AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0 }, /* 189 = fstat */ + { SYF_MPSAFE | AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0 }, /* 190 = lstat */ + { SYF_MPSAFE | AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0 }, /* 191 = pathconf */ + { SYF_MPSAFE | AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0 }, /* 192 = fpathconf */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 193 = nosys */ + { SYF_MPSAFE | AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 194 = getrlimit */ + { SYF_MPSAFE | AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 195 = setrlimit */ + { SYF_MPSAFE | AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = getdirentries */ + { SYF_MPSAFE | AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0 }, /* 197 = mmap */ + { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 198 = __syscall */ + { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0 }, /* 199 = lseek */ + { SYF_MPSAFE | AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 200 = truncate */ + { SYF_MPSAFE | AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 201 = ftruncate */ + { SYF_MPSAFE | AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 202 = __sysctl */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 203 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 204 = munlock */ + { SYF_MPSAFE | AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0 }, /* 205 = undelete */ + { SYF_MPSAFE | AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0 }, /* 206 = futimes */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ + { SYF_MPSAFE | AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 220 = __semctl */ + { SYF_MPSAFE | AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 221 = semget */ + { SYF_MPSAFE | AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 222 = semop */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = semconfig */ + { SYF_MPSAFE | AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 224 = msgctl */ + { SYF_MPSAFE | AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 225 = msgget */ + { SYF_MPSAFE | AS(msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 226 = msgsnd */ + { SYF_MPSAFE | AS(msgrcv_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 227 = msgrcv */ + { SYF_MPSAFE | AS(shmat_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 228 = shmat */ + { SYF_MPSAFE | AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 229 = shmctl */ + { SYF_MPSAFE | AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 230 = shmdt */ + { SYF_MPSAFE | AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 231 = shmget */ + { SYF_MPSAFE | AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 232 = clock_gettime */ + { SYF_MPSAFE | AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_NULL, NULL, 0, 0 }, /* 233 = clock_settime */ + { SYF_MPSAFE | AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0 }, /* 234 = clock_getres */ + { SYF_MPSAFE | AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0 }, /* 235 = ktimer_create */ + { SYF_MPSAFE | AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0 }, /* 236 = ktimer_delete */ + { SYF_MPSAFE | AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0 }, /* 237 = ktimer_settime */ + { SYF_MPSAFE | AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0 }, /* 238 = ktimer_gettime */ + { SYF_MPSAFE | AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 239 = ktimer_getoverrun */ + { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0 }, /* 240 = nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 243 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = nosys */ + { SYF_MPSAFE | AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0 }, /* 248 = ntp_gettime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = nosys */ + { SYF_MPSAFE | AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0 }, /* 250 = minherit */ + { SYF_MPSAFE | AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0 }, /* 251 = rfork */ + { SYF_MPSAFE | AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0 }, /* 252 = openbsd_poll */ + { SYF_MPSAFE | 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0 }, /* 253 = issetugid */ + { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 254 = lchown */ + { SYF_MPSAFE | AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 255 = aio_read */ + { SYF_MPSAFE | AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 256 = aio_write */ + { SYF_MPSAFE | AS(lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 257 = lio_listio */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 258 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 259 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 260 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 261 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 262 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 263 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 264 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 265 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 266 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 267 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 268 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 269 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 270 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 271 = nosys */ + { SYF_MPSAFE | AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 272 = getdents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = nosys */ + { SYF_MPSAFE | AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0 }, /* 274 = lchmod */ + { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 275 = netbsd_lchown */ + { SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0 }, /* 276 = lutimes */ + { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0 }, /* 277 = netbsd_msync */ + { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0 }, /* 278 = nstat */ + { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0 }, /* 279 = nfstat */ + { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0 }, /* 280 = nlstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 281 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 282 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 283 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 284 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 286 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 287 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 288 = nosys */ + { SYF_MPSAFE | AS(preadv_args), (sy_call_t *)preadv, AUE_NULL, NULL, 0, 0 }, /* 289 = preadv */ + { SYF_MPSAFE | AS(pwritev_args), (sy_call_t *)pwritev, AUE_NULL, NULL, 0, 0 }, /* 290 = pwritev */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 291 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 292 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 293 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 294 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 295 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 296 = nosys */ + { compat4(SYF_MPSAFE | AS(freebsd4_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL, 0, 0 }, /* 297 = old fhstatfs */ + { SYF_MPSAFE | AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN, NULL, 0, 0 }, /* 298 = fhopen */ + { SYF_MPSAFE | AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0 }, /* 299 = fhstat */ + { SYF_MPSAFE | AS(modnext_args), (sy_call_t *)modnext, AUE_NULL, NULL, 0, 0 }, /* 300 = modnext */ + { SYF_MPSAFE | AS(modstat_args), (sy_call_t *)modstat, AUE_NULL, NULL, 0, 0 }, /* 301 = modstat */ + { SYF_MPSAFE | AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL, NULL, 0, 0 }, /* 302 = modfnext */ + { SYF_MPSAFE | AS(modfind_args), (sy_call_t *)modfind, AUE_NULL, NULL, 0, 0 }, /* 303 = modfind */ + { SYF_MPSAFE | AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD, NULL, 0, 0 }, /* 304 = kldload */ + { SYF_MPSAFE | AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD, NULL, 0, 0 }, /* 305 = kldunload */ + { SYF_MPSAFE | AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL, NULL, 0, 0 }, /* 306 = kldfind */ + { SYF_MPSAFE | AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0 }, /* 307 = kldnext */ + { SYF_MPSAFE | AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0 }, /* 308 = kldstat */ + { SYF_MPSAFE | AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0 }, /* 309 = kldfirstmod */ + { SYF_MPSAFE | AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0 }, /* 310 = getsid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 311 = setresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 312 = setresgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 313 = obsolete signanosleep */ + { SYF_MPSAFE | AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 314 = aio_return */ + { SYF_MPSAFE | AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 315 = aio_suspend */ + { SYF_MPSAFE | AS(aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 316 = aio_cancel */ + { SYF_MPSAFE | AS(aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 317 = aio_error */ + { SYF_MPSAFE | AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 318 = oaio_read */ + { SYF_MPSAFE | AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 319 = oaio_write */ + { SYF_MPSAFE | AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 320 = olio_listio */ + { SYF_MPSAFE | 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0 }, /* 321 = yield */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 322 = obsolete thr_sleep */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 324 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 325 = munlockall */ + { SYF_MPSAFE | AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_NULL, NULL, 0, 0 }, /* 326 = __getcwd */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0 }, /* 327 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0 }, /* 328 = sched_getparam */ + { SYF_MPSAFE | AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 329 = sched_setscheduler */ + { SYF_MPSAFE | AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0 }, /* 330 = sched_getscheduler */ + { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 331 = sched_yield */ + { SYF_MPSAFE | AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0 }, /* 332 = sched_get_priority_max */ + { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0 }, /* 333 = sched_get_priority_min */ + { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0 }, /* 334 = sched_rr_get_interval */ + { SYF_MPSAFE | AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */ + { compat4(SYF_MPSAFE | AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old sendfile */ + { SYF_MPSAFE | AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */ + { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */ + { SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */ + { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */ + { compat4(SYF_MPSAFE | AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 342 = old sigaction */ + { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0 }, /* 343 = sigpending */ + { compat4(SYF_MPSAFE | AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old sigreturn */ + { SYF_MPSAFE | AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 345 = sigtimedwait */ + { SYF_MPSAFE | AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0 }, /* 346 = sigwaitinfo */ + { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */ + { SYF_MPSAFE | AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */ + { SYF_MPSAFE | AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */ + { SYF_MPSAFE | AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0 }, /* 350 = __acl_set_fd */ + { SYF_MPSAFE | AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0 }, /* 351 = __acl_delete_file */ + { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 352 = __acl_delete_fd */ + { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0 }, /* 353 = __acl_aclcheck_file */ + { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0 }, /* 354 = __acl_aclcheck_fd */ + { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL, NULL, 0, 0 }, /* 355 = extattrctl */ + { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL, NULL, 0, 0 }, /* 356 = extattr_set_file */ + { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL, NULL, 0, 0 }, /* 357 = extattr_get_file */ + { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL, NULL, 0, 0 }, /* 358 = extattr_delete_file */ + { SYF_MPSAFE | AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ + { SYF_MPSAFE | 0, (sy_call_t *)kqueue, AUE_NULL, NULL, 0, 0 }, /* 362 = kqueue */ + { SYF_MPSAFE | AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0 }, /* 363 = kevent */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 364 = __cap_get_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 365 = __cap_set_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 366 = __cap_get_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ + { AS(nosys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ + { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL, NULL, 0, 0 }, /* 371 = extattr_set_fd */ + { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL, NULL, 0, 0 }, /* 372 = extattr_get_fd */ + { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ + { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0 }, /* 374 = __setugid */ + { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ + { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ + { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */ + { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ + { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ + { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ + { SYF_MPSAFE | AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt, AUE_NULL, NULL, 0, 0 }, /* 382 = kse_thr_interrupt */ + { SYF_MPSAFE | AS(kse_release_args), (sy_call_t *)kse_release, AUE_NULL, NULL, 0, 0 }, /* 383 = kse_release */ + { SYF_MPSAFE | AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0 }, /* 384 = __mac_get_proc */ + { SYF_MPSAFE | AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0 }, /* 385 = __mac_set_proc */ + { SYF_MPSAFE | AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0 }, /* 386 = __mac_get_fd */ + { SYF_MPSAFE | AS(__mac_get_file_args), (sy_call_t *)__mac_get_file, AUE_NULL, NULL, 0, 0 }, /* 387 = __mac_get_file */ + { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0 }, /* 388 = __mac_set_fd */ + { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file, AUE_NULL, NULL, 0, 0 }, /* 389 = __mac_set_file */ + { SYF_MPSAFE | AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0 }, /* 390 = kenv */ + { SYF_MPSAFE | AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0 }, /* 391 = lchflags */ + { SYF_MPSAFE | AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0 }, /* 392 = uuidgen */ + { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 393 = sendfile */ + { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL, NULL, 0, 0 }, /* 394 = mac_syscall */ + { SYF_MPSAFE | AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0 }, /* 395 = getfsstat */ + { SYF_MPSAFE | AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0 }, /* 396 = statfs */ + { SYF_MPSAFE | AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 397 = fstatfs */ + { SYF_MPSAFE | AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL, NULL, 0, 0 }, /* 398 = fhstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 399 = nosys */ + { SYF_MPSAFE | AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 400 = ksem_close */ + { SYF_MPSAFE | AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 401 = ksem_post */ + { SYF_MPSAFE | AS(ksem_wait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 402 = ksem_wait */ + { SYF_MPSAFE | AS(ksem_trywait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 403 = ksem_trywait */ + { SYF_MPSAFE | AS(ksem_init_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 404 = ksem_init */ + { SYF_MPSAFE | AS(ksem_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 405 = ksem_open */ + { SYF_MPSAFE | AS(ksem_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 406 = ksem_unlink */ + { SYF_MPSAFE | AS(ksem_getvalue_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 407 = ksem_getvalue */ + { SYF_MPSAFE | AS(ksem_destroy_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 408 = ksem_destroy */ + { SYF_MPSAFE | AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid, AUE_NULL, NULL, 0, 0 }, /* 409 = __mac_get_pid */ + { SYF_MPSAFE | AS(__mac_get_link_args), (sy_call_t *)__mac_get_link, AUE_NULL, NULL, 0, 0 }, /* 410 = __mac_get_link */ + { SYF_MPSAFE | AS(__mac_set_link_args), (sy_call_t *)__mac_set_link, AUE_NULL, NULL, 0, 0 }, /* 411 = __mac_set_link */ + { SYF_MPSAFE | AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_NULL, NULL, 0, 0 }, /* 412 = extattr_set_link */ + { SYF_MPSAFE | AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_NULL, NULL, 0, 0 }, /* 413 = extattr_get_link */ + { SYF_MPSAFE | AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_NULL, NULL, 0, 0 }, /* 414 = extattr_delete_link */ + { SYF_MPSAFE | AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL, NULL, 0, 0 }, /* 415 = __mac_execve */ + { SYF_MPSAFE | AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0 }, /* 416 = sigaction */ + { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 417 = sigreturn */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 418 = __xstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 419 = __xfstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 420 = __xlstat */ + { SYF_MPSAFE | AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0 }, /* 421 = getcontext */ + { SYF_MPSAFE | AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0 }, /* 422 = setcontext */ + { SYF_MPSAFE | AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL, NULL, 0, 0 }, /* 423 = swapcontext */ + { SYF_MPSAFE | AS(swapoff_args), (sy_call_t *)swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 424 = swapoff */ + { SYF_MPSAFE | AS(__acl_get_link_args), (sy_call_t *)__acl_get_link, AUE_NULL, NULL, 0, 0 }, /* 425 = __acl_get_link */ + { SYF_MPSAFE | AS(__acl_set_link_args), (sy_call_t *)__acl_set_link, AUE_NULL, NULL, 0, 0 }, /* 426 = __acl_set_link */ + { SYF_MPSAFE | AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link, AUE_NULL, NULL, 0, 0 }, /* 427 = __acl_delete_link */ + { SYF_MPSAFE | AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link, AUE_NULL, NULL, 0, 0 }, /* 428 = __acl_aclcheck_link */ + { SYF_MPSAFE | AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 429 = sigwait */ + { SYF_MPSAFE | AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create */ + { SYF_MPSAFE | AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0 }, /* 431 = thr_exit */ + { SYF_MPSAFE | AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0 }, /* 432 = thr_self */ + { SYF_MPSAFE | AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0 }, /* 433 = thr_kill */ + { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0 }, /* 434 = _umtx_lock */ + { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0 }, /* 435 = _umtx_unlock */ + { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0 }, /* 436 = jail_attach */ + { SYF_MPSAFE | AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_NULL, NULL, 0, 0 }, /* 437 = extattr_list_fd */ + { SYF_MPSAFE | AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_NULL, NULL, 0, 0 }, /* 438 = extattr_list_file */ + { SYF_MPSAFE | AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_NULL, NULL, 0, 0 }, /* 439 = extattr_list_link */ + { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin, AUE_NULL, NULL, 0, 0 }, /* 440 = kse_switchin */ + { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ + { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */ + { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ + { SYF_MPSAFE | AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_NULL, NULL, 0, 0 }, /* 444 = kldunloadf */ + { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit, AUE_AUDIT, NULL, 0, 0 }, /* 445 = audit */ + { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0 }, /* 446 = auditon */ + { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0 }, /* 447 = getauid */ + { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0 }, /* 448 = setauid */ + { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0 }, /* 449 = getaudit */ + { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0 }, /* 450 = setaudit */ + { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0 }, /* 451 = getaudit_addr */ + { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0 }, /* 452 = setaudit_addr */ + { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl, AUE_AUDITCTL, NULL, 0, 0 }, /* 453 = auditctl */ + { SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0 }, /* 454 = _umtx_op */ + { SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0 }, /* 455 = thr_new */ + { SYF_MPSAFE | AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ + { SYF_MPSAFE | AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 457 = kmq_open */ + { SYF_MPSAFE | AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 458 = kmq_setattr */ + { SYF_MPSAFE | AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 459 = kmq_timedreceive */ + { SYF_MPSAFE | AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 460 = kmq_timedsend */ + { SYF_MPSAFE | AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 461 = kmq_notify */ + { SYF_MPSAFE | AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 462 = kmq_unlink */ + { SYF_MPSAFE | AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ + { SYF_MPSAFE | AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ + { SYF_MPSAFE | AS(aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ }; ==== //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#2 (text+ko) ==== @@ -18,6 +18,7 @@ syscallprefix="SYS_" switchname="sysent" namesname="syscallnames" +systrace="systrace_args.c" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 00:58:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC6E616A403; Mon, 1 May 2006 00:58:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C7C4316A401 for ; Mon, 1 May 2006 00:58:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E07243D48 for ; Mon, 1 May 2006 00:58:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k410wnAe027362 for ; Mon, 1 May 2006 00:58:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k410wnwi027356 for perforce@freebsd.org; Mon, 1 May 2006 00:58:49 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 00:58:49 GMT Message-Id: <200605010058.k410wnwi027356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 00:58:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=96457 Change 96457 by jb@jb_freebsd2 on 2006/05/01 00:57:57 DTrace requires the array of syscall names. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#9 (text+ko) ==== @@ -1361,7 +1361,7 @@ kern/sys_pipe.c standard kern/sys_process.c standard kern/sys_socket.c standard -kern/syscalls.c optional witness +kern/syscalls.c optional witness kdtrace kern/sysv_ipc.c standard kern/sysv_msg.c optional sysvmsg kern/sysv_sem.c optional sysvsem From owner-p4-projects@FreeBSD.ORG Mon May 1 01:05:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E358E16A41A; Mon, 1 May 2006 01:05:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C1E4E16A418 for ; Mon, 1 May 2006 01:05:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E7A643D45 for ; Mon, 1 May 2006 01:05:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4115wja032141 for ; Mon, 1 May 2006 01:05:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4115wX5032138 for perforce@freebsd.org; Mon, 1 May 2006 01:05:58 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 01:05:58 GMT Message-Id: <200605010105.k4115wX5032138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 01:05:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=96458 Change 96458 by jb@jb_freebsd2 on 2006/05/01 01:05:20 Add the 'systrace_args.c' generated function for DTrace's syscall provider. Affected files ... .. //depot/projects/dtrace/src/sys/kern/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/Makefile#2 (text+ko) ==== @@ -11,10 +11,11 @@ sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \ ../sys/sysproto.h -init_sysent.c syscalls.c ../sys/syscall.h \ +init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak From owner-p4-projects@FreeBSD.ORG Mon May 1 01:29:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3775F16A405; Mon, 1 May 2006 01:29:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1110116A401 for ; Mon, 1 May 2006 01:29:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B81DE43D45 for ; Mon, 1 May 2006 01:29:27 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k411TR5X042744 for ; Mon, 1 May 2006 01:29:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k411TRCS042741 for perforce@freebsd.org; Mon, 1 May 2006 01:29:27 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 1 May 2006 01:29:27 GMT Message-Id: <200605010129.k411TRCS042741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 01:29:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=96460 Change 96460 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/01 01:28:40 add missing bucket unlocks Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#39 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#39 (text+ko) ==== @@ -972,10 +972,9 @@ else tte_data |= TTE_MINFLAGS; - if ((otte_data & ~(VTD_W|VTD_REF)) != tte_data) { + if ((otte_data & ~(VTD_W|VTD_REF|VTD_LOCK)) != tte_data) { if (otte_data & VTD_V) { invlva = FALSE; - *otte = tte_data; if (otte_data & VTD_REF) { if (otte_data & VTD_MANAGED) vm_page_flag_set(om, PG_REFERENCED); @@ -989,6 +988,11 @@ if ((prot & VM_PROT_WRITE) == 0) invlva = TRUE; } + DPRINTF("update *otte 0x%lx -> 0x%lx\n", otte_data, tte_data); + *otte = tte_data; + + if (!(otte_data & VTD_LOCK)) + tte_hash_bucket_unlock(pmap->pm_hash, va); #ifdef notyet if (invlva) #endif @@ -997,9 +1001,13 @@ tte_hash_insert(pmap->pm_hash, va, tte_data); membar(Sync); } + } else { + if (!(*otte & VTD_LOCK)) + tte_hash_bucket_unlock(pmap->pm_hash, va); + else + *otte = (*otte & ~VTD_LOCK); } - sched_unpin(); PMAP_UNLOCK(pmap); vm_page_unlock_queues(); @@ -1556,7 +1564,11 @@ vm_page_t m; retry: tte = tte_hash_lookup(pmap->pm_hash, tva, TRUE); - otte_data = tte_data = tte ? *tte : 0; + if (tte == NULL) + continue; + + otte_data = tte_data = *tte; + if (tte_data & VTD_MANAGED) { m = NULL; if (tte_data & VTD_REF) { @@ -1573,10 +1585,15 @@ tte_data &= ~(VTD_SW_W | VTD_W); if (tte_data != otte_data) { - if (!atomic_cmpset_long(tte, otte_data, tte_data)) + if (!atomic_cmpset_long(tte, otte_data, tte_data)) { + /* XXX this should never happen with hash bucket locks - FIXME */ + panic("bucket locked but tte data changed"); + tte_hash_bucket_unlock(pmap->pm_hash, tva); goto retry; + } anychanged = 1; } + tte_hash_bucket_unlock(pmap->pm_hash, tva); } From owner-p4-projects@FreeBSD.ORG Mon May 1 01:31:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4484816A405; Mon, 1 May 2006 01:31:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 22D3416A403 for ; Mon, 1 May 2006 01:31:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C95F643D45 for ; Mon, 1 May 2006 01:31:30 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k411VUM8043971 for ; Mon, 1 May 2006 01:31:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k411VUhE043958 for perforce@freebsd.org; Mon, 1 May 2006 01:31:30 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 1 May 2006 01:31:30 GMT Message-Id: <200605010131.k411VUhE043958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 01:31:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=96461 Change 96461 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/01 01:31:10 add bucket locking in TSB miss handler simplify logic somewhat by using local registers Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#44 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#44 (text+ko) ==== @@ -260,7 +260,14 @@ .endm .macro insn_excptn - tl0_gen T_RESERVED + GET_MMFSA_SCRATCH(%g1) + mov MMFSA_D_ADDR, %g2 + ldxa [%g1 + %g2]ASI_REAL, %g3 + sub %g0, 1, %g4 + set trap, %g1 + ba %xcc, tl0_trap + mov T_INSTRUCTION_EXCEPTION, %g2 + .align 32 .endm @@ -310,12 +317,14 @@ .endm .macro tl0_align - GET_MMFSA_SCRATCH(%g1) + GET_MMFSA_SCRATCH(%g1) mov MMFSA_D_ADDR, %g3 - mov MMFSA_D_CTX, %g7 - ldxa [%g1 + %g3]ASI_REAL, %g5 +! mov MMFSA_D_CTX, %g7 + ldxa [%g1 + %g3]ASI_REAL, %g3 + ldxa [%g1 + %g7]ASI_REAL, %g4 + or %g4, %g3, %g3 ba,pt %xcc, tl0_trap - mov T_MEM_ADDRESS_NOT_ALIGNED, %g3 + mov T_MEM_ADDRESS_NOT_ALIGNED, %g2 .align 32 .endm @@ -330,6 +339,8 @@ .endm .macro resumable_error + MAGIC_TRAP_ON + MAGIC_EXIT clr %g3 sub %g0, 1, %g4 set trap, %g1 @@ -935,6 +946,7 @@ add %sp, REGOFF + SPOFF, %l7 ENTRY(user_rtt) GET_PCPU_SCRATCH + ! pil handling needs to be re-visited wrpr %g0, PIL_TICK, %pil ldx [PCPU(CURTHREAD)], %l4 @@ -964,6 +976,7 @@ ba,a %xcc, user_rtt nop 2: + ld [%l7 + TF_WSTATE], %l3 ! ! restore user globals and outs @@ -1321,9 +1334,33 @@ +#define HASH_LOOKUP(addr, tag, searchtag, endlabel, matchlabel) \ + ldda [addr]%asi, tag ; \ + cmp tag, searchtag ; \ + be,pn %xcc, matchlabel ; \ + nop ; \ + cmp tag, %g0 ; \ + be,pn %xcc, endlabel ; \ + nop +#define RESTORE_TRAPWIN(pcpu, cansave, label1, label2) \ + brz cansave, label1 ## f; \ + nop ; \ + mov -1, %l0 ; \ + mov -1, %l7 ; \ + restore ; \ + ba,a,pt %xcc, label2 ## f ; \ +label1: ; \ + rdpr %tl, cansave ; \ + dec cansave ; \ + sll cansave, RW_SHIFT, cansave ; \ + add cansave, PC_KWBUF, cansave ; \ + add pcpu, cansave, cansave ; \ + RESTORE_LOCALS_ASI(cansave) ; \ +label2: + ! %g3==trap type ! %g4==fault type (if data miss) ! %g5==fault addr @@ -1339,216 +1376,251 @@ ldxa [%g1 + %g7]ASI_REAL, %g6 ! load in the context rdpr %tl, %g7 ! need to use real addresses + +#ifdef notyet + rdpr %cansave, %g1 +#else + mov 0, %g1 +#endif + + brz,pn %g1, 0f + nop + save +0: + cmp %g7, 1 ! for tl > 1 bne,pn %xcc, 2f nop + mov ASI_LDTD_N, %g3 + wr %g0, ASI_N, %asi + GET_PCPU_SCRATCH + cmp %g6, %g0 ! kernel? be,pn %xcc, 1f nop GET_HASH_SCRATCH_USER(%g2) - wr %g0, ASI_LDTD_N, %asi - ba,pt %xcc, 4f + GET_TSB_SCRATCH_USER(%g4) + brz,pn %g1, 4f + nop + ba,pt %xcc, 5f nop 1: GET_HASH_SCRATCH_KERNEL(%g2) - wr %g0, ASI_LDTD_N, %asi - ba,pt %xcc, 4f + GET_TSB_SCRATCH_KERNEL(%g4) + brz,pn %g1, 4f + nop + ba,pt %xcc, 5f nop 2: + mov ASI_LDTD_REAL, %g3 + wr %g0, ASI_REAL, %asi + GET_PCPU_PHYS_SCRATCH(%g4) + cmp %g6, %g0 ! kernel? be,pn %xcc, 3f nop - GET_HASH_PHYS_SCRATCH_USER(%g7, %g2) - wr %g0, ASI_LDTD_REAL, %asi - ba,pt %xcc, 4f + GET_HASH_PHYS_SCRATCH_USER(%g4, %g2) + GET_TSB_SCRATCH_USER(%g4) + brz,pn %g1, 4f + nop + ba,pt %xcc, 5f + nop +3: + + GET_HASH_PHYS_SCRATCH_KERNEL(%g4, %g2) + GET_TSB_SCRATCH_KERNEL(%g4) + brnz,pt %g1, 5f nop -3: - GET_HASH_PHYS_SCRATCH_KERNEL(%g7, %g2) - wr %g0, ASI_LDTD_REAL, %asi -4: - - srlx %g5, TTARGET_VA_SHIFT, %g1 - sllx %g6, TTARGET_CTX_SHIFT, %g6 - or %g6, %g1, %g6 ! %g6 == search tag +4: + rdpr %tl, %g1 + dec %g1 + sll %g1, RW_SHIFT, %g1 + add %g1, PC_KWBUF, %g1 + add PCPU_REG, %g1, %g1 + SAVE_LOCALS_ASI(%g1) + mov 0, %g1 ! cansave is 0 +5: + + ! %g1 == %cansave + ! %g2 == hash scratch value + ! %g3 == TWDW ASI + ! %g4 == TSB RA + ! %g5 == fault addr + ! %g6 == context + srlx %g5, TTARGET_VA_SHIFT, %l0 + sllx %g6, TTARGET_CTX_SHIFT, %l1 + or %l0, %l1, %l2 ! %l2 == search tag - ! %g4 == fault type %g5 == fault addr %g6 == tag - ! XXX only handle normal miss for now (look at fault type in the future) - tsb_miss_compute_hash_addr: - sethi %hi(PAGE_SIZE), %g7 - sub %g7, 1, %g7 ! %g7==PAGE_MASK + sethi %hi(PAGE_SIZE), %l0 + sub %l0, 1, %l1 ! %l1==PAGE_MASK - and %g2, %g7, %g4 ! size stored in lower 13 bits - andn %g2, %g7, %g2 ! actual VA of hash + and %g2, %l1, %l3 ! size stored in lower 13 bits + andn %g2, %l1, %g2 ! actual VA/RA of hash ! XXX only handle 8k page miss ! calculate hash index - srlx %g5, PAGE_SHIFT, %g1 ! absolute hash index - sllx %g4, (PAGE_SHIFT - THE_SHIFT), %g4 ! size of hash in THEs - sub %g4, 1, %g4 ! THE_MASK - and %g1, %g4, %g4 ! masked hash index - sllx %g4, THE_SHIFT, %g4 ! masked hash offset + srlx %g5, PAGE_SHIFT, %l4 ! absolute hash index + sllx %l3, (PAGE_SHIFT - THE_SHIFT), %l0 ! size of hash in THEs + sub %l0, 1, %l5 ! THE_MASK + and %l4, %l5, %l5 ! masked hash index + sllx %l5, THE_SHIFT, %l5 ! masked hash offset ! fetch hash entries - exit when we find what were looking for ! %g2==entry base - add %g2, %g4, %g2 ! base + offset == entry base + add %g2, %l5, %g2 ! base + offset == entry base - mov %g5, %g7 ! save fault addr - ! entry 0 - ! %g1 == abs index %g2 == THE pointer %g3 == flags - ! %g4 <- tag %g5 <- data - ! %g6 == search tag %g7 == fault addr + mov 1, %l0 + add %g2, 8, %g2 ! point g2 at data + sllx %l0, 56, %l0 ! %l0 == VTD_LOCK +6: + ldxa [%g2]%asi, %l7 ! don't lock bus if bucket is locked + andcc %l7, %l0, %g0 + bnz,pn %xcc, 6b + or %l7, %l0, %l6 + casxa [%g2]%asi, %l7, %l6 + cmp %l6, %l7 + bne,pn %icc, 6b + nop + + sub %g2, 8, %g2 ! point g2 back at tag + + ! %g1 == cansave + ! %g2 == THE + ! %g3 == TWDW ASI + ! %g4 == TSB RA + ! %g5 == fault addr + ! %g6 == context + ! %g7 == PCPU_REG + ! %l0 == VTD_LOCK + ! %l1 == PAGE_MASK + ! %l2 == search tag + ! %l4 == absolute index + + ! %l3 == ASI + ! %l5 == saved head of bucket + ! %l6 == tag + ! %l7 == data + + rd %asi, %l3 + wr %g0, %g3, %asi + mov %g2, %l5 ! save head of bucket + rdpr %tt, %g3 ! reload trap type -tsb_miss_lookup_0: - ldda [%g2]%asi, %g4 - cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 5f - nop - cmp %g4, %g6 ! entry tag == VA tag? - be,pn %xcc, 6f - nop - ! entry 1 +tsb_miss_lookup_0: + HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) tsb_miss_lookup_1: add %g2, 16, %g2 - ldda [%g2]%asi, %g4 - cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 5f - nop - cmp %g4, %g6 ! entry tag == search tag? - be,pn %xcc, 6f - nop - ! entry 2 + HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) tsb_miss_lookup_2: add %g2, 16, %g2 - ldda [%g2]%asi, %g4 - cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 5f - nop - cmp %g4, %g6 ! entry tag == search tag? - be,pn %xcc, 6f - nop - ! entry 3 + HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) tsb_miss_lookup_3: add %g2, 16, %g2 - ldda [%g2]%asi, %g4 - cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 5f - nop - cmp %g4, %g6 ! entry tag == search tag? - be,pn %xcc, 6f - nop + HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) tsb_miss_not_found: -5: ! not found +7: ! not found ! we need to jump to tl0_trap to drop us back down to tl0 ! and take us to trap(...) to service the fault + wr %g0, %l3, %asi + + ldxa [%l5 + 8]%asi, %g2 + andn %g2, %l0, %g2 + stxa %g2, [%l5 + 8]%asi ! unlock head of bucket - srlx %g7, 13, %g7 ! slow painful way of masking off - sllx %g7, 13, %g7 ! bottom bits without using a reg - ! XXX FIXME - - mov %g3, %g2 ! save fault type - srlx %g6, TTARGET_CTX_SHIFT, %g4 ! recover context + andn %g5, %l1, %g5 ! fault page PA + + RESTORE_TRAPWIN(PCPU_REG, %g1, 14, 15) + + mov %g3, %g2 ! trap type sethi %hi(trap), %g1 - or %g4, %g7, %g3 - mov -1, %g4 + or %g6, %g5, %g3 ! trap data + sub %g0, 1, %g4 ! pil info ba %xcc, tl0_trap or %g1, %lo(trap), %g1 - -tsb_miss_found: -6: !found - ! %g1 == abs index %g2 == THE pointer %g3 == flags - ! %g4 == tag %g5 == data %g7 == PAGE_MASK - ! %g3 <- TSB RA %g6 <- TSB size, TTE RA %g7 == PAGE_MASK - srlx %g6, TTARGET_CTX_SHIFT, %g6 - or %g7, %g6, %g6 ! save context and fault addr - ! will break when ctxbits > 13 - sethi %hi(PAGE_SIZE), %g7 - sub %g7, 1, %g7 ! %g7==PAGE_MASK - +tsb_miss_found: +8: + wr %g0, %l3, %asi cmp %g3, T_DATA_MISS ! TSB data miss - be,pt %xcc, 7f - or %g5, VTD_REF, %g5 ! set referenced unconditionally + be,pt %xcc, 9f + or %l7, VTD_REF, %l7 ! set referenced unconditionally cmp %g3, T_INSTRUCTION_MISS ! TSB instruction miss - be,pt %xcc, 7f + be,pt %xcc, 9f nop cmp %g3, T_DATA_PROTECTION ! protection fault bne,pn %xcc, unsupported_fault_trap ! we don't handle any other fault types currently nop - andcc %g5, VTD_SW_W, %g0 ! write enabled? - bz,pn %xcc, prot_fault_trap ! write to read only page + andcc %l7, VTD_SW_W, %g0 ! write enabled? + bz,a,pn %xcc, prot_fault_trap ! write to read only page nop - or %g5, VTD_W, %g5 ! add modifed bit -7: - rdpr %tl, %g3 - dec %g3 - movrnz %g3, ASI_REAL, %g3 - movrz %g3, ASI_N, %g3 - wr %g0, %g3, %asi + or %l7, VTD_W, %l7 ! add modifed bit +9: + + + andn %l7, %l0, %l7 ! remove lock bit + + and %g4, %l1, %g3 ! size of TSB in pages + andn %g4, %l1, %l3 ! TSB real address + + sllx %g3, (PAGE_SHIFT - TTE_SHIFT), %g3 ! nttes + subx %g3, 1, %g3 ! TSB_MASK + and %g3, %l4, %g3 ! masked index + sllx %g3, TTE_SHIFT, %g3 ! masked byte offset + add %g3, %l3, %g3 ! TTE RA + + mov 8, %l4 - stxa %g5, [%g2 + 8]%asi ! update TTE - andcc %g6, %g7, %g0 ! kernel context? - bz,pn %xcc, 8f - nop - GET_TSB_SCRATCH_USER(%g3) ! %g3 == TSB (RA) - ba,pt %xcc, 9f - and %g3, %g7, %g2 ! size of TSB in pages -8: - GET_TSB_SCRATCH_KERNEL(%g3) ! %g3 == TSB (RA) - and %g3, %g7, %g2 ! size of TSB in pages -9: - andn %g3, %g7, %g3 ! TSB real address - sllx %g2, (PAGE_SHIFT - TTE_SHIFT), %g2 ! nttes - subx %g2, 1, %g2 ! TSB_MASK - and %g2, %g1, %g2 ! masked index - sllx %g2, TTE_SHIFT, %g2 ! masked byte offset - add %g2, %g3, %g2 ! TTE RA - mov 8, %g7 #ifdef PMAP_DEBUG - mov %g2, %g1 - ldda [%g2]ASI_LDTD_REAL, %g2 - cmp %g3, %g5 - bne,pt %xcc, 10f - cmp %g2, %g4 - bne,pt %xcc, 10f + ldda [%g3]ASI_LDTD_REAL, %l2 + cmp %l3, %l7 + bne,pt %xcc, 12f + cmp %l2, %l6 + bne,pt %xcc, 12f nop +#ifndef SIMULATOR PUTCHAR(0x5a) PUTCHAR(0x5a) PUTCHAR(0x5a) +#endif MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! die if all we're doing ! is storing same data -10: - mov %g1, %g2 +12: #endif - stxa %g0, [%g2 + %g7]ASI_REAL ! invalidate data - stxa %g4, [%g2]ASI_REAL ! store tag - stxa %g5, [%g2 + %g7]ASI_REAL ! store data + stxa %g0, [%g3 + %l4]ASI_REAL ! invalidate data + stxa %l6, [%g3]ASI_REAL ! store tag + stxa %l7, [%g3 + %l4]ASI_REAL ! store data + stxa %l7, [%g2 + 8]%asi ! update TTE -upgrade_demap: - MAGIC_TRAP_ON - rdpr %tt, %g5 - cmp %g5, T_DATA_PROTECTION + cmp %g2, %l5 + beq,a,pt %xcc, 17f + nop + ldxa [%l5 + 8]%asi, %l7 + andn %l7, %l0, %l7 ! remove lock bit + stxa %l7, [%l5 + 8]%asi ! unlock bucket +17: + membar #Sync + RESTORE_TRAPWIN(PCPU_REG, %g1, 13, 16) +upgrade_demap: + rdpr %tt, %g3 + cmp %g3, T_DATA_PROTECTION beq,pn %xcc, demap_begin nop - MAGIC_TRAP_OFF retry demap_begin: sethi %hi(PAGE_SIZE), %g1 sub %g1, 1, %g1 - and %g6, %g1, %g2 - andn %g6, %g1, %g3 - mov %o0, %g5 - mov %o1, %g6 - mov %o2, %g7 + mov %o0, %g1 + mov %o1, %g2 + mov %o2, %g3 mov MAP_DTLB, %o2 - mov %g3, %o0 - mov %g2, %o1 + mov %g5, %o0 + mov %g6, %o1 ta MMU_UNMAP_ADDR - mov %g5, %o0 - mov %g6, %o1 - mov %g7, %o2 - MAGIC_TRAP_OFF + mov %g1, %o0 + mov %g2, %o1 + mov %g3, %o2 retry END(tsb_miss_handler) @@ -1556,13 +1628,21 @@ /* * Write to read-only page */ -! %g4==tag -! %g5==TTE -! %g6==fault addr | context +! %g1 == cansave +! %g4 == tag +! %g5 == fault addr +! %g6 == context +! %l0 == VTD_LOCK +! %l5 == head of bucket + ENTRY(prot_fault_trap) + ldxa [%l5 + 8]%asi, %g2 + andn %g2, %l0, %g2 ! remove lock bit + stxa %g2, [%l5 + 8]%asi ! unlock head of bucket + RESTORE_TRAPWIN(PCPU_REG, %g1, 14, 15) sethi %hi(trap), %g1 mov T_DATA_PROTECTION, %g2 - mov %g6, %g3 + or %g5, %g6, %g3 sub %g0, 1, %g4 ba %xcc, tl0_trap or %g1, %lo(trap), %g1 From owner-p4-projects@FreeBSD.ORG Mon May 1 01:35:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA77316A409; Mon, 1 May 2006 01:35:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9782C16A404 for ; Mon, 1 May 2006 01:35:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5894B43D49 for ; Mon, 1 May 2006 01:35:36 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k411ZaYi047621 for ; Mon, 1 May 2006 01:35:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k411ZZov047615 for perforce@freebsd.org; Mon, 1 May 2006 01:35:35 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 1 May 2006 01:35:35 GMT Message-Id: <200605010135.k411ZZov047615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 01:35:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=96462 Change 96462 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/01 01:35:27 dependencies for bucket locking support Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#11 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#10 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#15 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#13 (text+ko) ==== @@ -167,8 +167,6 @@ - - #define GET_TSB_SCRATCH_USER(reg) \ mov SCRATCH_REG_TSB_USER, reg; \ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; @@ -234,6 +232,7 @@ ldx [TF + TF_O6], %i6; \ ldx [TF + TF_O7], %i7; + #define SAVE_WINDOW(SBP) \ stx %l0, [SBP + (0*8)]; \ stx %l1, [SBP + (1*8)]; \ @@ -270,6 +269,26 @@ stxa %i6, [SBP + (14*8)]%asi; \ stxa %i7, [SBP + (15*8)]%asi; +#define SAVE_LOCALS_ASI(SBP) \ + stxa %l0, [SBP + (0*8)]%asi; \ + stxa %l1, [SBP + (1*8)]%asi; \ + stxa %l2, [SBP + (2*8)]%asi; \ + stxa %l3, [SBP + (3*8)]%asi; \ + stxa %l4, [SBP + (4*8)]%asi; \ + stxa %l5, [SBP + (5*8)]%asi; \ + stxa %l6, [SBP + (6*8)]%asi; \ + stxa %l7, [SBP + (7*8)]%asi; + +#define RESTORE_LOCALS_ASI(SBP) \ + ldxa [SBP + (0*8)]%asi, %l0; \ + ldxa [SBP + (1*8)]%asi, %l1; \ + ldxa [SBP + (2*8)]%asi, %l2; \ + ldxa [SBP + (3*8)]%asi, %l3; \ + ldxa [SBP + (4*8)]%asi, %l4; \ + ldxa [SBP + (5*8)]%asi, %l5; \ + ldxa [SBP + (6*8)]%asi, %l6; \ + ldxa [SBP + (7*8)]%asi, %l7; + #endif /* LOCORE */ #endif /* _KERNEL */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#5 (text+ko) ==== @@ -39,13 +39,16 @@ #include #include +extern void cpu_yield(void); #define TRAPF_PC(tfp) ((tfp)->tf_tpc) #define TRAPF_USERMODE(tfp) (((tfp)->tf_tstate & TSTATE_PRIV) == 0) #define cpu_getstack(td) ((td)->td_frame->tf_sp) #define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp)) -#define cpu_spinwait() hv_cpu_yield(); +#define cpu_spinwait() + + /* * CTL_MACHDEP definitions. ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#11 (text+ko) ==== @@ -71,9 +71,9 @@ u_long pc_tickref; \ u_long pc_tickadj; \ u_int pc_mid; \ - struct rwindow pc_kwbuf; \ - u_long pc_kwbuf_sp; \ - u_int pc_kwbuf_full; \ + struct rwindow pc_kwbuf[2]; \ + u_long pc_kwbuf_sp[2]; \ + u_int pc_kwbuf_full[2]; \ u_int pc_node; \ uint16_t pc_cpulist[MAXCPU] ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#7 (text+ko) ==== @@ -31,9 +31,11 @@ #ifdef _KERNEL + #define T_DATA_MISS 0x31 #define T_ALIGNMENT 0x34 #define T_DATA_PROTECTION 0x6c +#define T_MEM_ADDRESS_NOT_ALIGNED T_ALIGNMENT #define T_RESERVED 0 #define T_INSTRUCTION_EXCEPTION 1 @@ -44,49 +46,51 @@ #define T_PRIVILEGED_OPCODE 6 #define T_FP_DISABLED 7 #define T_FP_EXCEPTION_IEEE_754 8 -#define T_FP_EXCEPTION_OTHER 9 -#define T_TAG_OVERFLOW 10 -#define T_DIVISION_BY_ZERO 11 -#define T_DATA_EXCEPTION 12 -#define T_DATA_ERROR 13 + +#define T_INSTRUCTION_MISS 0x09 +#define T_TAG_OVERFLOW 0x0a +#define T_DIVISION_BY_ZERO 0x0b +#define T_DATA_EXCEPTION 0x0c +#define T_DATA_ERROR 0x0d + + +#define T_PRIVILEGED_ACTION 0x10 +#define T_ASYNC_DATA_ERROR 0x11 +#define T_TRAP_INSTRUCTION_16 0x12 +#define T_TRAP_INSTRUCTION_17 0x13 +#define T_TRAP_INSTRUCTION_18 0x14 +#define T_TRAP_INSTRUCTION_19 0x15 +#define T_TRAP_INSTRUCTION_20 0x16 +#define T_TRAP_INSTRUCTION_21 0x17 +#define T_TRAP_INSTRUCTION_22 0x18 +#define T_TRAP_INSTRUCTION_23 0x19 +#define T_TRAP_INSTRUCTION_24 0x1a +#define T_TRAP_INSTRUCTION_25 0x1b +#define T_TRAP_INSTRUCTION_26 0x1c +#define T_TRAP_INSTRUCTION_27 0x1d +#define T_TRAP_INSTRUCTION_28 0x1e +#define T_TRAP_INSTRUCTION_29 0x1f +#define T_TRAP_INSTRUCTION_30 0x20 +#define T_TRAP_INSTRUCTION_31 0x21 +#define T_FP_EXCEPTION_OTHER 0x22 -#define T_MEM_ADDRESS_NOT_ALIGNED 15 -#define T_PRIVILEGED_ACTION 16 -#define T_ASYNC_DATA_ERROR 17 -#define T_TRAP_INSTRUCTION_16 18 -#define T_TRAP_INSTRUCTION_17 19 -#define T_TRAP_INSTRUCTION_18 20 -#define T_TRAP_INSTRUCTION_19 21 -#define T_TRAP_INSTRUCTION_20 22 -#define T_TRAP_INSTRUCTION_21 23 -#define T_TRAP_INSTRUCTION_22 24 -#define T_TRAP_INSTRUCTION_23 25 -#define T_TRAP_INSTRUCTION_24 26 -#define T_TRAP_INSTRUCTION_25 27 -#define T_TRAP_INSTRUCTION_26 28 -#define T_TRAP_INSTRUCTION_27 29 -#define T_TRAP_INSTRUCTION_28 30 -#define T_TRAP_INSTRUCTION_29 31 -#define T_TRAP_INSTRUCTION_30 32 -#define T_TRAP_INSTRUCTION_31 33 -#define T_INSTRUCTION_MISS 34 -#define T_INTERRUPT 36 -#define T_PA_WATCHPOINT 37 -#define T_VA_WATCHPOINT 38 -#define T_CORRECTED_ECC_ERROR 39 -#define T_SPILL 40 -#define T_FILL 41 -#define T_FILL_RET 42 -#define T_BREAKPOINT 43 -#define T_CLEAN_WINDOW 44 -#define T_RANGE_CHECK 45 -#define T_FIX_ALIGNMENT 46 -#define T_INTEGER_OVERFLOW 47 -#define T_SYSCALL 48 -#define T_RSTRWP_PHYS 49 -#define T_RSTRWP_VIRT 50 +#define T_INTERRUPT 0x24 +#define T_PA_WATCHPOINT 0x25 +#define T_VA_WATCHPOINT 0x26 +#define T_CORRECTED_ECC_ERROR 0x27 +#define T_SPILL 0x28 +#define T_FILL 0x29 +#define T_FILL_RET 0x2a +#define T_BREAKPOINT 0x2b +#define T_CLEAN_WINDOW 0x2c +#define T_RANGE_CHECK 0x2d +#define T_FIX_ALIGNMENT 0x2e +#define T_INTEGER_OVERFLOW 0x2f +#define T_SYSCALL 0x30 +#define T_RSTRWP_PHYS +#define T_RSTRWP_VIRT #define T_KSTACK_FAULT 51 #define T_RESUMABLE_ERROR 52 #define T_NONRESUMABLE_ERROR 53 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#10 (text+ko) ==== @@ -14,6 +14,8 @@ tte_hash_t tte_hash_create(uint64_t context, uint64_t *scratchval); +void tte_hash_bucket_unlock(tte_hash_t hash, vm_offset_t va); + void tte_hash_destroy(tte_hash_t th); int tte_hash_delete(tte_hash_t hash, vm_offset_t va, int locked); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#15 (text+ko) ==== @@ -130,8 +130,27 @@ } +void +tte_hash_bucket_unlock(tte_hash_t th, vm_offset_t va) +{ + uint64_t hash_shift, hash_index; + tte_hash_field_t fields; + + /* XXX - only handle 8K pages for now */ + hash_shift = PAGE_SHIFT; + hash_index = (va >> hash_shift) & HASH_MASK(th); + fields = (th->th_hashtable[hash_index].the_fields); + +#ifdef DEBUG + if ((fields[0].tte.data & VTD_LOCK) == 0) + panic("trying to unlock bucket that isn't locked"); +#endif + fields[0].tte.data &= ~VTD_LOCK; + membar(StoreLoad); +} + static __inline void -hash_bucket_unlock(tte_hash_field_t fields) +hash_bucket_unlock_inline(tte_hash_field_t fields) { #ifdef DEBUG if ((fields[0].tte.data & VTD_LOCK) == 0) @@ -281,7 +300,7 @@ fields[lastindex].tte.data = 0; if (lastindex != 0) - hash_bucket_unlock(fields); + hash_bucket_unlock_inline(fields); return (vaindex < 4); } @@ -327,7 +346,7 @@ panic("collision handling unimplemented - please re-consider"); done: - hash_bucket_unlock(fields); + hash_bucket_unlock_inline(fields); th->th_entries++; } @@ -360,7 +379,7 @@ } } if (entry == NULL || leave_locked == FALSE) - hash_bucket_unlock(fields); + hash_bucket_unlock_inline(fields); /* * XXX handle the case of collisions > 3 From owner-p4-projects@FreeBSD.ORG Mon May 1 03:19:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6619F16A40F; Mon, 1 May 2006 03:19:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EDDA816A400 for ; Mon, 1 May 2006 03:19:42 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CD4743D45 for ; Mon, 1 May 2006 03:19:42 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k413JgaV005179 for ; Mon, 1 May 2006 03:19:42 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k413JfBl005167 for perforce@freebsd.org; Mon, 1 May 2006 03:19:41 GMT (envelope-from scottl@freebsd.org) Date: Mon, 1 May 2006 03:19:41 GMT Message-Id: <200605010319.k413JfBl005167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 96464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 03:19:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=96464 Change 96464 by scottl@scottl-junior on 2006/05/01 03:18:47 Have the SIMs provide a mutex when registering. This mutex will be used to also lock the periph and its resources. Also add a flags argument. It is used right now for malloc flags for allocating the SIM object, but it might be used later to indicate what kind of lock is being registered. The assumption right now is that the SIMs will only use a standard MTX_DEF mutex. It would be interesting to allow other kinds of synchronization primitives, but that involves either registering a lock/unlock function pointer, or detecting what kind of lock object is registered and acting on it accordingly. Since there will be at least one lock/unlock operation in the fast path of CAM, having it be done through an indirect function call will likely create measurable overhead. Thus, I doubt that this approach will be followed. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#5 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#4 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#22 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#3 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#3 edit .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#3 edit .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#2 edit .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#3 edit .. //depot/projects/scottl-camlock/src/sys/pci/ncr.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#5 (text+ko) ==== @@ -58,38 +58,30 @@ struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, const char *sim_name, void *softc, u_int32_t unit, - int max_dev_transactions, + struct mtx *mtx, int max_dev_transactions, int malloc_flags, int max_tagged_dev_transactions, struct cam_devq *queue) { struct cam_sim *sim; - /* - * If this is the xpt layer creating a sim, then it's OK - * to wait for an allocation. - * - * XXX Should we pass in a flag to indicate that wait is OK? - */ - if (strcmp(sim_name, "xpt") == 0) - sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), - M_CAMSIM, M_WAITOK); - else - sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), - M_CAMSIM, M_NOWAIT); + sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), + M_CAMSIM, malloc_flags); + + if (sim == NULL) + return (NULL); - if (sim != NULL) { - sim->sim_action = sim_action; - sim->sim_poll = sim_poll; - sim->sim_name = sim_name; - sim->softc = softc; - sim->path_id = CAM_PATH_ANY; - sim->unit_number = unit; - sim->bus_id = 0; /* set in xpt_bus_register */ - sim->max_tagged_dev_openings = max_tagged_dev_transactions; - sim->max_dev_openings = max_dev_transactions; - sim->flags = 0; - callout_handle_init(&sim->c_handle); - sim->devq = queue; - } + sim->sim_action = sim_action; + sim->sim_poll = sim_poll; + sim->sim_name = sim_name; + sim->softc = softc; + sim->path_id = CAM_PATH_ANY; + sim->unit_number = unit; + sim->bus_id = 0; /* set in xpt_bus_register */ + sim->max_tagged_dev_openings = max_tagged_dev_transactions; + sim->max_dev_openings = max_dev_transactions; + sim->flags = 0; + sim->mtx = mtx; + callout_handle_init(&sim->c_handle); + sim->devq = queue; return (sim); } ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#4 (text+ko) ==== @@ -56,6 +56,8 @@ const char *sim_name, void *softc, u_int32_t unit, + struct mtx *mtx, + int malloc_flags, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue); @@ -90,6 +92,7 @@ sim_poll_func sim_poll; const char *sim_name; void *softc; + struct mtx *mtx; u_int32_t path_id;/* The Boot device may set this to 0? */ u_int32_t unit_number; u_int32_t bus_id; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#22 (text+ko) ==== @@ -1431,6 +1431,8 @@ "xpt", /*softc*/NULL, /*unit*/0, + /*mtx*/&Giant, + /*flags*/M_WAITOK, /*max_dev_transactions*/0, /*max_tagged_dev_transactions*/0, devq); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#7 (text+ko) ==== @@ -1407,6 +1407,7 @@ scsi_low_poll_cam, DEVPORT_DEVNAME(slp->sl_dev), slp, DEVPORT_DEVUNIT(slp->sl_dev), + &Giant, M_NOWAIT, slp->sl_openings, tagged_openings, devq); if (slp->sl_si.sim == NULL) { ==== //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#5 (text+ko) ==== @@ -171,7 +171,7 @@ return (EIO); sim = cam_sim_alloc(aac_cam_action, aac_cam_poll, "aacp", camsc, - device_get_unit(dev), 1, 1, devq); + device_get_unit(dev), &Giant, M_NOWAIT, 1, 1, devq); if (sim == NULL) { cam_simq_free(devq); return (EIO); ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#6 (text+ko) ==== @@ -1397,7 +1397,7 @@ * Construct our SIM entry. */ adv->sim = cam_sim_alloc(adv_action, adv_poll, "adv", adv, adv->unit, - 1, adv->max_openings, devq); + &Giant, M_NOWAIT, 1, adv->max_openings, devq); if (adv->sim == NULL) return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#5 (text+ko) ==== @@ -1220,7 +1220,7 @@ * Construct our SIM entry. */ adw->sim = cam_sim_alloc(adw_action, adw_poll, "adw", adw, adw->unit, - 1, adw->max_acbs, devq); + &Giant, M_NOWAIT, 1, adw->max_acbs, devq); if (adw->sim == NULL) { error = ENOMEM; goto fail; ==== //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#4 (text+ko) ==== @@ -604,8 +604,8 @@ /* * Construct our SIM entry */ - aha->sim = cam_sim_alloc(ahaaction, ahapoll, "aha", aha, aha->unit, 2, - tagged_dev_openings, devq); + aha->sim = cam_sim_alloc(ahaaction, ahapoll, "aha", aha, aha->unit, + &Giant, M_NOWAIT, 2, tagged_dev_openings, devq); if (aha->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#4 (text+ko) ==== @@ -550,7 +550,7 @@ * Construct our SIM entry */ ahb->sim = cam_sim_alloc(ahbaction, ahbpoll, "ahb", ahb, ahb->unit, - 2, ahb->num_ecbs, devq); + &Giant, M_NOWAIT, 2, ahb->num_ecbs, devq); if (ahb->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#3 (text+ko) ==== @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include #include #include @@ -1519,7 +1522,7 @@ * Construct our SIM entry */ aic->sim = cam_sim_alloc(aic_action, aic_poll, "aic", aic, - aic->unit, 2, 256, devq); + aic->unit, &Giant, M_NOWAIT, 2, 256, devq); if (aic->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#7 (text+ko) ==== @@ -143,7 +143,7 @@ */ sim = cam_sim_alloc(ahd_action, ahd_poll, "ahd", ahd, device_get_unit(ahd->dev_softc), - 1, /*XXX*/256, devq); + &Giant, M_NOWAIT, 1, /*XXX*/256, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#6 (text+ko) ==== @@ -194,7 +194,7 @@ */ sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - 1, AHC_MAX_QUEUE, devq); + &Giant, M_NOWAIT, 1, AHC_MAX_QUEUE, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; @@ -225,7 +225,8 @@ if (ahc->features & AHC_TWIN) { sim2 = cam_sim_alloc(ahc_action, ahc_poll, "ahc", - ahc, device_get_unit(ahc->dev_softc), 1, + ahc, device_get_unit(ahc->dev_softc), + &Giant, M_NOWAIT, 1, AHC_MAX_QUEUE, devq); if (sim2 == NULL) { ==== //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#5 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -2456,8 +2457,8 @@ } amd->psim = cam_sim_alloc(amd_action, amd_poll, "amd", - amd, amd->unit, 1, MAX_TAGS_CMD_QUEUE, - devq); + amd, amd->unit, &Giant, M_NOWAIT, + 1, MAX_TAGS_CMD_QUEUE, devq); if (amd->psim == NULL) { cam_simq_free(devq); if (bootverbose) ==== //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#5 (text+ko) ==== @@ -148,6 +148,8 @@ "amr", sc, device_get_unit(sc->amr_dev), + &Giant, + M_NOWAIT, 1, AMR_MAX_SCSI_CMDS, devq)) == NULL) { ==== //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#3 (text+ko) ==== @@ -2405,7 +2405,7 @@ printf("arcmsr_attach: cam_simq_alloc failure!\n"); return ENXIO; } - pACB->psim=cam_sim_alloc(arcmsr_action,arcmsr_poll,"arcmsr",pACB,pACB->pci_unit,1,ARCMSR_MAX_OUTSTANDING_CMD,devq); + pACB->psim=cam_sim_alloc(arcmsr_action,arcmsr_poll,"arcmsr",pACB,pACB->pci_unit,&Giant,M_NOWAIT,1,ARCMSR_MAX_OUTSTANDING_CMD,devq); if(pACB->psim == NULL) { arcmsr_free_resource(pACB); ==== //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#6 (text+ko) ==== @@ -2651,7 +2651,8 @@ * Construct our first channel SIM entry */ sc->ha_sim[bus] = cam_sim_alloc(asr_action, asr_poll, "asr", sc, - unit, 1, QueueSize, devq); + unit, &Giant, M_NOWAIT, + 1, QueueSize, devq); if (sc->ha_sim[bus] == NULL) { continue; } ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#6 (text+ko) ==== @@ -210,7 +210,7 @@ } if ((sim = cam_sim_alloc(atapi_action, atapi_poll, "ata", - (void *)scp, unit, 1, 1, devq)) == NULL) { + (void *)scp, unit, &Giant, M_NOWAIT, 1, 1, devq)) == NULL) { error = ENOMEM; goto out; } ==== //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#4 (text+ko) ==== @@ -873,7 +873,7 @@ * Construct our SIM entry */ bt->sim = cam_sim_alloc(btaction, btpoll, "bt", bt, bt->unit, - 2, tagged_dev_openings, devq); + &Giant, M_NOWAIT, 2, tagged_dev_openings, devq); if (bt->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#7 (text+ko) ==== @@ -2475,8 +2475,8 @@ if ((sc->ciss_cam_sim[i] = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), + &Giant, M_NOWAIT, 1, sc->ciss_max_requests - 2, - 1, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM for controller %d\n", i); return(ENOMEM); @@ -2498,8 +2498,8 @@ if ((sc->ciss_cam_sim[i] = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), + &Giant, M_NOWAIT, 1, sc->ciss_max_requests - 2, - 1, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM for controller %d\n", i); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#4 (text+ko) ==== @@ -1548,7 +1548,8 @@ * Construct our SIM entry */ dpt->sims[i] = cam_sim_alloc(dpt_action, dpt_poll, "dpt", - dpt, dpt->unit, /*untagged*/2, + dpt, dpt->unit, &Giant, + M_NOWAIT, /*untagged*/2, /*tagged*/dpt->max_dccbs, devq); if (dpt->sims[i] == NULL) { if (i == 0) ==== //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#5 (text+ko) ==== @@ -325,7 +325,7 @@ } sim = cam_sim_alloc(ncr53c9x_action, ncr53c9x_poll, "esp", sc, - device_get_unit(sc->sc_dev), 1, + device_get_unit(sc->sc_dev), &Giant, M_NOWAIT, 1, NCR_TAG_DEPTH, devq); if (sim == NULL) { device_printf(sc->sc_dev, "cannot allocate SIM entry\n"); ==== //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#5 (text+ko) ==== @@ -1960,6 +1960,7 @@ sbp->sim = cam_sim_alloc(sbp_action, sbp_poll, "sbp", sbp, device_get_unit(dev), + &Giant, M_NOWAIT, /*untagged*/ 1, /*tagged*/ SBP_QUEUE_LEN - 1, devq); ==== //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#4 (text+ko) ==== @@ -1627,7 +1627,7 @@ return (ENXIO); sc->sim = cam_sim_alloc(sbp_targ_action, sbp_targ_poll, - "sbp_targ", sc, device_get_unit(dev), + "sbp_targ", sc, device_get_unit(dev), &Giant, M_NOWAIT, /*untagged*/ 1, /*tagged*/ 1, devq); if (sc->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#4 (text+ko) ==== @@ -1967,7 +1967,8 @@ * Construct our SIM entry */ if ((hpt_vsim = cam_sim_alloc(hpt_action, hpt_poll, __str(PROC_DIR_NAME), - pAdapter, device_get_unit(pAdapter->hpt_dev), /*untagged*/1, /*tagged*/8, devq)) == NULL) { + pAdapter, device_get_unit(pAdapter->hpt_dev), + &Giant, M_NOWAIT, /*untagged*/1, /*tagged*/8, devq)) == NULL) { cam_simq_free(devq); return ENOMEM; } ==== //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#6 (text+ko) ==== @@ -503,7 +503,8 @@ * Construct our SIM entry */ gdt->sims[i] = cam_sim_alloc(iir_action, iir_poll, "iir", - gdt, gdt->sc_hanum, /*untagged*/1, + gdt, gdt->sc_hanum, &Giant, + M_NOWAIT, /*untagged*/1, /*tagged*/GDT_MAXCMDS, devq); if (xpt_bus_register(gdt->sims[i], i) != CAM_SUCCESS) { cam_sim_free(gdt->sims[i], /*free_devq*/i == 0); ==== //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#8 (text+ko) ==== @@ -110,7 +110,8 @@ */ ISPLOCK_2_CAMLOCK(isp); sim = cam_sim_alloc(isp_action, isp_poll, "isp", isp, - device_get_unit(isp->isp_dev), 1, isp->isp_maxcmds, devq); + device_get_unit(isp->isp_dev), &Giant, M_NOWAIT, 1, + isp->isp_maxcmds, devq); if (sim == NULL) { cam_simq_free(devq); CAMLOCK_2_ISPLOCK(isp); @@ -187,7 +188,8 @@ if (IS_DUALBUS(isp)) { ISPLOCK_2_CAMLOCK(isp); sim = cam_sim_alloc(isp_action, isp_poll, "isp", isp, - device_get_unit(isp->isp_dev), 1, isp->isp_maxcmds, devq); + device_get_unit(isp->isp_dev), &Giant, M_NOWAIT, 1, + isp->isp_maxcmds, devq); if (sim == NULL) { xpt_bus_deregister(cam_sim_path(isp->isp_sim)); xpt_free_path(isp->isp_path); ==== //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#4 (text+ko) ==== @@ -1943,6 +1943,7 @@ if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, device_get_unit(sc->mly_dev), + &Giant, M_NOWAIT, sc->mly_controllerinfo->maximum_parallel_commands, 1, devq)) == NULL) { return(ENOMEM); @@ -1962,6 +1963,7 @@ for (i = 0; i < sc->mly_controllerinfo->virtual_channels_present; i++, chn++) { if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, device_get_unit(sc->mly_dev), + &Giant, M_NOWAIT, sc->mly_controllerinfo->maximum_parallel_commands, 0, devq)) == NULL) { return(ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#6 (text+ko) ==== @@ -290,7 +290,7 @@ * Construct our SIM entry. */ mpt->sim = cam_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, - mpt->unit, 1, maxq, devq); + mpt->unit, &Giant, M_NOWAIT, 1, maxq, devq); if (mpt->sim == NULL) { mpt_prt(mpt, "Unable to allocate CAM SIM!\n"); cam_simq_free(devq); @@ -327,7 +327,7 @@ * Create a "bus" to export all hidden disks to CAM. */ mpt->phydisk_sim = cam_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, - mpt->unit, 1, maxq, devq); + mpt->unit, &Giant, M_NOWAIT, 1, maxq, devq); if (mpt->phydisk_sim == NULL) { mpt_prt(mpt, "Unable to allocate Physical Disk CAM SIM!\n"); error = ENOMEM; ==== //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#3 (text+ko) ==== @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include #include @@ -161,6 +163,7 @@ vpo->sim = cam_sim_alloc(vpo_action, vpo_poll, "vpo", vpo, device_get_unit(dev), + &Giant, M_NOWAIT, /*untagged*/1, /*tagged*/0, devq); if (vpo->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#2 (text) ==== @@ -1087,7 +1087,8 @@ } vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name, - vbus_ext, 0, os_max_queue_comm, /*tagged*/8, devq); + vbus_ext, 0, &Giant, M_NOWAIT, + os_max_queue_comm, /*tagged*/8, devq); if (!vbus_ext->sim) { os_printk("cam_sim_alloc failed"); ==== //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#5 (text+ko) ==== @@ -9095,7 +9095,7 @@ * Construct our SIM entry. */ sim = cam_sim_alloc(sym_action, sym_poll, "sym", np, np->unit, - 1, SYM_SETUP_MAX_TAG, devq); + &Giant, M_NOWAIT, 1, SYM_SETUP_MAX_TAG, devq); if (!sim) goto fail; devq = 0; ==== //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#5 (text+ko) ==== @@ -3620,6 +3620,8 @@ "trm", pACB, unit, + &Giant, + M_NOWAIT, 1, TRM_MAX_TAGS_CMD_QUEUE, device_Q); ==== //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#5 (text+ko) ==== @@ -102,7 +102,7 @@ */ tw_osli_dbg_dprintf(3, sc, "Calling cam_sim_alloc"); sc->sim = cam_sim_alloc(twa_action, twa_poll, "twa", sc, - device_get_unit(sc->bus_dev), + device_get_unit(sc->bus_dev), &Giant, M_NOWAIT, TW_OSLI_MAX_NUM_IOS - 1, 1, devq); if (sc->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#8 (text+ko) ==== @@ -110,6 +110,8 @@ #include #include #include +#include +#include #include #include @@ -2245,6 +2247,7 @@ DEVNAME_SIM, sc /*priv*/, USBDEVUNIT(sc->sc_dev) /*unit number*/, + &Giant, M_NOWAIT, 1 /*maximum device openings*/, 0 /*maximum tagged device openings*/, devq); ==== //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#3 (text+ko) ==== @@ -132,6 +132,7 @@ #include #include #include +#include #include #include @@ -605,7 +606,7 @@ goto bad; sim = cam_sim_alloc(wds_action, wds_poll, "wds", (void *) wp, - wp->unit, 1, 1, devq); + wp->unit, &Giant, M_NOWAIT, 1, 1, devq); if (sim == NULL) { cam_simq_free(devq); goto bad; ==== //depot/projects/scottl-camlock/src/sys/pci/ncr.c#6 (text+ko) ==== @@ -184,6 +184,8 @@ #include #include #include +#include +#include #include #include #include @@ -3787,7 +3789,7 @@ ** about our bus. */ np->sim = cam_sim_alloc(ncr_action, ncr_poll, "ncr", np, np->unit, - 1, MAX_TAGS, devq); + &Giant, M_NOWAIT, 1, MAX_TAGS, devq); if (np->sim == NULL) { cam_simq_free(devq); return ENOMEM; From owner-p4-projects@FreeBSD.ORG Mon May 1 06:37:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D91016A403; Mon, 1 May 2006 06:37:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E1C5616A401 for ; Mon, 1 May 2006 06:37:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9397943D46 for ; Mon, 1 May 2006 06:37:43 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k416bhre022441 for ; Mon, 1 May 2006 06:37:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k416bhSc022438 for perforce@freebsd.org; Mon, 1 May 2006 06:37:43 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 1 May 2006 06:37:43 GMT Message-Id: <200605010637.k416bhSc022438@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 06:37:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=96471 Change 96471 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/01 06:36:42 small fixes to data exception errors in the simulator Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#14 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#45 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#14 (text+ko) ==== @@ -143,6 +143,10 @@ mov SCRATCH_REG_PCPU, PCPU_REG; \ ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; +#define GET_PCPU_SCRATCH_SLOW(reg) \ + mov SCRATCH_REG_PCPU, reg; \ + ldxa [reg]ASI_SCRATCHPAD, PCPU_REG; + #define GET_HASH_SCRATCH_USER(reg) \ mov SCRATCH_REG_HASH_USER, reg; \ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#45 (text+ko) ==== @@ -321,7 +321,8 @@ mov MMFSA_D_ADDR, %g3 ! mov MMFSA_D_CTX, %g7 ldxa [%g1 + %g3]ASI_REAL, %g3 - ldxa [%g1 + %g7]ASI_REAL, %g4 +! ldxa [%g1 + %g7]ASI_REAL, %g4 + sub %g0, 1, %g4 or %g4, %g3, %g3 ba,pt %xcc, tl0_trap mov T_MEM_ADDRESS_NOT_ALIGNED, %g2 @@ -920,10 +921,9 @@ ENTRY(utl0) - nop SAVE_GLOBALS(%l7) SAVE_OUTS(%l7) - GET_PCPU_SCRATCH + GET_PCPU_SCRATCH_SLOW(%g6) wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints brnz %o1, common_utrap @@ -945,8 +945,6 @@ sub %g6, TF_SIZEOF, %sp add %sp, REGOFF + SPOFF, %l7 ENTRY(user_rtt) - GET_PCPU_SCRATCH - ! pil handling needs to be re-visited wrpr %g0, PIL_TICK, %pil ldx [PCPU(CURTHREAD)], %l4 @@ -1101,8 +1099,8 @@ ENTRY(ktl0) nop SAVE_GLOBALS(%l7) - SAVE_OUTS(%l7) - GET_PCPU_SCRATCH + SAVE_OUTS(%l7) + GET_PCPU_SCRATCH_SLOW(%g6) ! we really shouldn't need this ... wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints brnz %o1, common_ktrap @@ -1387,7 +1385,6 @@ nop save 0: - cmp %g7, 1 ! for tl > 1 bne,pn %xcc, 2f nop @@ -1579,13 +1576,15 @@ cmp %l2, %l6 bne,pt %xcc, 12f nop -#ifndef SIMULATOR +#ifndef SMP + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! die if all we're doing + ! is storing same data +#else PUTCHAR(0x5a) PUTCHAR(0x5a) PUTCHAR(0x5a) + MAGIC_TRAP_ON; MAGIC_TRAP_OFF #endif - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! die if all we're doing - ! is storing same data 12: #endif stxa %g0, [%g3 + %l4]ASI_REAL ! invalidate data From owner-p4-projects@FreeBSD.ORG Mon May 1 08:58:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1A6816A404; Mon, 1 May 2006 08:58:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6402316A401 for ; Mon, 1 May 2006 08:58:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F4A543D48 for ; Mon, 1 May 2006 08:58:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k418wuVp007678 for ; Mon, 1 May 2006 08:58:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k418wtVP007672 for perforce@freebsd.org; Mon, 1 May 2006 08:58:55 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 08:58:55 GMT Message-Id: <200605010858.k418wtVP007672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 08:58:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=96473 Change 96473 by jb@jb_freebsd2 on 2006/05/01 08:57:59 The function callbacks occur during a syscall and they have no way to report errors, so they might as well be void functions. If they can't do what they were intended to do, the best that they can do is just shut the %$&k up. Affected files ... .. //depot/projects/dtrace/src/sys/sys/sysent.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/sysent.h#3 (text+ko) ==== @@ -42,13 +42,13 @@ typedef int sy_call_t(struct thread *, void *); /* Used by the machine dependent syscall() code. */ -typedef int (*systrace_probe_func_t)(u_int32_t, int, struct sysent *, void *); +typedef void (*systrace_probe_func_t)(u_int32_t, int, struct sysent *, void *); /* * Used by loaded syscalls to convert arguments to a DTrace array * of 64-bit arguments. */ -typedef int (*systrace_args_func_t)(void *, u_int64_t *, int *); +typedef void (*systrace_args_func_t)(void *, u_int64_t *, int *); extern systrace_probe_func_t systrace_probe_func; From owner-p4-projects@FreeBSD.ORG Mon May 1 08:59:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39CA116A409; Mon, 1 May 2006 08:59:00 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1544516A401 for ; Mon, 1 May 2006 08:59:00 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD66143D46 for ; Mon, 1 May 2006 08:58:59 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k418wx9j007720 for ; Mon, 1 May 2006 08:58:59 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k418wu1b007681 for perforce@freebsd.org; Mon, 1 May 2006 08:58:56 GMT (envelope-from gnn@neville-neil.com) Date: Mon, 1 May 2006 08:58:56 GMT Message-Id: <200605010858.k418wu1b007681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 96474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 08:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=96474 Change 96474 by gnn@fast_ipsec_integ on 2006/05/01 08:58:14 Integrate from HEAD Affected files ... .. //depot/projects/fast_ipsec/src/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/isa/isa.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/obio.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 delete .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/lib.c#2 delete .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/lib.h#2 delete .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/main.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/xmodem.c#2 delete .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0/xmodem.h#2 delete .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 delete .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/NOTES#7 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#11 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.alpha#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.amd64#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.i386#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.ia64#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.pc98#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#10 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.alpha#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.amd64#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.i386#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.ia64#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.pc98#5 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ddb/db_command.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwireg.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwivar.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_ebus.c#4 delete .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_sbus.c#4 delete .. //depot/projects/fast_ipsec/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/pucvar.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/README#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/array.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/him.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/list.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sab/sab.c#4 delete .. //depot/projects/fast_ipsec/src/sys/dev/sab/sab82532reg.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/fast_ipsec/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/minidump.h#1 branch .. //depot/projects/fast_ipsec/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_clock.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/serdev_if.m#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_rman.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket2.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/modules/Makefile#8 integrate .. //depot/projects/fast_ipsec/src/sys/modules/puc/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/sio/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sk/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netflow/netflow.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netnatm/natm.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/ppc.c#4 delete .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/ppcreg.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/include/minidump.h#1 branch .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sk.c#7 delete .. //depot/projects/fast_ipsec/src/sys/pci/if_skreg.h#4 delete .. //depot/projects/fast_ipsec/src/sys/pci/xmaciireg.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pci/yukonreg.h#2 delete .. //depot/projects/fast_ipsec/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/bus.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/lock.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mac_policy.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/module.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/param.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/sys/rman.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/turnstile.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/vnode.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_pageq.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/alpha/conf/DEFAULTS#2 (text+ko) ==== @@ -1,11 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.4 2006/04/28 21:21:50 marcel Exp $ machine alpha # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#5 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.193 2006/04/24 08:44:33 delphij Exp $ cpu EV4 cpu EV5 @@ -70,8 +70,6 @@ options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current @@ -106,6 +104,8 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion ==== //depot/projects/fast_ipsec/src/sys/alpha/isa/isa.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.39 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -231,6 +231,7 @@ res = rman_reserve_resource(&isa_drq_rman, start, start, 1, 0, child); + rman_set_rid(res, *rid); if (res && !passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); ==== //depot/projects/fast_ipsec/src/sys/alpha/pci/apecs_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.16 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/fast_ipsec/src/sys/alpha/pci/lca_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.18 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/fast_ipsec/src/sys/alpha/pci/pcibus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.37 2005/09/25 20:12:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.39 2006/04/22 19:04:21 marcel Exp $"); #include "opt_isa.h" @@ -96,7 +96,7 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + return (isa_alloc_intr(0, 0, irqs[chan])); } int @@ -230,9 +230,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +254,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rstart = rman_get_start(rv); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rstart); ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,12 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); #include #include #include #include +#include #include #include #include @@ -40,6 +41,11 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); +int do_minidump = 1; +TUNABLE_INT("debug.minidump", &do_minidump); +SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0, + "Enable mini crash dumps"); + /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This * is to protect us from metadata and to protect metadata from us. @@ -272,6 +278,10 @@ size_t hdrsz; int error; + if (do_minidump) { + minidumpsys(di); + return; + } bzero(&ehdr, sizeof(ehdr)); ehdr.e_ident[EI_MAG0] = ELFMAG0; ehdr.e_ident[EI_MAG1] = ELFMAG1; ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); #include #include @@ -96,6 +96,8 @@ typedef u_char bool_t; +static void fpu_clean_state(void); + int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, @@ -407,6 +409,8 @@ PCPU_SET(fpcurthread, curthread); pcb = PCPU_GET(curpcb); + fpu_clean_state(); + if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* * This is the first time this thread has used the FPU, @@ -474,6 +478,7 @@ s = intr_disable(); if (td == PCPU_GET(fpcurthread)) { + fpu_clean_state(); fxrstor(addr); intr_restore(s); } else { @@ -484,6 +489,37 @@ } /* + * On AuthenticAMD processors, the fxrstor instruction does not restore + * the x87's stored last instruction pointer, last data pointer, and last + * opcode values, except in the rare case in which the exception summary + * (ES) bit in the x87 status word is set to 1. + * + * In order to avoid leaking this information across processes, we clean + * these values by performing a dummy load before executing fxrstor(). + */ +static double dummy_variable = 0.0; +static void +fpu_clean_state(void) +{ + u_short status; + + /* + * Clear the ES bit in the x87 status word if it is currently + * set, in order to avoid causing a fault in the upcoming load. + */ + fnstsw(&status); + if (status & 0x80) + fnclex(); + + /* + * Load the dummy variable into the x87 stack. This mangles + * the x87 stack, but we don't care since we're about to call + * fxrstor() anyway. + */ + __asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable)); +} + +/* * This really sucks. We want the acpi version only, but it requires * the isa_if.h file in order to get the definitions. */ ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/identcpu.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); #include "opt_cpu.h" @@ -233,7 +233,7 @@ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017" + "\017XTPR" /* Send Task Priority Messages*/ "\020" "\021" "\022" @@ -360,7 +360,8 @@ else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && (cpu_high >= 4)) { cpuid_count(4, 0, regs); - cmp = ((regs[0] & 0xfc000000) >> 26) + 1; + if ((regs[0] & 0x1f) != 0) + cmp = ((regs[0] >> 26) & 0x3f) + 1; } if (cmp > 1) printf("\n Cores per package: %d", cmp); ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.271 2006/03/18 19:32:46 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.273 2006/04/25 00:06:37 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -183,6 +183,7 @@ mp_topology(void) { struct cpu_group *group; + u_int regs[4]; int logical_cpus; int apic_id; int groups; @@ -195,6 +196,13 @@ logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; if (logical_cpus <= 1) return; + /* Nothing to do if reported cores are physical cores. */ + if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) { + cpuid_count(4, 0, regs); + if ((regs[0] & 0x1f) != 0 && + logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1) + return; + } group = &mp_groups[0]; groups = 1; for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { @@ -385,8 +393,8 @@ * are available, use them. */ if (cpu_high >= 4) { - /* Ask the processor about up to 32 caches. */ - for (i = 0; i < 32; i++) { + /* Ask the processor about the L1 cache. */ + for (i = 0; i < 1; i++) { cpuid_count(4, i, p); threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1; if (hyperthreading_cpus < threads_per_cache) ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.67 2005/09/25 20:03:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -340,7 +340,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { rman_set_bustag(rv, AMD64_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.552 2006/04/29 00:59:15 alc Exp $"); /* * Manages physical address maps. @@ -181,7 +181,7 @@ static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ -static u_int64_t KPDPphys; /* phys addr of kernel level 3 */ +u_int64_t KPDPphys; /* phys addr of kernel level 3 */ u_int64_t KPML4phys; /* phys addr of kernel level 4 */ static u_int64_t DMPDphys; /* phys addr of direct mapped level 2 */ @@ -1449,6 +1449,9 @@ static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); + #ifdef PV_STATS static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; @@ -1464,8 +1467,6 @@ static long pv_entry_frees, pv_entry_allocs; static int pv_entry_spare; -SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, - "Current number of pv entries"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, "Current number of pv entry frees"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, @@ -1545,9 +1546,10 @@ struct pv_chunk *pc; int idx, field, bit; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc = pv_to_chunk(pv); idx = pv - &pc->pc_pventry[0]; field = idx / 64; @@ -1565,9 +1567,8 @@ /* entire chunk is free, return it */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); - vm_page_lock_queues(); + dump_drop_page(m->phys_addr); vm_page_free(m); - vm_page_unlock_queues(); } /* @@ -1588,7 +1589,7 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_allocs++); - PV_STAT(pv_entry_count++); + pv_entry_count++; if (pv_entry_count > pv_entry_high_water) pagedaemon_wakeup(); pc = TAILQ_FIRST(&pmap->pm_pvchunk); @@ -1616,6 +1617,7 @@ m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { + pv_entry_count--; PV_STAT(pc_chunk_tryfail++); return (NULL); } @@ -1644,6 +1646,7 @@ PV_STAT(pc_chunk_count++); PV_STAT(pc_chunk_allocs++); colour++; + dump_add_page(m->phys_addr); pc = (void *)PHYS_TO_DMAP(m->phys_addr); pc->pc_pmap = pmap; pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ @@ -2057,6 +2060,7 @@ boolean_t wired) { vm_paddr_t pa; + pd_entry_t *pde; register pt_entry_t *pte; vm_paddr_t opa; pt_entry_t origpte, newpte; @@ -2094,7 +2098,13 @@ } #endif - pte = pmap_pte(pmap, va); + pde = pmap_pde(pmap, va); + if (pde != NULL) { + if ((*pde & PG_PS) != 0) + panic("pmap_enter: attempted pmap_enter on 2MB page"); + pte = pmap_pde_to_pte(pde, va); + } else + pte = NULL; /* * Page Directory table entry not valid, we need a new PT page @@ -2107,9 +2117,6 @@ origpte = *pte; opa = origpte & PG_FRAME; - if (origpte & PG_PS) - panic("pmap_enter: attempted pmap_enter on 2MB page"); - /* * Mapping has not changed, must be protection or wiring change. */ @@ -2777,7 +2784,7 @@ /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc->pc_map[field] |= bitmask; m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -2793,14 +2800,13 @@ PV_STAT(pc_chunk_frees++); TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); - vm_page_lock_queues(); + dump_drop_page(m->phys_addr); vm_page_free(m); - vm_page_unlock_queues(); } } + vm_page_unlock_queues(); pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); } /* ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.1 2003/10/14 05:51:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.2 2006/04/21 04:24:50 peter Exp $"); #include #include @@ -44,6 +44,7 @@ { static vm_pindex_t colour; vm_page_t m; + vm_paddr_t pa; void *va; int pflags; @@ -64,7 +65,9 @@ } else break; } - va = (void *)PHYS_TO_DMAP(m->phys_addr); + pa = m->phys_addr; + dump_add_page(pa); + va = (void *)PHYS_TO_DMAP(pa); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) pagezero(va); return (va); @@ -74,8 +77,11 @@ uma_small_free(void *mem, int size, u_int8_t flags) { vm_page_t m; + vm_paddr_t pa; - m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); + pa = DMAP_TO_PHYS((vm_offset_t)mem); + dump_drop_page(pa); + m = PHYS_TO_VM_PAGE(pa); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); ==== //depot/projects/fast_ipsec/src/sys/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.4 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ machine amd64 @@ -11,5 +11,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device - -options PUC_FASTINTR ==== //depot/projects/fast_ipsec/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.452 2006/04/10 20:04:22 ps Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.454 2006/04/28 05:23:10 scottl Exp $ cpu HAMMER ident GENERIC @@ -57,10 +57,6 @@ options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -98,7 +94,11 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device ahd # AHA39320/29320 and onboard AIC79xx devices +options AHD_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~215k to driver. device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family #device ispfw # Firmware for QLogic HBAs- normally a module @@ -128,6 +128,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.52 2006/03/06 15:29:28 yar Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.53 2006/04/28 05:23:10 scottl Exp $ # # @@ -281,6 +281,11 @@ device hptmv # +# Highpoint RocketRAID 232x. This is software RAID but with hardware +# acceleration assistance for RAID_5. +device rr232x + +# # IBM (now Adaptec) ServeRAID controllers device ips ==== //depot/projects/fast_ipsec/src/sys/amd64/include/md_var.h#3 (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/amd64/include/md_var.h,v 1.76 2005/10/14 22:52:00 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.77 2006/04/21 04:24:50 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -53,6 +53,8 @@ extern char kstack[]; extern char sigcode[]; extern int szsigcode; +extern uint64_t *vm_page_dump; +extern int vm_page_dump_size; extern struct pcpu __pcpu[]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 09:00:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FC7D16A412; Mon, 1 May 2006 09:00:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CABD516A401 for ; Mon, 1 May 2006 09:00:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C956A43D5F for ; Mon, 1 May 2006 09:00:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41901UK008529 for ; Mon, 1 May 2006 09:00:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41901d4008500 for perforce@freebsd.org; Mon, 1 May 2006 09:00:01 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 09:00:01 GMT Message-Id: <200605010900.k41901d4008500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 09:00:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=96477 Change 96477 by jb@jb_freebsd2 on 2006/05/01 08:59:28 Implement the DTrace syscall provider callbacks. Affected files ... .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/i386/trap.c#3 (text+ko) ==== @@ -115,6 +115,13 @@ * 'no-fault' DTrace probe. */ dtrace_instr_size_func_t dtrace_instr_size_func; + +/* + * This is a hook which is initialised by the systrace module + * when it is loaded. This keeps the DTrace syscall provider + * implementation opaque. + */ +systrace_probe_func_t systrace_probe_func; #endif extern void trap(struct trapframe frame); @@ -1086,6 +1093,17 @@ td->td_retval[0] = 0; td->td_retval[1] = frame.tf_edx; +#ifdef KDTRACE + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'entry', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_entry != 0) + (*systrace_probe_func)(callp->sy_entry, code, callp, + args); +#endif + STOPEVENT(p, S_SCE, narg); PTRACESTOP_SC(p, td, S_PT_SCE); @@ -1093,6 +1111,20 @@ AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); AUDIT_SYSCALL_EXIT(error, td); + +#ifdef KDTRACE + args[0] = error; + args[1] = error; + + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'return', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_return != 0) + (*systrace_probe_func)(callp->sy_return, code, NULL, + args); +#endif } switch (error) { From owner-p4-projects@FreeBSD.ORG Mon May 1 09:14:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99E1616A403; Mon, 1 May 2006 09:14:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 41A7716A400 for ; Mon, 1 May 2006 09:14:25 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA7AC43D45 for ; Mon, 1 May 2006 09:14:24 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k419EOn6016739 for ; Mon, 1 May 2006 09:14:24 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k419EDLG016605 for perforce@freebsd.org; Mon, 1 May 2006 09:14:13 GMT (envelope-from gnn@neville-neil.com) Date: Mon, 1 May 2006 09:14:13 GMT Message-Id: <200605010914.k419EDLG016605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 96479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 09:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=96479 Change 96479 by gnn@gnn_devbox_fast_ipsec on 2006/05/01 09:13:21 Integrate my own view from HEAD Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/lib.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/lib.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/xmodem.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/xmodem.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/cam.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/NOTES#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.alpha#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.amd64#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.i386#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.ia64#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.pc98#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.alpha#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.amd64#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.i386#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.ia64#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.pc98#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_ebus.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_sbus.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/pucvar.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/README#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/array.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/him.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/list.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sab/sab.c#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sab/sab82532reg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/minidump.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_clock.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/serdev_if.m#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/Makefile#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/puc/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/sio/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/sk/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/netflow.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netnatm/natm.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/ppc.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/ppcreg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/minidump.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_sk.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_skreg.h#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/xmaciireg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/yukonreg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/lock.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/module.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/param.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/rman.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/turnstile.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/vnode.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/DEFAULTS#2 (text+ko) ==== @@ -1,11 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.4 2006/04/28 21:21:50 marcel Exp $ machine alpha # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/GENERIC#4 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.193 2006/04/24 08:44:33 delphij Exp $ cpu EV4 cpu EV5 @@ -70,8 +70,6 @@ options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current @@ -106,6 +104,8 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/isa/isa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.39 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -231,6 +231,7 @@ res = rman_reserve_resource(&isa_drq_rman, start, start, 1, 0, child); + rman_set_rid(res, *rid); if (res && !passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/apecs_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.16 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/lca_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.18 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/pcibus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.37 2005/09/25 20:12:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.39 2006/04/22 19:04:21 marcel Exp $"); #include "opt_isa.h" @@ -96,7 +96,7 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + return (isa_alloc_intr(0, 0, irqs[chan])); } int @@ -230,9 +230,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +254,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rstart = rman_get_start(rv); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rstart); ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,12 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); #include #include #include #include +#include #include #include #include @@ -40,6 +41,11 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); +int do_minidump = 1; +TUNABLE_INT("debug.minidump", &do_minidump); +SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0, + "Enable mini crash dumps"); + /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This * is to protect us from metadata and to protect metadata from us. @@ -272,6 +278,10 @@ size_t hdrsz; int error; + if (do_minidump) { + minidumpsys(di); + return; + } bzero(&ehdr, sizeof(ehdr)); ehdr.e_ident[EI_MAG0] = ELFMAG0; ehdr.e_ident[EI_MAG1] = ELFMAG1; ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); #include #include @@ -96,6 +96,8 @@ typedef u_char bool_t; +static void fpu_clean_state(void); + int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, @@ -407,6 +409,8 @@ PCPU_SET(fpcurthread, curthread); pcb = PCPU_GET(curpcb); + fpu_clean_state(); + if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* * This is the first time this thread has used the FPU, @@ -474,6 +478,7 @@ s = intr_disable(); if (td == PCPU_GET(fpcurthread)) { + fpu_clean_state(); fxrstor(addr); intr_restore(s); } else { @@ -484,6 +489,37 @@ } /* + * On AuthenticAMD processors, the fxrstor instruction does not restore + * the x87's stored last instruction pointer, last data pointer, and last + * opcode values, except in the rare case in which the exception summary + * (ES) bit in the x87 status word is set to 1. + * + * In order to avoid leaking this information across processes, we clean + * these values by performing a dummy load before executing fxrstor(). + */ +static double dummy_variable = 0.0; +static void +fpu_clean_state(void) +{ + u_short status; + + /* + * Clear the ES bit in the x87 status word if it is currently + * set, in order to avoid causing a fault in the upcoming load. + */ + fnstsw(&status); + if (status & 0x80) + fnclex(); + + /* + * Load the dummy variable into the x87 stack. This mangles + * the x87 stack, but we don't care since we're about to call + * fxrstor() anyway. + */ + __asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable)); +} + +/* * This really sucks. We want the acpi version only, but it requires * the isa_if.h file in order to get the definitions. */ ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); #include "opt_cpu.h" @@ -233,7 +233,7 @@ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017" + "\017XTPR" /* Send Task Priority Messages*/ "\020" "\021" "\022" @@ -360,7 +360,8 @@ else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && (cpu_high >= 4)) { cpuid_count(4, 0, regs); - cmp = ((regs[0] & 0xfc000000) >> 26) + 1; + if ((regs[0] & 0x1f) != 0) + cmp = ((regs[0] >> 26) & 0x3f) + 1; } if (cmp > 1) printf("\n Cores per package: %d", cmp); ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.271 2006/03/18 19:32:46 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.273 2006/04/25 00:06:37 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -183,6 +183,7 @@ mp_topology(void) { struct cpu_group *group; + u_int regs[4]; int logical_cpus; int apic_id; int groups; @@ -195,6 +196,13 @@ logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; if (logical_cpus <= 1) return; + /* Nothing to do if reported cores are physical cores. */ + if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) { + cpuid_count(4, 0, regs); + if ((regs[0] & 0x1f) != 0 && + logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1) + return; + } group = &mp_groups[0]; groups = 1; for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { @@ -385,8 +393,8 @@ * are available, use them. */ if (cpu_high >= 4) { - /* Ask the processor about up to 32 caches. */ - for (i = 0; i < 32; i++) { + /* Ask the processor about the L1 cache. */ + for (i = 0; i < 1; i++) { cpuid_count(4, i, p); threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1; if (hyperthreading_cpus < threads_per_cache) ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.67 2005/09/25 20:03:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -340,7 +340,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { rman_set_bustag(rv, AMD64_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.552 2006/04/29 00:59:15 alc Exp $"); /* * Manages physical address maps. @@ -181,7 +181,7 @@ static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ -static u_int64_t KPDPphys; /* phys addr of kernel level 3 */ +u_int64_t KPDPphys; /* phys addr of kernel level 3 */ u_int64_t KPML4phys; /* phys addr of kernel level 4 */ static u_int64_t DMPDphys; /* phys addr of direct mapped level 2 */ @@ -1449,6 +1449,9 @@ static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); + #ifdef PV_STATS static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; @@ -1464,8 +1467,6 @@ static long pv_entry_frees, pv_entry_allocs; static int pv_entry_spare; -SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, - "Current number of pv entries"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, "Current number of pv entry frees"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, @@ -1545,9 +1546,10 @@ struct pv_chunk *pc; int idx, field, bit; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc = pv_to_chunk(pv); idx = pv - &pc->pc_pventry[0]; field = idx / 64; @@ -1565,9 +1567,8 @@ /* entire chunk is free, return it */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); - vm_page_lock_queues(); + dump_drop_page(m->phys_addr); vm_page_free(m); - vm_page_unlock_queues(); } /* @@ -1588,7 +1589,7 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_allocs++); - PV_STAT(pv_entry_count++); + pv_entry_count++; if (pv_entry_count > pv_entry_high_water) pagedaemon_wakeup(); pc = TAILQ_FIRST(&pmap->pm_pvchunk); @@ -1616,6 +1617,7 @@ m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { + pv_entry_count--; PV_STAT(pc_chunk_tryfail++); return (NULL); } @@ -1644,6 +1646,7 @@ PV_STAT(pc_chunk_count++); PV_STAT(pc_chunk_allocs++); colour++; + dump_add_page(m->phys_addr); pc = (void *)PHYS_TO_DMAP(m->phys_addr); pc->pc_pmap = pmap; pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ @@ -2057,6 +2060,7 @@ boolean_t wired) { vm_paddr_t pa; + pd_entry_t *pde; register pt_entry_t *pte; vm_paddr_t opa; pt_entry_t origpte, newpte; @@ -2094,7 +2098,13 @@ } #endif - pte = pmap_pte(pmap, va); + pde = pmap_pde(pmap, va); + if (pde != NULL) { + if ((*pde & PG_PS) != 0) + panic("pmap_enter: attempted pmap_enter on 2MB page"); + pte = pmap_pde_to_pte(pde, va); + } else + pte = NULL; /* * Page Directory table entry not valid, we need a new PT page @@ -2107,9 +2117,6 @@ origpte = *pte; opa = origpte & PG_FRAME; - if (origpte & PG_PS) - panic("pmap_enter: attempted pmap_enter on 2MB page"); - /* * Mapping has not changed, must be protection or wiring change. */ @@ -2777,7 +2784,7 @@ /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc->pc_map[field] |= bitmask; m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -2793,14 +2800,13 @@ PV_STAT(pc_chunk_frees++); TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); - vm_page_lock_queues(); + dump_drop_page(m->phys_addr); vm_page_free(m); - vm_page_unlock_queues(); } } + vm_page_unlock_queues(); pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); } /* ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.1 2003/10/14 05:51:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.2 2006/04/21 04:24:50 peter Exp $"); #include #include @@ -44,6 +44,7 @@ { static vm_pindex_t colour; vm_page_t m; + vm_paddr_t pa; void *va; int pflags; @@ -64,7 +65,9 @@ } else break; } - va = (void *)PHYS_TO_DMAP(m->phys_addr); + pa = m->phys_addr; + dump_add_page(pa); + va = (void *)PHYS_TO_DMAP(pa); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) pagezero(va); return (va); @@ -74,8 +77,11 @@ uma_small_free(void *mem, int size, u_int8_t flags) { vm_page_t m; + vm_paddr_t pa; - m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); + pa = DMAP_TO_PHYS((vm_offset_t)mem); + dump_drop_page(pa); + m = PHYS_TO_VM_PAGE(pa); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.4 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ machine amd64 @@ -11,5 +11,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device - -options PUC_FASTINTR ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.452 2006/04/10 20:04:22 ps Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.454 2006/04/28 05:23:10 scottl Exp $ cpu HAMMER ident GENERIC @@ -57,10 +57,6 @@ options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -98,7 +94,11 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device ahd # AHA39320/29320 and onboard AIC79xx devices +options AHD_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~215k to driver. device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family #device ispfw # Firmware for QLogic HBAs- normally a module @@ -128,6 +128,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.52 2006/03/06 15:29:28 yar Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.53 2006/04/28 05:23:10 scottl Exp $ # # @@ -281,6 +281,11 @@ device hptmv # +# Highpoint RocketRAID 232x. This is software RAID but with hardware +# acceleration assistance for RAID_5. +device rr232x + +# # IBM (now Adaptec) ServeRAID controllers device ips ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/md_var.h#2 (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/amd64/include/md_var.h,v 1.76 2005/10/14 22:52:00 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.77 2006/04/21 04:24:50 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -53,6 +53,8 @@ extern char kstack[]; extern char sigcode[]; extern int szsigcode; +extern uint64_t *vm_page_dump; +extern int vm_page_dump_size; extern struct pcpu __pcpu[]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 09:16:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A56B16A458; Mon, 1 May 2006 09:16:38 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5C00216A432 for ; Mon, 1 May 2006 09:16:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8F3A43D77 for ; Mon, 1 May 2006 09:16:27 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k419GR1I018316 for ; Mon, 1 May 2006 09:16:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k419GRg5018310 for perforce@freebsd.org; Mon, 1 May 2006 09:16:27 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 09:16:27 GMT Message-Id: <200605010916.k419GRg5018310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 09:16:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=96480 Change 96480 by jb@jb_freebsd2 on 2006/05/01 09:16:03 This is the DTrace syscall provider. It is implemented in a module called 'systrace' because that's what Sun calls it. Confused? This provider has 'entry' and 'return' probes for all syscalls, including those that are loaded via a module and registered using syscall_register(). This is a very good example of how simple a DTrace provider can be. It contains just 300 lines, including the CDDL header. It calls just 5 DTrace functions (in the dtrace module): dtrace_probe dtrace_probe_create dtrace_probe_lookup dtrace_register dtrace_unregister As an example of what it can do: @dtrace -n 'syscall::open:entry { trace(copyinstr(arg0)) }' -n 'END { trace("Done\n") }' followed by an 'rlogin' from another system, reports: CPU ID FUNCTION:NAME 0 14 open:entry /etc/hosts.allow 0 14 open:entry /etc/spwd.db 0 14 open:entry /etc/login.conf.db 0 14 open:entry /etc/group 0 14 open:entry /root/.login_conf.db 0 14 open:entry /root/.login_conf 0 14 open:entry /etc/login.conf.db 0 14 open:entry /etc/libmap.conf 0 14 open:entry /var/run/ld-elf.so.hints 0 14 open:entry /lib/libutil.so.5 0 14 open:entry /lib/libc.so.6 0 14 open:entry /etc/nsswitch.conf 0 14 open:entry /etc/hosts 0 14 open:entry /etc/hosts 0 14 open:entry /etc/protocols 0 14 open:entry /etc/spwd.db 0 14 open:entry /etc/hosts.equiv 0 14 open:entry /etc/hosts 0 14 open:entry /etc/hosts 0 14 open:entry /etc/hosts 0 14 open:entry /etc/hosts 0 14 open:entry /etc/hosts 0 14 open:entry /etc/group 0 14 open:entry /dev/ptyp0 0 14 open:entry /dev/ptyp1 0 14 open:entry /dev/ptyp2 0 14 open:entry /dev/ttyp2 0 14 open:entry /etc/libmap.conf 0 14 open:entry /var/run/ld-elf.so.hints 0 14 open:entry /lib/libutil.so.5 0 14 open:entry /usr/lib/libpam.so.3 0 14 open:entry /usr/lib/libbsm.so.1 0 14 open:entry /lib/libc.so.6 0 14 open:entry /etc/login.conf.db 0 14 open:entry /etc/pam.d/login 0 14 open:entry /usr/lib/pam_nologin.so.3 0 14 open:entry /usr/lib/pam_self.so.3 0 14 open:entry /etc/pam.d/system 0 14 open:entry /usr/lib/pam_opie.so.3 0 14 open:entry /usr/lib/libopie.so.4 0 14 open:entry /lib/libmd.so.3 0 14 open:entry /usr/lib/pam_opieaccess.so.3 0 14 open:entry /usr/lib/pam_unix.so.3 0 14 open:entry /lib/libcrypt.so.3 0 14 open:entry /usr/lib/libypclnt.so.2 0 14 open:entry /usr/lib/pam_securetty.so.3 0 14 open:entry /etc/pam.d/system 0 14 open:entry /usr/lib/pam_login_access.so.3 0 14 open:entry /etc/pam.d/system 0 14 open:entry /usr/lib/pam_lastlog.so.3 0 14 open:entry /etc/pam.d/system 0 14 open:entry /etc/nsswitch.conf 0 14 open:entry /etc/spwd.db 0 14 open:entry /etc/login.conf.db 0 14 open:entry /u/users/jb/.login_conf.db 0 14 open:entry /u/users/jb/.login_conf 0 14 open:entry /etc/login.conf.db 0 14 open:entry /etc/fbtab 0 14 open:entry /etc/group 0 14 open:entry /etc/ttys 0 14 open:entry /etc/localtime 0 14 open:entry /etc/group 0 14 open:entry /u/users/jb/.login_conf.db 0 14 open:entry /u/users/jb/.login_conf 0 14 open:entry /etc/login.conf.db 0 14 open:entry /etc/spwd.db 0 14 open:entry /var/log/lastlog 0 14 open:entry /etc/ttys 0 14 open:entry /var/run/utmp 0 14 open:entry /var/log/wtmp 0 14 open:entry /u/users/jb/.login_conf.db 0 14 open:entry /u/users/jb/.login_conf 0 14 open:entry /etc/login.conf.db 0 14 open:entry /etc/COPYRIGHT 0 14 open:entry /etc/motd 0 14 open:entry /etc/libmap.conf 0 14 open:entry /var/run/ld-elf.so.hints 0 14 open:entry /lib/libedit.so.5 0 14 open:entry /lib/libncurses.so.6 0 14 open:entry /lib/libc.so.6 0 14 open:entry /dev/tty 0 14 open:entry /etc/profile 0 14 open:entry .profile 0 14 open:entry /etc/libmap.conf 0 14 open:entry /var/run/ld-elf.so.hints 0 14 open:entry /lib/libc.so.6 0 14 open:entry /etc/libmap.conf 0 14 open:entry /var/run/ld-elf.so.hints 0 14 open:entry /lib/libc.so.6 0 14 open:entry /u/users/jb/.termcap.db 0 14 open:entry /u/users/jb/.termcap 0 14 open:entry /usr/share/misc/termcap.db 0 14 open:entry /u/users/jb/.editrc 0 14 open:entry /etc/libmap.conf 0 14 open:entry /var/run/ld-elf.so.hints 0 14 open:entry /lib/libc.so.6 0 14 open:entry /var/run/utmp 0 14 open:entry /var/log/wtmp 0 14 open:entry /var/run/utmp 0 2 :END Done For a list of probes: $dtrace -l ID PROVIDER MODULE FUNCTION NAME 1 dtrace BEGIN 2 dtrace END 3 dtrace ERROR 4 syscall syscall entry 5 syscall syscall return 6 syscall exit entry 7 syscall exit return 8 syscall fork entry 9 syscall fork return 10 syscall read entry 11 syscall read return 12 syscall write entry 13 syscall write return 14 syscall open entry 15 syscall open return 16 syscall close entry 17 syscall close return 18 syscall wait4 entry 19 syscall wait4 return 20 syscall old.creat entry 21 syscall old.creat return 22 syscall link entry 23 syscall link return 24 syscall unlink entry 25 syscall unlink return 26 syscall obs_execv entry 27 syscall obs_execv return 28 syscall chdir entry 29 syscall chdir return 30 syscall fchdir entry 31 syscall fchdir return 32 syscall mknod entry 33 syscall mknod return 34 syscall chmod entry 35 syscall chmod return 36 syscall chown entry 37 syscall chown return 38 syscall break entry 39 syscall break return 40 syscall old.getfsstat entry 41 syscall old.getfsstat return 42 syscall old.lseek entry 43 syscall old.lseek return 44 syscall getpid entry 45 syscall getpid return 46 syscall mount entry 47 syscall mount return 48 syscall unmount entry 49 syscall unmount return 50 syscall setuid entry 51 syscall setuid return 52 syscall getuid entry 53 syscall getuid return 54 syscall geteuid entry 55 syscall geteuid return 56 syscall ptrace entry 57 syscall ptrace return 58 syscall recvmsg entry 59 syscall recvmsg return 60 syscall sendmsg entry 61 syscall sendmsg return 62 syscall recvfrom entry 63 syscall recvfrom return 64 syscall accept entry 65 syscall accept return 66 syscall getpeername entry 67 syscall getpeername return 68 syscall getsockname entry 69 syscall getsockname return 70 syscall access entry 71 syscall access return 72 syscall chflags entry 73 syscall chflags return 74 syscall fchflags entry 75 syscall fchflags return 76 syscall sync entry 77 syscall sync return 78 syscall kill entry 79 syscall kill return 80 syscall old.stat entry 81 syscall old.stat return 82 syscall getppid entry 83 syscall getppid return 84 syscall old.lstat entry 85 syscall old.lstat return 86 syscall dup entry 87 syscall dup return 88 syscall pipe entry 89 syscall pipe return 90 syscall getegid entry 91 syscall getegid return 92 syscall profil entry 93 syscall profil return 94 syscall ktrace entry 95 syscall ktrace return 96 syscall old.sigaction entry 97 syscall old.sigaction return 98 syscall getgid entry 99 syscall getgid return 100 syscall old.sigprocmask entry 101 syscall old.sigprocmask return 102 syscall getlogin entry 103 syscall getlogin return 104 syscall setlogin entry 105 syscall setlogin return 106 syscall acct entry 107 syscall acct return 108 syscall old.sigpending entry 109 syscall old.sigpending return 110 syscall sigaltstack entry 111 syscall sigaltstack return 112 syscall ioctl entry 113 syscall ioctl return 114 syscall reboot entry 115 syscall reboot return 116 syscall revoke entry 117 syscall revoke return 118 syscall symlink entry 119 syscall symlink return 120 syscall readlink entry 121 syscall readlink return 122 syscall execve entry 123 syscall execve return 124 syscall umask entry 125 syscall umask return 126 syscall chroot entry 127 syscall chroot return 128 syscall old.fstat entry 129 syscall old.fstat return 130 syscall old.getkerninfo entry 131 syscall old.getkerninfo return 132 syscall old.getpagesize entry 133 syscall old.getpagesize return 134 syscall msync entry 135 syscall msync return 136 syscall vfork entry 137 syscall vfork return 138 syscall obs_vread entry 139 syscall obs_vread return 140 syscall obs_vwrite entry 141 syscall obs_vwrite return 142 syscall sbrk entry 143 syscall sbrk return 144 syscall sstk entry 145 syscall sstk return 146 syscall old.mmap entry 147 syscall old.mmap return 148 syscall vadvise entry 149 syscall vadvise return 150 syscall munmap entry 151 syscall munmap return 152 syscall mprotect entry 153 syscall mprotect return 154 syscall madvise entry 155 syscall madvise return 156 syscall obs_vhangup entry 157 syscall obs_vhangup return 158 syscall obs_vlimit entry 159 syscall obs_vlimit return 160 syscall mincore entry 161 syscall mincore return 162 syscall getgroups entry 163 syscall getgroups return 164 syscall setgroups entry 165 syscall setgroups return 166 syscall getpgrp entry 167 syscall getpgrp return 168 syscall setpgid entry 169 syscall setpgid return 170 syscall setitimer entry 171 syscall setitimer return 172 syscall old.wait entry 173 syscall old.wait return 174 syscall swapon entry 175 syscall swapon return 176 syscall getitimer entry 177 syscall getitimer return 178 syscall old.gethostname entry 179 syscall old.gethostname return 180 syscall old.sethostname entry 181 syscall old.sethostname return 182 syscall getdtablesize entry 183 syscall getdtablesize return 184 syscall dup2 entry 185 syscall dup2 return 186 syscall #91 entry 187 syscall #91 return 188 syscall fcntl entry 189 syscall fcntl return 190 syscall select entry 191 syscall select return 192 syscall #94 entry 193 syscall #94 return 194 syscall fsync entry 195 syscall fsync return 196 syscall setpriority entry 197 syscall setpriority return 198 syscall socket entry 199 syscall socket return 200 syscall connect entry 201 syscall connect return 202 syscall old.accept entry 203 syscall old.accept return 204 syscall getpriority entry 205 syscall getpriority return 206 syscall old.send entry 207 syscall old.send return 208 syscall old.recv entry 209 syscall old.recv return 210 syscall old.sigreturn entry 211 syscall old.sigreturn return 212 syscall bind entry 213 syscall bind return 214 syscall setsockopt entry 215 syscall setsockopt return 216 syscall listen entry 217 syscall listen return 218 syscall obs_vtimes entry 219 syscall obs_vtimes return 220 syscall old.sigvec entry 221 syscall old.sigvec return 222 syscall old.sigblock entry 223 syscall old.sigblock return 224 syscall old.sigsetmask entry 225 syscall old.sigsetmask return 226 syscall old.sigsuspend entry 227 syscall old.sigsuspend return 228 syscall old.sigstack entry 229 syscall old.sigstack return 230 syscall old.recvmsg entry 231 syscall old.recvmsg return 232 syscall old.sendmsg entry 233 syscall old.sendmsg return 234 syscall obs_vtrace entry 235 syscall obs_vtrace return 236 syscall gettimeofday entry 237 syscall gettimeofday return 238 syscall getrusage entry 239 syscall getrusage return 240 syscall getsockopt entry 241 syscall getsockopt return 242 syscall #119 entry 243 syscall #119 return 244 syscall readv entry 245 syscall readv return 246 syscall writev entry 247 syscall writev return 248 syscall settimeofday entry 249 syscall settimeofday return 250 syscall fchown entry 251 syscall fchown return 252 syscall fchmod entry 253 syscall fchmod return 254 syscall old.recvfrom entry 255 syscall old.recvfrom return 256 syscall setreuid entry 257 syscall setreuid return 258 syscall setregid entry 259 syscall setregid return 260 syscall rename entry 261 syscall rename return 262 syscall old.truncate entry 263 syscall old.truncate return 264 syscall old.ftruncate entry 265 syscall old.ftruncate return 266 syscall flock entry 267 syscall flock return 268 syscall mkfifo entry 269 syscall mkfifo return 270 syscall sendto entry 271 syscall sendto return 272 syscall shutdown entry 273 syscall shutdown return 274 syscall socketpair entry 275 syscall socketpair return 276 syscall mkdir entry 277 syscall mkdir return 278 syscall rmdir entry 279 syscall rmdir return 280 syscall utimes entry 281 syscall utimes return 282 syscall obs_4.2 entry 283 syscall obs_4.2 return 284 syscall adjtime entry 285 syscall adjtime return 286 syscall old.getpeername entry 287 syscall old.getpeername return 288 syscall old.gethostid entry 289 syscall old.gethostid return 290 syscall old.sethostid entry 291 syscall old.sethostid return 292 syscall old.getrlimit entry 293 syscall old.getrlimit return 294 syscall old.setrlimit entry 295 syscall old.setrlimit return 296 syscall old.killpg entry 297 syscall old.killpg return 298 syscall setsid entry 299 syscall setsid return 300 syscall quotactl entry 301 syscall quotactl return 302 syscall old.quota entry 303 syscall old.quota return 304 syscall old.getsockname entry 305 syscall old.getsockname return 306 syscall #151 entry 307 syscall #151 return 308 syscall #152 entry 309 syscall #152 return 310 syscall #153 entry 311 syscall #153 return 312 syscall #154 entry 313 syscall #154 return 314 syscall nfssvc entry 315 syscall nfssvc return 316 syscall old.getdirentries entry 317 syscall old.getdirentries return 318 syscall old.statfs entry 319 syscall old.statfs return 320 syscall old.fstatfs entry 321 syscall old.fstatfs return 322 syscall #159 entry 323 syscall #159 return 324 syscall lgetfh entry 325 syscall lgetfh return 326 syscall getfh entry 327 syscall getfh return 328 syscall getdomainname entry 329 syscall getdomainname return 330 syscall setdomainname entry 331 syscall setdomainname return 332 syscall uname entry 333 syscall uname return 334 syscall sysarch entry 335 syscall sysarch return 336 syscall rtprio entry 337 syscall rtprio return 338 syscall #167 entry 339 syscall #167 return 340 syscall #168 entry 341 syscall #168 return 342 syscall semsys entry 343 syscall semsys return 344 syscall msgsys entry 345 syscall msgsys return 346 syscall shmsys entry 347 syscall shmsys return 348 syscall #172 entry 349 syscall #172 return 350 syscall pread entry 351 syscall pread return 352 syscall pwrite entry 353 syscall pwrite return 354 syscall #175 entry 355 syscall #175 return 356 syscall ntp_adjtime entry 357 syscall ntp_adjtime return 358 syscall #177 entry 359 syscall #177 return 360 syscall #178 entry 361 syscall #178 return 362 syscall #179 entry 363 syscall #179 return 364 syscall #180 entry 365 syscall #180 return 366 syscall setgid entry 367 syscall setgid return 368 syscall setegid entry 369 syscall setegid return 370 syscall seteuid entry 371 syscall seteuid return 372 syscall #184 entry 373 syscall #184 return 374 syscall #185 entry 375 syscall #185 return 376 syscall #186 entry 377 syscall #186 return 378 syscall #187 entry 379 syscall #187 return 380 syscall stat entry 381 syscall stat return 382 syscall fstat entry 383 syscall fstat return 384 syscall lstat entry 385 syscall lstat return 386 syscall pathconf entry 387 syscall pathconf return 388 syscall fpathconf entry 389 syscall fpathconf return 390 syscall #193 entry 391 syscall #193 return 392 syscall getrlimit entry 393 syscall getrlimit return 394 syscall setrlimit entry 395 syscall setrlimit return 396 syscall getdirentries entry 397 syscall getdirentries return 398 syscall mmap entry 399 syscall mmap return 400 syscall __syscall entry 401 syscall __syscall return 402 syscall lseek entry 403 syscall lseek return 404 syscall truncate entry 405 syscall truncate return 406 syscall ftruncate entry 407 syscall ftruncate return 408 syscall __sysctl entry 409 syscall __sysctl return 410 syscall mlock entry 411 syscall mlock return 412 syscall munlock entry 413 syscall munlock return 414 syscall undelete entry 415 syscall undelete return 416 syscall futimes entry 417 syscall futimes return 418 syscall getpgid entry 419 syscall getpgid return 420 syscall #208 entry 421 syscall #208 return 422 syscall poll entry 423 syscall poll return 424 syscall lkmnosys entry 425 syscall lkmnosys return 426 syscall __semctl entry 427 syscall __semctl return 428 syscall semget entry 429 syscall semget return 430 syscall semop entry 431 syscall semop return 432 syscall #223 entry 433 syscall #223 return 434 syscall msgctl entry 435 syscall msgctl return 436 syscall msgget entry 437 syscall msgget return 438 syscall msgsnd entry 439 syscall msgsnd return 440 syscall msgrcv entry 441 syscall msgrcv return 442 syscall shmat entry 443 syscall shmat return 444 syscall shmctl entry 445 syscall shmctl return 446 syscall shmdt entry 447 syscall shmdt return 448 syscall shmget entry 449 syscall shmget return 450 syscall clock_gettime entry 451 syscall clock_gettime return 452 syscall clock_settime entry 453 syscall clock_settime return 454 syscall clock_getres entry 455 syscall clock_getres return 456 syscall ktimer_create entry 457 syscall ktimer_create return 458 syscall ktimer_delete entry 459 syscall ktimer_delete return 460 syscall ktimer_settime entry 461 syscall ktimer_settime return 462 syscall ktimer_gettime entry 463 syscall ktimer_gettime return 464 syscall ktimer_getoverrun entry 465 syscall ktimer_getoverrun return 466 syscall nanosleep entry 467 syscall nanosleep return 468 syscall #241 entry 469 syscall #241 return 470 syscall #242 entry 471 syscall #242 return 472 syscall #243 entry 473 syscall #243 return 474 syscall #244 entry 475 syscall #244 return 476 syscall #245 entry 477 syscall #245 return 478 syscall #246 entry 479 syscall #246 return 480 syscall #247 entry 481 syscall #247 return 482 syscall ntp_gettime entry 483 syscall ntp_gettime return 484 syscall #249 entry 485 syscall #249 return 486 syscall minherit entry 487 syscall minherit return 488 syscall rfork entry 489 syscall rfork return 490 syscall openbsd_poll entry 491 syscall openbsd_poll return 492 syscall issetugid entry 493 syscall issetugid return 494 syscall lchown entry 495 syscall lchown return 496 syscall aio_read entry 497 syscall aio_read return 498 syscall aio_write entry 499 syscall aio_write return 500 syscall lio_listio entry 501 syscall lio_listio return 502 syscall #258 entry 503 syscall #258 return 504 syscall #259 entry 505 syscall #259 return 506 syscall #260 entry 507 syscall #260 return 508 syscall #261 entry 509 syscall #261 return 510 syscall #262 entry 511 syscall #262 return 512 syscall #263 entry 513 syscall #263 return 514 syscall #264 entry 515 syscall #264 return 516 syscall #265 entry 517 syscall #265 return 518 syscall #266 entry 519 syscall #266 return 520 syscall #267 entry 521 syscall #267 return 522 syscall #268 entry 523 syscall #268 return 524 syscall #269 entry 525 syscall #269 return 526 syscall #270 entry 527 syscall #270 return 528 syscall #271 entry 529 syscall #271 return 530 syscall getdents entry 531 syscall getdents return 532 syscall #273 entry 533 syscall #273 return 534 syscall lchmod entry 535 syscall lchmod return 536 syscall netbsd_lchown entry 537 syscall netbsd_lchown return 538 syscall lutimes entry 539 syscall lutimes return 540 syscall netbsd_msync entry 541 syscall netbsd_msync return 542 syscall nstat entry 543 syscall nstat return 544 syscall nfstat entry 545 syscall nfstat return 546 syscall nlstat entry 547 syscall nlstat return 548 syscall #281 entry 549 syscall #281 return 550 syscall #282 entry 551 syscall #282 return 552 syscall #283 entry 553 syscall #283 return 554 syscall #284 entry 555 syscall #284 return 556 syscall #285 entry 557 syscall #285 return 558 syscall #286 entry 559 syscall #286 return 560 syscall #287 entry 561 syscall #287 return 562 syscall #288 entry 563 syscall #288 return 564 syscall preadv entry 565 syscall preadv return 566 syscall pwritev entry 567 syscall pwritev return 568 syscall #291 entry 569 syscall #291 return 570 syscall #292 entry 571 syscall #292 return 572 syscall #293 entry 573 syscall #293 return 574 syscall #294 entry 575 syscall #294 return 576 syscall #295 entry 577 syscall #295 return 578 syscall #296 entry 579 syscall #296 return 580 syscall old.fhstatfs entry 581 syscall old.fhstatfs return 582 syscall fhopen entry 583 syscall fhopen return 584 syscall fhstat entry 585 syscall fhstat return 586 syscall modnext entry 587 syscall modnext return 588 syscall modstat entry 589 syscall modstat return 590 syscall modfnext entry 591 syscall modfnext return 592 syscall modfind entry 593 syscall modfind return 594 syscall kldload entry 595 syscall kldload return 596 syscall kldunload entry 597 syscall kldunload return 598 syscall kldfind entry 599 syscall kldfind return 600 syscall kldnext entry 601 syscall kldnext return 602 syscall kldstat entry 603 syscall kldstat return 604 syscall kldfirstmod entry 605 syscall kldfirstmod return 606 syscall getsid entry 607 syscall getsid return 608 syscall setresuid entry 609 syscall setresuid return 610 syscall setresgid entry 611 syscall setresgid return 612 syscall obs_signanosleep entry 613 syscall obs_signanosleep return 614 syscall aio_return entry 615 syscall aio_return return 616 syscall aio_suspend entry 617 syscall aio_suspend return 618 syscall aio_cancel entry 619 syscall aio_cancel return 620 syscall aio_error entry 621 syscall aio_error return 622 syscall oaio_read entry 623 syscall oaio_read return 624 syscall oaio_write entry 625 syscall oaio_write return 626 syscall olio_listio entry 627 syscall olio_listio return 628 syscall yield entry 629 syscall yield return 630 syscall obs_thr_sleep entry 631 syscall obs_thr_sleep return 632 syscall obs_thr_wakeup entry 633 syscall obs_thr_wakeup return 634 syscall mlockall entry 635 syscall mlockall return 636 syscall munlockall entry 637 syscall munlockall return 638 syscall __getcwd entry 639 syscall __getcwd return 640 syscall sched_setparam entry 641 syscall sched_setparam return 642 syscall sched_getparam entry 643 syscall sched_getparam return 644 syscall sched_setscheduler entry 645 syscall sched_setscheduler return 646 syscall sched_getscheduler entry 647 syscall sched_getscheduler return 648 syscall sched_yield entry 649 syscall sched_yield return 650 syscall sched_get_priority_max entry 651 syscall sched_get_priority_max return 652 syscall sched_get_priority_min entry 653 syscall sched_get_priority_min return 654 syscall sched_rr_get_interval entry 655 syscall sched_rr_get_interval return 656 syscall utrace entry 657 syscall utrace return 658 syscall old.sendfile entry 659 syscall old.sendfile return 660 syscall kldsym entry 661 syscall kldsym return 662 syscall jail entry 663 syscall jail return 664 syscall #339 entry 665 syscall #339 return 666 syscall sigprocmask entry 667 syscall sigprocmask return 668 syscall sigsuspend entry 669 syscall sigsuspend return 670 syscall sigpending entry 671 syscall sigpending return 672 syscall sigtimedwait entry 673 syscall sigtimedwait return 674 syscall sigwaitinfo entry 675 syscall sigwaitinfo return 676 syscall __acl_get_file entry 677 syscall __acl_get_file return 678 syscall __acl_set_file entry 679 syscall __acl_set_file return 680 syscall __acl_get_fd entry 681 syscall __acl_get_fd return 682 syscall __acl_set_fd entry 683 syscall __acl_set_fd return 684 syscall __acl_delete_file entry 685 syscall __acl_delete_file return 686 syscall __acl_delete_fd entry 687 syscall __acl_delete_fd return 688 syscall __acl_aclcheck_file entry 689 syscall __acl_aclcheck_file return 690 syscall __acl_aclcheck_fd entry 691 syscall __acl_aclcheck_fd return 692 syscall extattrctl entry 693 syscall extattrctl return 694 syscall extattr_set_file entry 695 syscall extattr_set_file return 696 syscall extattr_get_file entry 697 syscall extattr_get_file return 698 syscall extattr_delete_file entry 699 syscall extattr_delete_file return 700 syscall aio_waitcomplete entry 701 syscall aio_waitcomplete return 702 syscall getresuid entry 703 syscall getresuid return 704 syscall getresgid entry 705 syscall getresgid return 706 syscall kqueue entry 707 syscall kqueue return 708 syscall kevent entry 709 syscall kevent return 710 syscall #364 entry 711 syscall #364 return 712 syscall #365 entry 713 syscall #365 return 714 syscall #366 entry 715 syscall #366 return 716 syscall #367 entry 717 syscall #367 return 718 syscall #368 entry 719 syscall #368 return 720 syscall #369 entry 721 syscall #369 return 722 syscall lkmressys entry 723 syscall lkmressys return 724 syscall extattr_set_fd entry 725 syscall extattr_set_fd return 726 syscall extattr_get_fd entry 727 syscall extattr_get_fd return 728 syscall extattr_delete_fd entry 729 syscall extattr_delete_fd return 730 syscall __setugid entry 731 syscall __setugid return 732 syscall nfsclnt entry 733 syscall nfsclnt return 734 syscall eaccess entry 735 syscall eaccess return 736 syscall #377 entry 737 syscall #377 return 738 syscall nmount entry 739 syscall nmount return 740 syscall kse_exit entry 741 syscall kse_exit return 742 syscall kse_wakeup entry 743 syscall kse_wakeup return 744 syscall kse_create entry 745 syscall kse_create return 746 syscall kse_thr_interrupt entry 747 syscall kse_thr_interrupt return 748 syscall kse_release entry 749 syscall kse_release return 750 syscall __mac_get_proc entry 751 syscall __mac_get_proc return 752 syscall __mac_set_proc entry 753 syscall __mac_set_proc return 754 syscall __mac_get_fd entry 755 syscall __mac_get_fd return 756 syscall __mac_get_file entry 757 syscall __mac_get_file return 758 syscall __mac_set_fd entry 759 syscall __mac_set_fd return 760 syscall __mac_set_file entry 761 syscall __mac_set_file return 762 syscall kenv entry 763 syscall kenv return 764 syscall lchflags entry 765 syscall lchflags return 766 syscall uuidgen entry 767 syscall uuidgen return 768 syscall sendfile entry 769 syscall sendfile return 770 syscall mac_syscall entry 771 syscall mac_syscall return 772 syscall getfsstat entry 773 syscall getfsstat return 774 syscall statfs entry 775 syscall statfs return 776 syscall fstatfs entry 777 syscall fstatfs return 778 syscall fhstatfs entry 779 syscall fhstatfs return 780 syscall #399 entry 781 syscall #399 return 782 syscall ksem_close entry 783 syscall ksem_close return 784 syscall ksem_post entry 785 syscall ksem_post return 786 syscall ksem_wait entry 787 syscall ksem_wait return 788 syscall ksem_trywait entry 789 syscall ksem_trywait return 790 syscall ksem_init entry 791 syscall ksem_init return 792 syscall ksem_open entry 793 syscall ksem_open return 794 syscall ksem_unlink entry 795 syscall ksem_unlink return 796 syscall ksem_getvalue entry 797 syscall ksem_getvalue return 798 syscall ksem_destroy entry 799 syscall ksem_destroy return 800 syscall __mac_get_pid entry 801 syscall __mac_get_pid return 802 syscall __mac_get_link entry 803 syscall __mac_get_link return 804 syscall __mac_set_link entry 805 syscall __mac_set_link return 806 syscall extattr_set_link entry 807 syscall extattr_set_link return 808 syscall extattr_get_link entry 809 syscall extattr_get_link return 810 syscall extattr_delete_link entry 811 syscall extattr_delete_link return 812 syscall __mac_execve entry 813 syscall __mac_execve return 814 syscall sigaction entry 815 syscall sigaction return 816 syscall sigreturn entry 817 syscall sigreturn return 818 syscall #418 entry 819 syscall #418 return 820 syscall #419 entry 821 syscall #419 return 822 syscall #420 entry 823 syscall #420 return 824 syscall getcontext entry 825 syscall getcontext return 826 syscall setcontext entry 827 syscall setcontext return 828 syscall swapcontext entry 829 syscall swapcontext return 830 syscall swapoff entry 831 syscall swapoff return 832 syscall __acl_get_link entry 833 syscall __acl_get_link return 834 syscall __acl_set_link entry 835 syscall __acl_set_link return 836 syscall __acl_delete_link entry 837 syscall __acl_delete_link return 838 syscall __acl_aclcheck_link entry 839 syscall __acl_aclcheck_link return 840 syscall sigwait entry 841 syscall sigwait return 842 syscall thr_create entry 843 syscall thr_create return 844 syscall thr_exit entry 845 syscall thr_exit return 846 syscall thr_self entry 847 syscall thr_self return 848 syscall thr_kill entry 849 syscall thr_kill return 850 syscall _umtx_lock entry 851 syscall _umtx_lock return 852 syscall _umtx_unlock entry 853 syscall _umtx_unlock return 854 syscall jail_attach entry 855 syscall jail_attach return 856 syscall extattr_list_fd entry 857 syscall extattr_list_fd return 858 syscall extattr_list_file entry 859 syscall extattr_list_file return 860 syscall extattr_list_link entry 861 syscall extattr_list_link return 862 syscall kse_switchin entry 863 syscall kse_switchin return 864 syscall ksem_timedwait entry 865 syscall ksem_timedwait return 866 syscall thr_suspend entry 867 syscall thr_suspend return 868 syscall thr_wake entry 869 syscall thr_wake return >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 09:48:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21C2216A403; Mon, 1 May 2006 09:48:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D6BE416A400 for ; Mon, 1 May 2006 09:48:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E53D43D49 for ; Mon, 1 May 2006 09:48:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k419mY9e039979 for ; Mon, 1 May 2006 09:48:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k419mYdv039976 for perforce@freebsd.org; Mon, 1 May 2006 09:48:34 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 09:48:34 GMT Message-Id: <200605010948.k419mYdv039976@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 09:48:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=96482 Change 96482 by jb@jb_freebsd2 on 2006/05/01 09:48:16 Start exporting symbols for reference by other modules. In the case of DTrace, the other modules are the providers. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#2 (text+ko) ==== @@ -19,11 +19,17 @@ CFLAGS+= -DDEBUG +EXPORT_SYMS= dtrace_register \ + dtrace_unregister \ + dtrace_probe_lookup + load : kldload dtrace kldstat unload : + kldunload systrace + kldunload fasttrap kldunload dtrace kldstat From owner-p4-projects@FreeBSD.ORG Mon May 1 17:28:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBCD016A40F; Mon, 1 May 2006 17:28:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DD32D16A475 for ; Mon, 1 May 2006 17:28:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC7A243D48 for ; Mon, 1 May 2006 17:28:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41HSi6O023614 for ; Mon, 1 May 2006 17:28:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41HSikU023611 for perforce@freebsd.org; Mon, 1 May 2006 17:28:44 GMT (envelope-from imp@freebsd.org) Date: Mon, 1 May 2006 17:28:44 GMT Message-Id: <200605011728.k41HSikU023611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 17:28:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=96497 Change 96497 by imp@imp_hammer on 2006/05/01 17:28:26 .s -> .S Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.s#5 delete Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#7 (text+ko) ==== @@ -2,7 +2,7 @@ P=bootspi FILES=${P} -SRCS=arm_init.s main.c loader_prompt.c env_vars.c +SRCS=arm_init.S main.c loader_prompt.c env_vars.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} From owner-p4-projects@FreeBSD.ORG Mon May 1 17:34:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1CED16A443; Mon, 1 May 2006 17:34:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9E3C816A401 for ; Mon, 1 May 2006 17:34:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE47843D6E for ; Mon, 1 May 2006 17:34:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41HYqNp027792 for ; Mon, 1 May 2006 17:34:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41HYqLE027786 for perforce@freebsd.org; Mon, 1 May 2006 17:34:52 GMT (envelope-from imp@freebsd.org) Date: Mon, 1 May 2006 17:34:52 GMT Message-Id: <200605011734.k41HYqLE027786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 17:34:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=96498 Change 96498 by imp@imp_hammer on 2006/05/01 17:34:07 For interrupt vector 6, use the format needed by the boot loader in the AT91RM9200 when booting off of DataFlash parts. # NOTE: This needs to be tweaked for each part that might have # on the SPI bus, as we have to encode page size and number of # pages into this vector... On the other hand, we'll have this # data once the boot loader is in memory and can pass it to the # kernel in some manner... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#2 (text+ko) ==== @@ -23,7 +23,6 @@ * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.s,v 1.1 2006/04/19 17:16:48 imp Exp $ ******************************************************************************/ - .equ TWI_EEPROM_SIZE, 0x2000 .equ ARM_MODE_USER, 0x10 .equ ARM_MODE_FIQ, 0x11 .equ ARM_MODE_IRQ, 0x12 @@ -60,7 +59,7 @@ dabtvec: B dabtvec @; Data Abort rsvdvec: - .long (TWI_EEPROM_SIZE >> 9) + .long ((1056 << 17) | (13 << 13) | (12 * 1024)) irqvec: ldr pc, [pc,#-0xF20] @; IRQ : read the AIC fiqvec: From owner-p4-projects@FreeBSD.ORG Mon May 1 19:22:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ADC616A447; Mon, 1 May 2006 19:22:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EB6B116A426 for ; Mon, 1 May 2006 19:22:35 +0000 (UTC) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6662243D77 for ; Mon, 1 May 2006 19:22:26 +0000 (GMT) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41JMQJ8080989 for ; Mon, 1 May 2006 19:22:26 GMT (envelope-from tkuik@freefall.freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41JMP6D080972 for perforce@freebsd.org; Mon, 1 May 2006 19:22:25 GMT (envelope-from tkuik@freefall.freebsd.org) Date: Mon, 1 May 2006 19:22:25 GMT Message-Id: <200605011922.k41JMP6D080972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tkuik@freefall using -f From: tkuik To: Perforce Change Reviews Cc: Subject: PERFORCE change 96502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 19:22:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=96502 Change 96502 by tkuik@tkuik_freebsd on 2006/05/01 19:22:23 Moved xen-public files up to 3.0.2-2 versions Added support for driver domains along with bug fixes necessary for them to work. This includes the netback & pcifront drivers. Affected files ... .. //depot/projects/xen3/src/sys/conf/Makefile.i386-xen#3 edit .. //depot/projects/xen3/src/sys/conf/files.i386-xen#5 edit .. //depot/projects/xen3/src/sys/conf/options.i386-xen#4 edit .. //depot/projects/xen3/src/sys/dev/pci/pci.c#3 edit .. //depot/projects/xen3/src/sys/dev/xen/blkfront/blkfront.c#5 edit .. //depot/projects/xen3/src/sys/dev/xen/console/xencons_ring.c#3 edit .. //depot/projects/xen3/src/sys/dev/xen/netback/netback.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#7 edit .. //depot/projects/xen3/src/sys/dev/xen/pcifront/pcifront.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_comms.c#3 edit .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_comms.h#2 edit .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_probe.c#4 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#11 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/evtchn.c#4 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/io_apic.c#2 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#12 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#5 edit .. //depot/projects/xen3/src/sys/i386-xen/include/bus_dma.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/hypercall.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/hypervisor-ifs.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/hypervisor.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/pmap.h#4 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/acm.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/acm_ops.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-ia64.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_32.h#3 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_64.h#3 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/dom0_ops.h#3 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/event_channel.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/features.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/grant_table.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/hvm/hvm_info_table.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/hvm/ioreq.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/hvm/vmx_assist.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/blkif.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/console.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/ioreq.h#2 delete .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/netif.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/pciif.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/ring.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/tpmif.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/xenbus.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/xs_wire.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/memory.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/nmi.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/physdev.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/sched.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/sched_ctl.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/trace.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/vcpu.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/version.h#3 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/vmx_assist.h#2 delete .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/xen-compat.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/xen.h#3 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen_intr.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xenbus.h#3 edit .. //depot/projects/xen3/src/sys/i386/i386/busdma_machdep.c#3 edit .. //depot/projects/xen3/src/sys/i386/i386/vm_machdep.c#4 edit .. //depot/projects/xen3/src/sys/i386/include/bus_dma.h#2 edit .. //depot/projects/xen3/src/sys/kern/kern_shutdown.c#6 edit .. //depot/projects/xen3/src/sys/kern/kern_tc.c#3 edit .. //depot/projects/xen3/src/sys/net/if_bridge.c#3 edit .. //depot/projects/xen3/src/sys/net/if_bridgevar.h#3 edit .. //depot/projects/xen3/src/sys/netinet/in_rmx.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/conf/Makefile.i386-xen#3 (text+ko) ==== @@ -29,6 +29,7 @@ .endif .endif .include "$S/conf/kern.pre.mk" +INCLUDES+= -I$S/i386-xen/include/xen-public -I$S/i386-xen/include/xen-public/io MKMODULESENV+= MACHINE=i386-xen ==== //depot/projects/xen3/src/sys/conf/files.i386-xen#5 (text+ko) ==== @@ -456,3 +456,5 @@ dev/xen/blkfront/blkfront.c standard dev/xen/netfront/netfront.c standard dev/xen/balloon/balloon.c standard +dev/xen/netback/netback.c optional xen_netdev_backend +dev/xen/pcifront/pcifront.c optional xen_pcidev_frontend ==== //depot/projects/xen3/src/sys/conf/options.i386-xen#4 (text+ko) ==== @@ -36,6 +36,11 @@ # support xen hypervisor. XEN opt_global.h +# support network backend driver +XEN_NETDEV_BACKEND opt_global.h +XEN_NETBACK_DEBUG opt_global.h +XEN_NETBACK_DEBUG_LOTS opt_global.h + # support physical device access XEN_PHYSDEV_ACCESS opt_global.h @@ -43,6 +48,9 @@ # stay consistent with mainline for now XEN_PRIVILEGED_GUEST opt_global.h +# support pci device access via front end driver +XEN_PCIDEV_FRONTEND opt_global.h +XEN_PCIDEV_FE_DEBUG opt_global.h # Physical address extensions and support for >4G ram. As above. PAE opt_global.h ==== //depot/projects/xen3/src/sys/dev/pci/pci.c#3 (text+ko) ==== @@ -1112,22 +1112,14 @@ device_t pcib = device_get_parent(dev); struct pci_devinfo *dinfo; int maxslots; - int s, f, pcifunchigh; - uint8_t hdrtype; + int s, f; KASSERT(dinfo_size >= sizeof(struct pci_devinfo), ("dinfo_size too small")); maxslots = PCIB_MAXSLOTS(pcib); for (s = 0; s <= maxslots; s++) { - pcifunchigh = 0; - f = 0; DELAY(1); - hdrtype = REG(PCIR_HDRTYPE, 1); - if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) - continue; - if (hdrtype & PCIM_MFDEV) - pcifunchigh = PCI_FUNCMAX; - for (f = 0; f <= pcifunchigh; f++) { + for (f = 0; f <= PCI_FUNCMAX; f++) { dinfo = pci_read_device(pcib, busno, s, f, dinfo_size); if (dinfo != NULL) { pci_add_child(dev, dinfo); ==== //depot/projects/xen3/src/sys/dev/xen/blkfront/blkfront.c#5 (text+ko) ==== @@ -383,7 +383,7 @@ goto fail; err = bind_evtchn_to_irqhandler(info->evtchn, "xbd", (driver_intr_t *)blkif_int, - info, INTR_TYPE_BIO | INTR_MPSAFE); + info, INTR_TYPE_BIO | INTR_MPSAFE, NULL); if (err <= 0) { xenbus_dev_fatal(dev, err, "bind_evtchn_to_irqhandler failed"); ==== //depot/projects/xen3/src/sys/dev/xen/console/xencons_ring.c#3 (text+ko) ==== @@ -102,7 +102,7 @@ err = bind_evtchn_to_irqhandler(xen_start_info->console_evtchn, "xencons", handle_input, NULL, - INTR_TYPE_MISC | INTR_MPSAFE); + INTR_TYPE_MISC | INTR_MPSAFE, NULL); if (err) { XENPRINTF("XEN console request irq failed %i\n", err); return err; ==== //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#7 (text+ko) ==== @@ -490,7 +490,7 @@ network_connect(ifp); info->irq = bind_evtchn_to_irqhandler( - info->evtchn, "xn", xn_intr, info, INTR_TYPE_NET | INTR_MPSAFE); + info->evtchn, "xn", xn_intr, info, INTR_TYPE_NET | INTR_MPSAFE, NULL); show_device(info); ==== //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_comms.c#3 (text+ko) ==== @@ -195,7 +195,7 @@ unbind_from_irqhandler(xenbus_irq, &xb_waitq); err = bind_evtchn_to_irqhandler( - xen_start_info->store_evtchn, "xenbus", wake_waiting, NULL, INTR_TYPE_NET); + xen_start_info->store_evtchn, "xenbus", wake_waiting, NULL, INTR_TYPE_NET, NULL); if (err <= 0) { printk("XENBUS request irq failed %i\n", err); return err; ==== //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_comms.h#2 (text+ko) ==== @@ -68,7 +68,7 @@ * */ #define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ + __typeof__( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) ==== //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_probe.c#4 (text+ko) ==== @@ -92,6 +92,7 @@ #define streq(a, b) (strcmp((a), (b)) == 0) static char *kasprintf(const char *fmt, ...); +static int watch_otherend(struct xenbus_device *dev); /* If something in array of ids matches this device, return it. */ @@ -174,7 +175,7 @@ xendev->nodename); kfree(xendev->otherend); xendev->otherend = NULL; - return ENOENT; + return ENOENT; } return 0; @@ -183,15 +184,77 @@ static int read_backend_details(struct xenbus_device *xendev) { + if (!strncmp(xendev->nodename, "backend", 7)) + return -ENOENT; return read_otherend_details(xendev, "backend-id", "backend"); } static int read_frontend_details(struct xenbus_device *xendev) { + if (strncmp(xendev->nodename, "backend", 7)) + return -ENOENT; return read_otherend_details(xendev, "frontend-id", "frontend"); } +static int watch_otherend_backend(struct xenbus_device *dev) +{ + struct xenbus_transaction *xbt; + + /* We need to add the hotplug-status because we don't */ + /* have a hotplug script to do this. If we ever do, */ + /* this can be removed -- WORK */ + xbt = xenbus_transaction_start(); + xenbus_printf(xbt, dev->nodename, "hotplug-status","%s","connected"); + xenbus_transaction_end(xbt, 0); + + return watch_otherend(dev); +} + +static int watch_otherend_frontend(struct xenbus_device *dev) +{ + return watch_otherend(dev); +} + +/* We need to remove the backend device node from the xenbus */ +/* because we don't have a hotplug script to do this. If we */ +/* ever do, this can be removed -- WORK */ +static int +xenbus_cleanup_backend_device(struct xenbus_device *dev) +{ + char *node, **dir; + unsigned int dir_n; + int i; + + i = strlen(dev->nodename); + if (!i) + return 0; + + node = malloc(i+1, M_DEVBUF, M_WAITOK); + if (!node) + return ENOMEM; + strcpy(node, dev->nodename); +again: + DPRINTK("removing %s\n", node); + if (!xenbus_rm(NULL, node, "")) { + while (i > 7) { + if (node[i] == '/') { + node[i] = '\0'; + dir = xenbus_directory(NULL, node, "", &dir_n); + if (!IS_ERR(dir)) { + kfree(dir); + if (dir_n == 0) + goto again; + } + break; + } + i--; + } + } + free(node, M_DEVBUF); + return 0; +} + static void free_otherend_details(struct xenbus_device *dev) { kfree(dev->otherend); @@ -424,14 +487,14 @@ printk(KERN_WARNING "xenbus_probe: talk_to_otherend on %s failed.\n", dev->nodename); - return err; + return err; } err = drv->probe(dev, id); if (err) goto fail; - - err = watch_otherend(dev); + + err = drv->watch_otherend(dev); if (err) { printk(KERN_WARNING "xenbus_probe: watch_otherend on %s failed.\n", @@ -445,11 +508,16 @@ xenbus_switch_state(dev, NULL, XenbusStateClosed); return ENODEV; } -#if 0 -static int -xenbus_dev_remove(device_t _dev) + +static void xenbus_dev_free(struct xenbus_device *xendev) +{ + LIST_REMOVE(xendev, list); + kfree(xendev); +} + +int +xenbus_remove_device(struct xenbus_device *dev) { - struct xenbus_device *dev = to_xenbus_device(_dev); struct xenbus_driver *drv = dev->driver; DPRINTK(""); @@ -461,9 +529,23 @@ drv->remove(dev); xenbus_switch_state(dev, NULL, XenbusStateClosed); + + if (drv->cleanup_device) + return drv->cleanup_device(dev); + + xenbus_dev_free(dev); + return 0; } + +#if 0 +static int +xenbus_dev_remove(device_t _dev) +{ + return xenbus_remove_device(to_xenbus_device(_dev)); +} #endif + static int xenbus_register_driver_common(struct xenbus_driver *drv, struct xen_bus_type *bus) { @@ -488,17 +570,19 @@ LIST_INSERT_HEAD(&xendrv_list, drv, list); up(&xenwatch_mutex); LIST_FOREACH(xdev, bus->bus, list) { - if (streq(drv->name, xdev->devicetype)) { + if (match_device(drv->ids, xdev)) { xdev->driver = drv; xenbus_dev_probe(xdev); - } } + } return 0; } int xenbus_register_frontend(struct xenbus_driver *drv) { drv->read_otherend_details = read_backend_details; + drv->watch_otherend = watch_otherend_frontend; + drv->cleanup_device = NULL; return xenbus_register_driver_common(drv, &xenbus_frontend); } @@ -507,6 +591,8 @@ int xenbus_register_backend(struct xenbus_driver *drv) { drv->read_otherend_details = read_frontend_details; + drv->watch_otherend = watch_otherend_backend; + drv->cleanup_device = xenbus_cleanup_backend_device; return xenbus_register_driver_common(drv, &xenbus_backend); } @@ -562,7 +648,6 @@ #endif static void xenbus_cleanup_devices(const char *path, struct xendev_list_head * bus) { - panic("unimplemented"); #if 0 struct xb_find_info info = { .nodename = path }; @@ -578,12 +663,6 @@ } #if 0 -static void xenbus_dev_free(struct xenbus_device *xendev) -{ - kfree(xendev); -} - - void xenbus_dev_release(device_t dev) { /* @@ -645,25 +724,25 @@ char *tmpstring; XenbusState state = xenbus_read_driver_state(nodename); - + if (state != XenbusStateInitialising) { /* Device is not new, so ignore it. This can happen if a device is going away after switching to Closed. */ return 0; } - + stringlen = strlen(nodename) + 1 + strlen(type) + 1; xendev = kmalloc(sizeof(*xendev) + stringlen, GFP_KERNEL); if (!xendev) return ENOMEM; memset(xendev, 0, sizeof(*xendev)); - + /* Copy the strings into the extra space. */ - + tmpstring = (char *)(xendev + 1); strcpy(tmpstring, nodename); xendev->nodename = tmpstring; - + tmpstring += strlen(tmpstring) + 1; strcpy(tmpstring, type); xendev->devicetype = tmpstring; @@ -673,30 +752,30 @@ */ LIST_INSERT_HEAD(bus->bus, xendev, list); LIST_FOREACH(xdrv, &xendrv_list, list) { - if (streq(xdrv->name, xendev->devicetype)) + if (match_device(xdrv->ids, xendev)) { xendev->driver = xdrv; + if (!xenbus_dev_probe(xendev)) + break; + } } - if (xendev->driver != NULL) - xenbus_dev_probe(xendev); - #if 0 xendev->dev.parent = &bus->dev; xendev->dev.bus = &bus->bus; xendev->dev.release = xenbus_dev_release; - + err = bus->get_bus_id(xendev->dev.bus_id, xendev->nodename); CHECK_FAIL; - + /* Register with generic device framework. */ err = device_register(&xendev->dev); CHECK_FAIL; - + device_create_file(&xendev->dev, &dev_attr_nodename); device_create_file(&xendev->dev, &dev_attr_devtype); #endif return 0; - + #undef CHECK_FAIL #if 0 fail: @@ -806,7 +885,7 @@ break; } kfree(dir); - + return err; } @@ -913,7 +992,7 @@ xdev = device_get_softc(dev); drv = xdev->driver; - + if (device_get_driver(dev) == NULL) return 0; @@ -922,7 +1001,7 @@ #if 0 /* bus_id ? */ if (err) - printk(KERN_WARNING "xenbus: suspend %s failed: %i\n", + printk(KERN_WARNING "xenbus: suspend %s failed: %i\n", dev->bus_id, err); #endif return 0; @@ -947,8 +1026,8 @@ #if 0 if (err) { printk(KERN_WARNING - "xenbus: resume (talk_to_otherend) %s failed: %i\n", - dev->bus_id, err); + "xenbus: resume (talk_to_otherend) %s failed: %i\n", + dev->bus_id, err); return err; } #endif @@ -993,9 +1072,9 @@ xenbus_add_child(device_t bus, int order, const char *name, int unit) { device_t child; - + child = device_add_child_ordered(bus, order, name, unit); - + return(child); } #endif @@ -1080,7 +1159,7 @@ */ dom0 = (xen_start_info->store_evtchn == 0); - + #ifdef DOM0 if (dom0) { @@ -1101,7 +1180,7 @@ xen_start_info->store_mfn = pfn_to_mfn(virt_to_phys((void *)page) >> PAGE_SHIFT); - + /* Next allocate a local port which xenstored can bind to */ op.cmd = EVTCHNOP_alloc_unbound; op.u.alloc_unbound.dom = DOMID_SELF; @@ -1137,16 +1216,16 @@ panic("xenbus: could not attach"); #endif BUG_ON((xenstored_ready <= 0)); - - + + /* Enumerate devices in xenstore. */ xenbus_probe_devices(&xenbus_frontend); xenbus_probe_devices(&xenbus_backend); - + /* Watch for changes. */ register_xenbus_watch(&fe_watch); register_xenbus_watch(&be_watch); - + /* Notify others that xenstore is up */ EVENTHANDLER_INVOKE(xenstore_event); } @@ -1204,6 +1283,10 @@ #endif + + + + /* * Local variables: * c-file-style: "bsd" ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#11 (text+ko) ==== @@ -314,31 +314,29 @@ int64_t delta_cpu, delta; int cpu = smp_processor_id(); struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu); - long lticks = 0; do { __get_time_values_from_xen(); delta = delta_cpu = shadow->system_timestamp + get_nsec_offset(shadow); - delta -= processed_system_time; delta_cpu -= per_cpu(processed_system_time, cpu); } while (!time_values_up_to_date(cpu)); - if (unlikely(delta < (int64_t)-1000000) || unlikely(delta_cpu < 0)) { + if (unlikely(delta < (int64_t)0) || unlikely(delta_cpu < (int64_t)0)) { printf("Timer ISR: Time went backwards: %lld\n", delta); return; } /* Process elapsed ticks since last call. */ if (delta >= NS_PER_TICK) { - lticks = (delta / NS_PER_TICK); - processed_system_time += lticks*NS_PER_TICK; - per_cpu(processed_system_time, cpu) += lticks*NS_PER_TICK; + processed_system_time += (delta / NS_PER_TICK) * NS_PER_TICK; + per_cpu(processed_system_time, cpu) += (delta_cpu / NS_PER_TICK) * NS_PER_TICK; } hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + /* * Take synchronised time from Xen once a minute if we're not * synchronised ourselves, and we haven't chosen to keep an independent @@ -357,10 +355,13 @@ static uint32_t getit(void) { + struct shadow_time_info *shadow; + shadow = &per_cpu(shadow_time, smp_processor_id()); __get_time_values_from_xen(); - return per_cpu(shadow_time, smp_processor_id()).system_timestamp; + return shadow->system_timestamp + get_nsec_offset(shadow); } + /* * Wait "n" microseconds. * Relies on timer 1 counting down from (timer_freq / hz) @@ -512,7 +513,9 @@ } set_cyc2ns_scale(cpu_khz/1000); - timer_freq = tsc_freq = xen_timecounter.tc_frequency = cpu_khz * 1000; + tsc_freq = cpu_khz * 1000; + + timer_freq = xen_timecounter.tc_frequency = 1000000000LL; tc_init(&xen_timecounter); @@ -831,9 +834,8 @@ int irq; int cpu = smp_processor_id(); - per_cpu(processed_system_time, cpu) = processed_system_time; - + irq = bind_virq_to_irq(VIRQ_TIMER); PCPU_SET(time_irq, irq); PANIC_IF(intr_add_handler("clk", irq, (driver_intr_t *)clkintr, @@ -859,13 +861,23 @@ static uint32_t xen_get_timecount(struct timecounter *tc) { + uint64_t clk; struct shadow_time_info *shadow; shadow = &per_cpu(shadow_time, smp_processor_id()); __get_time_values_from_xen(); - return (uint32_t)(processed_system_time + shadow->system_timestamp + get_nsec_offset(shadow)); + clk = shadow->system_timestamp + get_nsec_offset(shadow); + + return (uint32_t)((clk / NS_PER_TICK) * NS_PER_TICK); + +} +/* Return system time offset by ticks */ +uint64_t +get_system_time(int ticks) +{ + return processed_system_time + (ticks * NS_PER_TICK); } /* @@ -908,7 +920,6 @@ { __get_time_values_from_xen(); - processed_system_time = per_cpu(processed_system_time, smp_processor_id()); PANIC_IF(HYPERVISOR_set_timer_op(processed_system_time + NS_PER_TICK) != 0); HYPERVISOR_sched_op(SCHEDOP_block, 0); } ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/evtchn.c#4 (text+ko) ==== @@ -348,14 +348,15 @@ const char *devname, driver_intr_t handler, void *arg, - unsigned long irqflags) + unsigned long irqflags, + void **cookiep) { unsigned int irq; int retval; irq = bind_evtchn_to_irq(evtchn); intr_register_source(&xp->xp_pins[irq].xp_intsrc); - retval = intr_add_handler(devname, irq, handler, arg, irqflags, NULL); + retval = intr_add_handler(devname, irq, handler, arg, irqflags, cookiep); if (retval != 0) { unbind_from_irq(irq); return retval; @@ -407,9 +408,8 @@ void unbind_from_irqhandler(unsigned int irq, void *dev_id) { -#ifdef notyet - intr_remove_handler(dev_id); /* XXX */ -#endif + if (dev_id) + intr_remove_handler(dev_id); /* XXX */ unbind_from_irq(irq); } @@ -915,6 +915,8 @@ tpin = &pin[pirq_to_irq(i)]; tpin->xp_intsrc.is_pic = xp->xp_pirq_pic; tpin->xp_vector = pirq_to_irq(i); + + intr_register_source(&tpin->xp_intsrc); } } ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/io_apic.c#2 (text+ko) ==== @@ -14,8 +14,8 @@ int ret; op.cmd = PHYSDEVOP_APIC_READ; - op.u.apic_op.apic = io->io_apic_id; - op.u.apic_op.offset = reg; + op.u.apic_op.apic_physbase = (unsigned long)io->io_addr; + op.u.apic_op.reg = reg; ret = HYPERVISOR_physdev_op(&op); if (ret) return ret; @@ -28,8 +28,8 @@ physdev_op_t op; op.cmd = PHYSDEVOP_APIC_WRITE; - op.u.apic_op.apic = io->io_apic_id; - op.u.apic_op.offset = reg; + op.u.apic_op.apic_physbase = (unsigned long)io->io_addr; + op.u.apic_op.reg = reg; op.u.apic_op.value = value; HYPERVISOR_physdev_op(&op); } ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#12 (text+ko) ==== @@ -1114,7 +1114,7 @@ for (;;) __asm__ ("hlt"); #else - HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_poweroff); + HYPERVISOR_shutdown(SHUTDOWN_poweroff); #endif } ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#5 (text+ko) ==== @@ -895,6 +895,35 @@ } /* + * Routine: pmap_extract_ma + * Function: + * Like pmap_extract, but returns machine address + */ +vm_paddr_t +pmap_extract_ma(pmap_t pmap, vm_offset_t va) +{ + vm_paddr_t rtval; + pt_entry_t *pte; + pd_entry_t pde; + + rtval = 0; + PMAP_LOCK(pmap); + pde = pmap->pm_pdir[va >> PDRSHIFT]; + if (pde != 0) { + if ((pde & PG_PS) != 0) { + rtval = (pde & ~PDRMASK) | (va & PDRMASK); + PMAP_UNLOCK(pmap); + return rtval; + } + pte = pmap_pte(pmap, va); + rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); + pmap_pte_release(pte); + } + PMAP_UNLOCK(pmap); + return (rtval); +} + +/* * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page @@ -3205,7 +3234,7 @@ panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); for (tmpva = va; size > 0; ) { - pmap_kenter(tmpva, pa); + pmap_kenter_ma(tmpva, pa); size -= PAGE_SIZE; tmpva += PAGE_SIZE; pa += PAGE_SIZE; ==== //depot/projects/xen3/src/sys/i386-xen/include/bus_dma.h#2 (text+ko) ==== @@ -1,1 +1,7 @@ #include + +#undef _BUS_VIRT_TO_BUS +#define _BUS_VIRT_TO_BUS(pm, va) pmap_extract_ma(pm, va) + +#undef _BUS_VIRT_TO_BUS_KERN +#define _BUS_VIRT_TO_BUS_KERN(va) pmap_kextract_ma(va) ==== //depot/projects/xen3/src/sys/i386-xen/include/hypercall.h#2 (text+ko) ==== @@ -162,7 +162,7 @@ static inline int HYPERVISOR_sched_op( - int cmd, unsigned long arg) + int cmd, void *arg) { return _hypercall2(int, sched_op, cmd, arg); } @@ -296,8 +296,11 @@ HYPERVISOR_suspend( unsigned long srec) { + struct sched_shutdown sched_shutdown = { + .reason = SHUTDOWN_suspend + }; return _hypercall3(int, sched_op, SCHEDOP_shutdown, - SHUTDOWN_suspend, srec); + &sched_shutdown, srec); } #endif /* __HYPERCALL_H__ */ ==== //depot/projects/xen3/src/sys/i386-xen/include/hypervisor-ifs.h#2 (text+ko) ==== @@ -18,6 +18,7 @@ #endif } pte_t; +#define __XEN_INTERFACE_VERSION__ 0x00030101 #define CONFIG_XEN_BLKDEV_GRANT #include #include ==== //depot/projects/xen3/src/sys/i386-xen/include/hypervisor.h#2 (text+ko) ==== @@ -25,6 +25,8 @@ extern start_info_t *xen_start_info; extern shared_info_t *HYPERVISOR_shared_info; +extern uint64_t get_system_time(int ticks); + static inline int HYPERVISOR_console_write(char *str, int count) { @@ -33,13 +35,37 @@ static inline void HYPERVISOR_crash(void) __dead2; +static inline int +HYPERVISOR_shutdown(unsigned int reason) +{ + struct sched_shutdown sched_shutdown = { + .reason = reason + }; + + return HYPERVISOR_sched_op(SCHEDOP_shutdown, &sched_shutdown); +} + static inline void HYPERVISOR_crash(void) { - _hypercall2(void, sched_op, SCHEDOP_shutdown, SHUTDOWN_crash); + HYPERVISOR_shutdown(SHUTDOWN_crash); /* NEVER REACHED */ for (;;) ; /* eliminate noreturn error */ } +/* Transfer control to hypervisor until an event is detected on one */ +/* of the specified ports or the specified number of ticks elapse */ +static inline int +HYPERVISOR_poll( + evtchn_port_t *ports, unsigned int nr_ports, int ticks) +{ + struct sched_poll sched_poll = { + .ports = ports, + .nr_ports = nr_ports, + .timeout = get_system_time(ticks) + }; + + return HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll); +} #endif /* __HYPERVISOR_H__ */ ==== //depot/projects/xen3/src/sys/i386-xen/include/pmap.h#4 (text+ko) ==== @@ -429,6 +429,8 @@ void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); void pmap_invalidate_all(pmap_t); +vm_paddr_t pmap_extract_ma(pmap_t pmap, vm_offset_t va); + void pmap_kenter_ma(vm_offset_t va, vm_paddr_t pa); void pmap_map_readonly(pmap_t pmap, vm_offset_t va, int len); void pmap_map_readwrite(pmap_t pmap, vm_offset_t va, int len); ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-public/acm.h#2 (text+ko) ==== @@ -1,25 +1,8 @@ -/**************************************************************** - * acm.h - * - * Copyright (C) 2005 IBM Corporation +/* + * acm.h: Xen access control module interface defintions * - * Author: * Reiner Sailer - * - * Contributors: - * Stefan Berger - * added network byte order support for binary policies - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, version 2 of the - * License. - * - * sHype general access control module header file. - * here are all definitions that are shared between - * xen-core, guest-kernels, and applications. - * - * todo: move from static policy choice to compile option. + * Copyright (c) 2005, International Business Machines Corporation. */ #ifndef _XEN_PUBLIC_ACM_H @@ -169,7 +152,7 @@ uint32_t ec_eval_count; uint32_t gt_eval_count; uint32_t ec_denied_count; - uint32_t gt_denied_count; + uint32_t gt_denied_count; uint32_t ec_cachehit_count; uint32_t gt_cachehit_count; }; ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-public/acm_ops.h#2 (text+ko) ==== @@ -1,19 +1,8 @@ -/****************************************************************************** - * acm_ops.h - * - * Copyright (C) 2005 IBM Corporation +/* + * acm_ops.h: Xen access control module hypervisor commands * - * Author: * Reiner Sailer - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, version 2 of the - * License. - * - * Process acm policy command requests from guest OS. - * access checked by policy; not restricted to DOM0 - * + * Copyright (c) 2005, International Business Machines Corporation. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 20:09:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62F5016A40E; Mon, 1 May 2006 20:09:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 22C5416A40A for ; Mon, 1 May 2006 20:09:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B791843D45 for ; Mon, 1 May 2006 20:09:33 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41K9XJG011040 for ; Mon, 1 May 2006 20:09:33 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41K9R2n010965 for perforce@freebsd.org; Mon, 1 May 2006 20:09:27 GMT (envelope-from marcel@freebsd.org) Date: Mon, 1 May 2006 20:09:27 GMT Message-Id: <200605012009.k41K9R2n010965@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 Cc: Subject: PERFORCE change 96507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 20:09:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=96507 Change 96507 by marcel@marcel_nfs on 2006/05/01 20:08:26 IFC @96496 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#5 integrate .. //depot/projects/ia64/UPDATING#85 integrate .. //depot/projects/ia64/bin/ps/keyword.c#19 integrate .. //depot/projects/ia64/bin/rm/rm.c#15 integrate .. //depot/projects/ia64/bin/sh/Makefile#11 integrate .. //depot/projects/ia64/bin/sh/TOUR#2 integrate .. //depot/projects/ia64/bin/sh/eval.c#15 integrate .. //depot/projects/ia64/bin/sh/exec.c#13 integrate .. //depot/projects/ia64/bin/sh/exec.h#6 integrate .. //depot/projects/ia64/bin/sh/input.c#8 integrate .. //depot/projects/ia64/bin/sh/options.c#10 integrate .. //depot/projects/ia64/bin/sh/show.c#9 integrate .. //depot/projects/ia64/bin/sh/trap.c#10 integrate .. //depot/projects/ia64/bin/sh/var.c#15 integrate .. //depot/projects/ia64/contrib/amd/fixmount/fixmount.8#7 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#22 integrate .. //depot/projects/ia64/contrib/top/top.X#7 integrate .. //depot/projects/ia64/contrib/top/top.c#8 integrate .. //depot/projects/ia64/etc/Makefile#54 integrate .. //depot/projects/ia64/etc/cached.conf#1 branch .. //depot/projects/ia64/etc/defaults/devfs.rules#4 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#68 integrate .. //depot/projects/ia64/etc/etc.sparc64/ttys#13 integrate .. //depot/projects/ia64/etc/gettytab#6 integrate .. //depot/projects/ia64/etc/network.subr#15 integrate .. //depot/projects/ia64/etc/rc.bsdextended#2 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#39 integrate .. //depot/projects/ia64/etc/rc.d/SERVERS#7 integrate .. //depot/projects/ia64/etc/rc.d/amd#13 integrate .. //depot/projects/ia64/etc/rc.d/cached#1 branch .. //depot/projects/ia64/etc/rc.d/jail#18 integrate .. //depot/projects/ia64/etc/rc.d/named#17 integrate .. //depot/projects/ia64/etc/rc.d/nsswitch#6 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#12 integrate .. //depot/projects/ia64/etc/rc.d/sshd#9 integrate .. //depot/projects/ia64/etc/rc.subr#28 integrate .. //depot/projects/ia64/etc/sendmail/freebsd.mc#11 integrate .. //depot/projects/ia64/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#55 integrate .. //depot/projects/ia64/games/random/random.c#10 integrate .. //depot/projects/ia64/games/random/randomize_fd.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/gdbserver/Makefile#1 branch .. //depot/projects/ia64/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/gdb/gdbserver/fbsd-low.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/gdb/gdbserver/fbsd-low.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/gdb/gdbserver/reg-i386.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/Makefile#8 integrate .. //depot/projects/ia64/include/netdb.h#13 integrate .. //depot/projects/ia64/include/nsswitch.h#4 integrate .. //depot/projects/ia64/include/rpc/rpcent.h#3 integrate .. //depot/projects/ia64/include/stdio.h#21 integrate .. //depot/projects/ia64/include/time.h#16 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#20 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#16 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#14 integrate .. //depot/projects/ia64/lib/libc/Makefile#22 integrate .. //depot/projects/ia64/lib/libc/db/man/dbm.3#5 integrate .. //depot/projects/ia64/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#12 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#19 integrate .. //depot/projects/ia64/lib/libc/gen/vis.3#8 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.3#8 integrate .. //depot/projects/ia64/lib/libc/include/nscache.h#1 branch .. //depot/projects/ia64/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/ia64/lib/libc/net/Makefile.inc#13 integrate .. //depot/projects/ia64/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#26 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#15 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyht.c#6 integrate .. //depot/projects/ia64/lib/libc/net/gethostbynis.c#7 integrate .. //depot/projects/ia64/lib/libc/net/gethostnamadr.c#7 integrate .. //depot/projects/ia64/lib/libc/net/getnetbydns.c#10 integrate .. //depot/projects/ia64/lib/libc/net/getnetbyht.c#7 integrate .. //depot/projects/ia64/lib/libc/net/getnetbynis.c#6 integrate .. //depot/projects/ia64/lib/libc/net/getnetnamadr.c#6 integrate .. //depot/projects/ia64/lib/libc/net/getproto.c#4 integrate .. //depot/projects/ia64/lib/libc/net/getprotoent.c#7 integrate .. //depot/projects/ia64/lib/libc/net/getprotoname.c#4 integrate .. //depot/projects/ia64/lib/libc/net/getservbyname.c#5 delete .. //depot/projects/ia64/lib/libc/net/getservbyport.c#5 delete .. //depot/projects/ia64/lib/libc/net/getservent.c#11 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#21 integrate .. //depot/projects/ia64/lib/libc/net/netdb_private.h#5 integrate .. //depot/projects/ia64/lib/libc/net/nscache.c#1 branch .. //depot/projects/ia64/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/ia64/lib/libc/net/nsdispatch.c#10 integrate .. //depot/projects/ia64/lib/libc/net/nsparser.y#5 integrate .. //depot/projects/ia64/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/ia64/lib/libc/rpc/getrpcent.c#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/Makefile.inc#10 integrate .. //depot/projects/ia64/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fcloseall.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/local.h#12 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.3#18 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#30 integrate .. //depot/projects/ia64/lib/libc/sys/getsockopt.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/mmap.2#15 integrate .. //depot/projects/ia64/lib/libc/sys/write.2#12 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#12 integrate .. //depot/projects/ia64/lib/libcam/camlib.c#5 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#28 integrate .. //depot/projects/ia64/lib/libgpib/Makefile#4 integrate .. //depot/projects/ia64/lib/libkvm/Makefile#3 integrate .. //depot/projects/ia64/lib/libkvm/kvm_amd64.c#5 integrate .. //depot/projects/ia64/lib/libkvm/kvm_i386.c#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_minidump_amd64.c#1 branch .. //depot/projects/ia64/lib/libkvm/kvm_minidump_i386.c#1 branch .. //depot/projects/ia64/lib/libkvm/kvm_private.h#4 integrate .. //depot/projects/ia64/lib/libpcap/Makefile#10 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#19 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#21 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#19 integrate .. //depot/projects/ia64/lib/libthr/Makefile#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_attr.c#6 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_getschedparam.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#20 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#25 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutexattr.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#25 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_rwlock.c#6 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_setschedparam.c#9 integrate .. //depot/projects/ia64/lib/libugidfw/libugidfw.3#6 integrate .. //depot/projects/ia64/lib/libugidfw/ugidfw.c#11 integrate .. //depot/projects/ia64/lib/libugidfw/ugidfw.h#5 integrate .. //depot/projects/ia64/lib/libutil/login.conf.5#11 integrate .. //depot/projects/ia64/lib/libutil/pidfile.c#2 integrate .. //depot/projects/ia64/release/Makefile#96 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#96 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#156 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#17 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#7 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#7 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#29 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.8#16 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#12 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#21 integrate .. //depot/projects/ia64/sbin/dump/traverse.c#20 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.c#10 integrate .. //depot/projects/ia64/sbin/fsdb/fsdb.c#13 integrate .. //depot/projects/ia64/sbin/fsdb/fsdb.h#7 integrate .. //depot/projects/ia64/sbin/fsdb/fsdbutil.c#6 integrate .. //depot/projects/ia64/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/ia64/sbin/geom/core/geom.c#12 integrate .. //depot/projects/ia64/sbin/ggate/Makefile#4 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#36 integrate .. //depot/projects/ia64/sbin/ipf/ipf/Makefile#2 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.8#12 integrate .. //depot/projects/ia64/sbin/pfctl/Makefile#5 integrate .. //depot/projects/ia64/sbin/ping/ping.8#18 integrate .. //depot/projects/ia64/sbin/ping/ping.c#31 integrate .. //depot/projects/ia64/sbin/reboot/boot_i386.8#17 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#28 integrate .. //depot/projects/ia64/share/examples/scsi_target/scsi_cmds.c#7 integrate .. //depot/projects/ia64/share/man/man4/Makefile#93 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#29 integrate .. //depot/projects/ia64/share/man/man4/ath.4#27 integrate .. //depot/projects/ia64/share/man/man4/bce.4#1 branch .. //depot/projects/ia64/share/man/man4/bge.4#17 integrate .. //depot/projects/ia64/share/man/man4/ccd.4#10 integrate .. //depot/projects/ia64/share/man/man4/hwpmc.4#8 integrate .. //depot/projects/ia64/share/man/man4/if_bridge.4#7 integrate .. //depot/projects/ia64/share/man/man4/ipmi.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/acpi_asus.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/acpi_ibm.4#6 integrate .. //depot/projects/ia64/share/man/man4/miibus.4#9 integrate .. //depot/projects/ia64/share/man/man4/ng_fec.4#3 integrate .. //depot/projects/ia64/share/man/man4/polling.4#18 integrate .. //depot/projects/ia64/share/man/man4/rr232x.4#1 branch .. //depot/projects/ia64/share/man/man4/sab.4#3 delete .. //depot/projects/ia64/share/man/man4/snd_via8233.4#5 integrate .. //depot/projects/ia64/share/man/man4/syncache.4#3 integrate .. //depot/projects/ia64/share/man/man4/uscanner.4#12 integrate .. //depot/projects/ia64/share/man/man4/watchdog.4#5 integrate .. //depot/projects/ia64/share/man/man4/wi.4#40 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#70 integrate .. //depot/projects/ia64/share/man/man5/src.conf.5#2 integrate .. //depot/projects/ia64/share/man/man7/hier.7#30 integrate .. //depot/projects/ia64/share/man/man9/Makefile#59 integrate .. //depot/projects/ia64/share/man/man9/SYSCALL_MODULE.9#5 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#19 integrate .. //depot/projects/ia64/share/man/man9/bus_space.9#2 integrate .. //depot/projects/ia64/share/man/man9/crypto.9#5 integrate .. //depot/projects/ia64/share/man/man9/rwlock.9#2 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#15 integrate .. //depot/projects/ia64/share/man/man9/sx.9#15 integrate .. //depot/projects/ia64/share/man/man9/sysctl.9#1 branch .. //depot/projects/ia64/share/man/man9/sysctl_add_oid.9#7 integrate .. //depot/projects/ia64/share/man/man9/sysctl_ctx_init.9#5 integrate .. //depot/projects/ia64/share/mk/bsd.own.mk#13 integrate .. //depot/projects/ia64/share/syscons/fonts/iso15-8x14.fnt#3 integrate .. //depot/projects/ia64/share/syscons/fonts/iso15-8x16.fnt#3 integrate .. //depot/projects/ia64/share/syscons/fonts/iso15-8x8.fnt#3 integrate .. //depot/projects/ia64/share/syscons/fonts/iso15-thin-8x16.fnt#3 integrate .. //depot/projects/ia64/share/termcap/termcap.src#21 integrate .. //depot/projects/ia64/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#60 integrate .. //depot/projects/ia64/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#41 integrate .. //depot/projects/ia64/sys/alpha/isa/isa.c#10 integrate .. //depot/projects/ia64/sys/alpha/pci/apecs_pci.c#5 integrate .. //depot/projects/ia64/sys/alpha/pci/lca_pci.c#7 integrate .. //depot/projects/ia64/sys/alpha/pci/pcibus.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/fpu.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#17 integrate .. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#21 integrate .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#51 integrate .. //depot/projects/ia64/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#33 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#17 integrate .. //depot/projects/ia64/sys/amd64/include/md_var.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/minidump.h#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/ia64/sys/arm/arm/nexus.c#6 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#18 integrate .. //depot/projects/ia64/sys/arm/arm/swtch.S#11 integrate .. //depot/projects/ia64/sys/arm/arm/trap.c#16 integrate .. //depot/projects/ia64/sys/arm/arm/undefined.c#10 integrate .. //depot/projects/ia64/sys/arm/at91/at91.c#2 integrate .. //depot/projects/ia64/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/ia64/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/ia64/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/ia64/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/ia64/sys/arm/include/asmacros.h#5 integrate .. //depot/projects/ia64/sys/arm/include/atomic.h#11 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#13 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0.c#5 integrate .. //depot/projects/ia64/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_pci.c#7 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_timer.c#7 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321.c#8 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/obio.c#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/ia64/sys/boot/i386/boot2/boot1.S#6 integrate .. //depot/projects/ia64/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#16 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#9 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/gatea20.c#3 delete .. //depot/projects/ia64/sys/boot/i386/libi386/libi386.h#11 integrate .. //depot/projects/ia64/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#14 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/gatea20.c#4 delete .. //depot/projects/ia64/sys/cam/cam.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#30 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#67 integrate .. //depot/projects/ia64/sys/conf/NOTES#99 integrate .. //depot/projects/ia64/sys/conf/files#139 integrate .. //depot/projects/ia64/sys/conf/files.alpha#35 integrate .. //depot/projects/ia64/sys/conf/files.amd64#35 integrate .. //depot/projects/ia64/sys/conf/files.i386#74 integrate .. //depot/projects/ia64/sys/conf/files.ia64#64 integrate .. //depot/projects/ia64/sys/conf/files.pc98#62 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#26 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#51 integrate .. //depot/projects/ia64/sys/conf/options#92 integrate .. //depot/projects/ia64/sys/conf/options.alpha#12 integrate .. //depot/projects/ia64/sys/conf/options.amd64#16 integrate .. //depot/projects/ia64/sys/conf/options.arm#7 integrate .. //depot/projects/ia64/sys/conf/options.i386#39 integrate .. //depot/projects/ia64/sys/conf/options.ia64#19 integrate .. //depot/projects/ia64/sys/conf/options.pc98#39 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#18 integrate .. //depot/projects/ia64/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/ia64/sys/ddb/db_command.c#23 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#28 integrate .. //depot/projects/ia64/sys/ddb/db_thread.c#4 integrate .. //depot/projects/ia64/sys/ddb/ddb.h#16 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#50 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#66 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#27 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#15 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.c#11 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#35 integrate .. //depot/projects/ia64/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#26 integrate .. //depot/projects/ia64/sys/dev/amr/amrvar.h#21 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#68 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#26 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#39 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#30 integrate .. //depot/projects/ia64/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/ia64/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/ia64/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/ia64/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#15 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#66 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#37 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#44 integrate .. //depot/projects/ia64/sys/dev/drm/drm-preprocess.sh#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/drmP.h#13 integrate .. //depot/projects/ia64/sys/dev/drm/drm_agpsupport.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drv.h#10 integrate .. //depot/projects/ia64/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_cp.c#13 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drm.h#12 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.h#14 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_state.c#16 integrate .. //depot/projects/ia64/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/sis_mm.c#8 integrate .. //depot/projects/ia64/sys/dev/em/LICENSE#4 integrate .. //depot/projects/ia64/sys/dev/em/README#12 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#51 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#18 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#18 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#65 integrate .. //depot/projects/ia64/sys/dev/hptmv/osbsd.h#5 integrate .. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/ia64/sys/dev/iicbus/iic.c#11 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicbb.c#5 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#28 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#29 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#24 integrate .. //depot/projects/ia64/sys/dev/isp/isp_ioctl.h#11 integrate .. //depot/projects/ia64/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#29 integrate .. //depot/projects/ia64/sys/dev/isp/isp_sbus.c#16 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.c#16 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.h#11 integrate .. //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#7 integrate .. //depot/projects/ia64/sys/dev/isp/ispmbox.h#15 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_2300.h#9 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwireg.h#7 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwivar.h#7 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#27 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#16 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#12 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#20 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/ia64/sys/dev/nve/if_nve.c#9 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#36 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#49 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#55 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#29 integrate .. //depot/projects/ia64/sys/dev/ppbus/lpt.c#16 integrate .. //depot/projects/ia64/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/ia64/sys/dev/ppc/ppc.c#8 integrate .. //depot/projects/ia64/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/ia64/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/ia64/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/ia64/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/ia64/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/ia64/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#30 integrate .. //depot/projects/ia64/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/ia64/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/ia64/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/ia64/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/ia64/sys/dev/puc/puc_ebus.c#8 delete .. //depot/projects/ia64/sys/dev/puc/puc_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/puc/puc_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/puc/puc_sbus.c#10 delete .. //depot/projects/ia64/sys/dev/puc/pucdata.c#33 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#16 delete .. //depot/projects/ia64/sys/dev/random/randomdev_soft.c#9 integrate .. //depot/projects/ia64/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/ia64/sys/dev/rr232x/README#1 branch .. //depot/projects/ia64/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/ia64/sys/dev/rr232x/array.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/him.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/ia64/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/list.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/ia64/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/ia64/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/ia64/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/ia64/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/ia64/sys/dev/sab/sab.c#26 delete .. //depot/projects/ia64/sys/dev/sab/sab82532reg.h#3 delete .. //depot/projects/ia64/sys/dev/safe/safe.c#9 integrate .. //depot/projects/ia64/sys/dev/sio/sio_puc.c#13 integrate .. //depot/projects/ia64/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/ia64/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/ia64/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/ia64/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#34 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#19 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/ia64/sys/dev/uart/uart_bus.h#10 integrate .. //depot/projects/ia64/sys/dev/uart/uart_bus_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/uart/uart_bus_puc.c#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_core.c#14 integrate .. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.c#11 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#26 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#73 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#26 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe.c#21 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs.h#15 integrate .. //depot/projects/ia64/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/ia64/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/ia64/sys/geom/geom.h#47 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#45 integrate .. //depot/projects/ia64/sys/geom/geom_ccd.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#50 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#30 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#36 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#46 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.c#19 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.h#9 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror_ctl.c#8 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#17 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.h#10 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3_ctl.c#9 integrate .. //depot/projects/ia64/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/ia64/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#63 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#72 integrate .. //depot/projects/ia64/sys/i386/i386/dump_machdep.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#42 integrate .. //depot/projects/ia64/sys/i386/i386/io_apic.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#69 integrate .. //depot/projects/ia64/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#51 integrate .. //depot/projects/ia64/sys/i386/i386/nexus.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#91 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#52 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#25 integrate .. //depot/projects/ia64/sys/i386/include/minidump.h#1 branch .. //depot/projects/ia64/sys/i386/include/pmap.h#27 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#31 integrate .. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#94 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#70 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_module.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#42 integrate .. //depot/projects/ia64/sys/kern/kern_poll.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#89 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#64 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#18 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#32 integrate .. //depot/projects/ia64/sys/kern/serdev_if.m#2 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#44 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#21 integrate .. //depot/projects/ia64/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/ia64/sys/kern/subr_taskqueue.c#18 integrate .. //depot/projects/ia64/sys/kern/subr_turnstile.c#15 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#58 integrate .. //depot/projects/ia64/sys/kern/tty_pts.c#3 integrate .. //depot/projects/ia64/sys/kern/uipc_domain.c#19 integrate .. //depot/projects/ia64/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/ia64/sys/kern/uipc_proto.c#5 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#56 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#42 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#60 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#45 integrate .. //depot/projects/ia64/sys/kern/vfs_cache.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_hash.c#4 integrate .. //depot/projects/ia64/sys/kern/vfs_lookup.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#86 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#53 integrate .. //depot/projects/ia64/sys/modules/Makefile#94 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#26 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi_dock/Makefile#1 branch .. //depot/projects/ia64/sys/modules/bce/Makefile#1 branch .. //depot/projects/ia64/sys/modules/puc/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/ia64/sys/modules/sio/Makefile#7 integrate .. //depot/projects/ia64/sys/modules/sk/Makefile#3 integrate .. //depot/projects/ia64/sys/net/if_arc.h#9 integrate .. //depot/projects/ia64/sys/net/if_arcsubr.c#21 integrate .. //depot/projects/ia64/sys/net/if_bridge.c#7 integrate .. //depot/projects/ia64/sys/net/raw_usrreq.c#18 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#18 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#19 integrate .. //depot/projects/ia64/sys/netgraph/netflow/netflow.c#11 integrate .. //depot/projects/ia64/sys/netgraph/netflow/netflow.h#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#28 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#44 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#30 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#33 integrate .. //depot/projects/ia64/sys/netinet/ip_fastfwd.c#19 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#60 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#46 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#68 integrate .. //depot/projects/ia64/sys/netinet/tcp_sack.c#14 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#57 integrate .. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#31 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#44 integrate .. //depot/projects/ia64/sys/netinet6/frag6.c#10 integrate .. //depot/projects/ia64/sys/netinet6/in6_ifattach.c#17 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#30 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.h#11 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#17 integrate .. //depot/projects/ia64/sys/netinet6/ip6_mroute.c#21 integrate .. //depot/projects/ia64/sys/netinet6/raw_ip6.c#25 integrate .. //depot/projects/ia64/sys/netinet6/udp6_output.c#14 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#26 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#14 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/ia64/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#12 integrate .. //depot/projects/ia64/sys/netipx/ipx_usrreq.c#19 integrate .. //depot/projects/ia64/sys/netnatm/natm.c#24 integrate .. //depot/projects/ia64/sys/netnatm/natm_pcb.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#38 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#49 integrate .. //depot/projects/ia64/sys/nfsclient/nfsnode.h#15 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsock.c#22 integrate .. //depot/projects/ia64/sys/nfsserver/nfsrvcache.h#4 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#16 integrate .. //depot/projects/ia64/sys/opencrypto/cryptosoft.c#10 integrate .. //depot/projects/ia64/sys/pc98/cbus/ppc.c#4 delete .. //depot/projects/ia64/sys/pc98/cbus/ppcreg.h#2 delete .. //depot/projects/ia64/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/ia64/sys/pc98/include/minidump.h#1 branch .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#40 delete .. //depot/projects/ia64/sys/pci/if_skreg.h#12 delete .. //depot/projects/ia64/sys/pci/xmaciireg.h#3 delete .. //depot/projects/ia64/sys/pci/yukonreg.h#3 delete .. //depot/projects/ia64/sys/posix4/ksched.c#12 integrate .. //depot/projects/ia64/sys/posix4/p1003_1b.c#9 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#33 integrate .. //depot/projects/ia64/sys/powerpc/powermac/grackle.c#6 integrate .. //depot/projects/ia64/sys/powerpc/powermac/hrowpic.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powermac/macio.c#13 integrate .. //depot/projects/ia64/sys/powerpc/powermac/uninorth.c#9 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/openpic.c#11 integrate .. //depot/projects/ia64/sys/powerpc/psim/iobus.c#7 integrate .. //depot/projects/ia64/sys/security/mac/mac_vfs.c#8 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#20 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.h#5 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#58 integrate .. //depot/projects/ia64/sys/sparc64/conf/NOTES#16 integrate .. //depot/projects/ia64/sys/sparc64/ebus/ebus.c#21 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#39 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#29 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#21 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/interrupt.S#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/nexus.c#13 integrate .. //depot/projects/ia64/sys/sys/bufobj.h#7 integrate .. //depot/projects/ia64/sys/sys/bus.h#24 integrate .. //depot/projects/ia64/sys/sys/eventhandler.h#12 integrate .. //depot/projects/ia64/sys/sys/filedesc.h#26 integrate .. //depot/projects/ia64/sys/sys/lock.h#14 integrate .. //depot/projects/ia64/sys/sys/mac.h#34 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#31 integrate .. //depot/projects/ia64/sys/sys/module.h#5 integrate .. //depot/projects/ia64/sys/sys/param.h#73 integrate .. //depot/projects/ia64/sys/sys/rman.h#12 integrate .. //depot/projects/ia64/sys/sys/rwlock.h#3 integrate .. //depot/projects/ia64/sys/sys/turnstile.h#8 integrate .. //depot/projects/ia64/sys/sys/vnode.h#56 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#48 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#60 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#58 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#17 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#45 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#75 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#19 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#18 integrate .. //depot/projects/ia64/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/ia64/tools/build/options/WITHOUT_BIND_MTREE#2 integrate .. //depot/projects/ia64/tools/regression/bin/sh/builtins/var-assign.0#1 branch .. //depot/projects/ia64/tools/regression/geom_eli/nokey.t#2 integrate .. //depot/projects/ia64/tools/regression/geom_gpt/gctl.t#3 integrate .. //depot/projects/ia64/tools/regression/geom_gpt/test.c#2 integrate .. //depot/projects/ia64/tools/regression/mac/mac_bsdextended/test_matches.sh#1 branch .. //depot/projects/ia64/tools/regression/mac/mac_bsdextended/test_ugidfw.c#2 integrate .. //depot/projects/ia64/tools/regression/sockets/rtsocket/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sockets/rtsocket/rtsocket.c#1 branch .. //depot/projects/ia64/tools/regression/sockets/unix_socket/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sockets/unix_socket/unix_socket.c#1 branch .. //depot/projects/ia64/tools/tools/nanobsd/FlashDevice.sub#5 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.1#12 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.pl#23 integrate .. //depot/projects/ia64/usr.bin/Makefile#74 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#59 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag#4 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies#2 integrate .. //depot/projects/ia64/usr.bin/elf2aout/elf2aout.c#11 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.1#16 integrate .. //depot/projects/ia64/usr.bin/find/option.c#12 integrate .. //depot/projects/ia64/usr.bin/login/Makefile#11 integrate .. //depot/projects/ia64/usr.bin/lorder/lorder.1#4 integrate .. //depot/projects/ia64/usr.bin/make/make.1#25 integrate .. //depot/projects/ia64/usr.bin/make/var.c#26 integrate .. //depot/projects/ia64/usr.bin/systat/cmdtab.c#5 integrate .. //depot/projects/ia64/usr.bin/systat/icmp.c#3 integrate .. //depot/projects/ia64/usr.bin/systat/icmp6.c#2 integrate .. //depot/projects/ia64/usr.bin/systat/ifstat.c#3 integrate .. //depot/projects/ia64/usr.bin/systat/iostat.c#7 integrate .. //depot/projects/ia64/usr.bin/systat/ip.c#3 integrate .. //depot/projects/ia64/usr.bin/systat/ip6.c#2 integrate .. //depot/projects/ia64/usr.bin/systat/main.c#5 integrate .. //depot/projects/ia64/usr.bin/systat/mbufs.c#5 integrate .. //depot/projects/ia64/usr.bin/systat/netstat.c#8 integrate .. //depot/projects/ia64/usr.bin/systat/pigs.c#8 integrate .. //depot/projects/ia64/usr.bin/systat/swap.c#6 integrate .. //depot/projects/ia64/usr.bin/systat/systat.1#14 integrate .. //depot/projects/ia64/usr.bin/systat/systat.h#3 integrate .. //depot/projects/ia64/usr.bin/systat/tcp.c#5 integrate .. //depot/projects/ia64/usr.bin/systat/vmstat.c#13 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar.1#11 integrate .. //depot/projects/ia64/usr.bin/time/time.c#9 integrate .. //depot/projects/ia64/usr.bin/truncate/truncate.1#4 integrate .. //depot/projects/ia64/usr.bin/truncate/truncate.c#5 integrate .. //depot/projects/ia64/usr.sbin/Makefile#77 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/bsnmpd/Makefile#10 integrate .. //depot/projects/ia64/usr.sbin/cached/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/cached/agent.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/agent.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/agents/Makefile.inc#1 branch .. //depot/projects/ia64/usr.sbin/cached/agents/group.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/agents/group.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/agents/passwd.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/agents/passwd.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/agents/services.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/agents/services.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/cached.8#1 branch .. //depot/projects/ia64/usr.sbin/cached/cached.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/cached.conf.5#1 branch .. //depot/projects/ia64/usr.sbin/cached/cachedcli.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/cachedcli.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/cachelib.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/cachelib.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/cacheplcs.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/cacheplcs.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/config.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/config.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/debug.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/debug.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/hashtable.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/log.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/log.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/mp_rs_query.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/mp_rs_query.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/mp_ws_query.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/mp_ws_query.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/parser.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/parser.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/protocol.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/protocol.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/query.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/query.h#1 branch .. //depot/projects/ia64/usr.sbin/cached/singletons.c#1 branch .. //depot/projects/ia64/usr.sbin/cached/singletons.h#1 branch .. //depot/projects/ia64/usr.sbin/inetd/Makefile#5 integrate .. //depot/projects/ia64/usr.sbin/inetd/builtins.c#5 integrate .. //depot/projects/ia64/usr.sbin/iostat/iostat.8#9 integrate .. //depot/projects/ia64/usr.sbin/iostat/iostat.c#5 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.c#13 integrate .. //depot/projects/ia64/usr.sbin/jexec/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/jexec/jexec.8#3 integrate .. //depot/projects/ia64/usr.sbin/jexec/jexec.c#3 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.8#16 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.sh#20 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/create/main.c#8 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#15 integrate .. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat_log.c#5 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#34 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#55 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#19 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslog.conf.5#15 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#30 integrate .. //depot/projects/ia64/usr.sbin/ugidfw/ugidfw.8#6 integrate .. //depot/projects/ia64/usr.sbin/ugidfw/ugidfw.c#6 integrate .. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate .. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/Packet32.c#2 integrate .. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/Makefile.yp#6 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.32 2006/04/03 18:42:43 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.33 2006/04/13 13:19:10 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -2654,6 +2654,8 @@ OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +# 20060413: shared library moved to /usr/lib +OLD_LIBS+=lib/libgpib.so.1 # 20060127: revert libdisk to static-only OLD_LIBS+=usr/lib/libdisk.so.3 # 20050722: bump for 6.0-RELEASE ==== //depot/projects/ia64/UPDATING#85 (text+ko) ==== @@ -429,7 +429,7 @@ make installworld DESTDIR=${CURRENT_ROOT} - cd src/etc; make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd + make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd @@ -543,4 +543,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.444 2006/03/21 10:10:05 ru Exp $ +$FreeBSD: src/UPDATING,v 1.445 2006/04/07 11:36:25 ru Exp $ ==== //depot/projects/ia64/bin/ps/keyword.c#19 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.74 2006/03/08 09:15:20 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); #include #include @@ -308,14 +308,25 @@ if (v && v->alias) { /* - * XXX - This processing will not be correct for any alias - * which expands into a list of format keywords. Presently - * there are no aliases which do that. + * If the user specified an alternate-header for this + * (aliased) format-name, then we need to copy that + * alternate-header when making the recursive call to + * process the alias. */ - rflen = strlen(v->alias) + strlen(hp) + 2; - realfmt = malloc(rflen); - snprintf(realfmt, rflen, "%s=%s", v->alias, hp); - parsefmt(realfmt, user); + if (hp == NULL) + parsefmt(v->alias, user); + else { + /* + * XXX - This processing will not be correct for + * any alias which expands into a list of format + * keywords. Presently there are no aliases + * which do that. + */ + rflen = strlen(v->alias) + strlen(hp) + 2; + realfmt = malloc(rflen); + snprintf(realfmt, rflen, "%s=%s", v->alias, hp); + parsefmt(realfmt, user); + } return ((VAR *)NULL); } if (!v) { ==== //depot/projects/ia64/bin/rm/rm.c#15 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.53 2005/09/29 20:40:29 dougb Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.54 2006/04/15 09:26:23 maxim Exp $"); #include #include @@ -307,6 +307,7 @@ } if (errno) err(1, "fts_read"); + fts_close(fts); } void ==== //depot/projects/ia64/bin/sh/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.45 2005/08/14 07:46:56 stefanf Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.46 2006/04/17 17:55:11 schweikh Exp $ PROG= sh INSTALLFLAGS= -S @@ -13,7 +13,7 @@ # MLINKS for Shell built in commands for which there are no userland # utilities of the same name are handled with the associated manpage, -# builtin.1 in share/man/man1/. +# builtin.1 in share/man/man1/. DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP} LDADD= -ll -ledit -ltermcap ==== //depot/projects/ia64/bin/sh/TOUR#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)TOUR 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/sh/TOUR,v 1.6 1999/08/27 23:15:07 peter Exp $ +# $FreeBSD: src/bin/sh/TOUR,v 1.7 2006/04/16 11:54:01 schweikh Exp $ NOTE -- This is the original TOUR paper distributed with ash and does not represent the current state of the shell. It is provided anyway @@ -22,8 +22,8 @@ programs that generate source code. A complete list of these programs is: - program intput files generates - ------- ------------ --------- + program input files generates + ------- ----------- --------- mkbuiltins builtins builtins.h builtins.c mkinit *.c init.c mknodes nodetypes nodes.h nodes.c @@ -91,7 +91,7 @@ EXINT exception to return to the main command loop. (Exception: EXINT is not raised if the user traps interrupts using the trap command.) The INTOFF and INTON macros (defined in exception.h) -provide uninterruptable critical sections. Between the execution +provide uninterruptible critical sections. Between the execution of INTOFF and the execution of INTON, interrupt signals will be held for later delivery. INTOFF and INTON can be nested. @@ -110,7 +110,7 @@ p = stackptr; *p++ = c; /* repeated as many times as needed */ stackptr = p; -The folloing three macros (defined in memalloc.h) perform these +The following three macros (defined in memalloc.h) perform these operations, but grow the stack if you run off the end: STARTSTACKSTR(p); STPUTC(c, p); /* repeated as many times as needed */ @@ -119,7 +119,7 @@ We now start a top-down look at the code: MAIN.C: The main routine performs some initialization, executes -the user's profile if necessary, and calls cmdloop. Cmdloop is +the user's profile if necessary, and calls cmdloop. Cmdloop repeatedly parses and executes commands. OPTIONS.C: This file contains the option processing code. It is @@ -178,7 +178,7 @@ VSQUESTION ${var?text} VSQUESTION|VSNUL ${var:?text} VSASSIGN ${var=text} - VSASSIGN|VSNUL ${var=text} + VSASSIGN|VSNUL ${var:=text} In addition, the type field will have the VSQUOTE flag set if the variable is enclosed in double quotes. The name of the variable @@ -204,7 +204,7 @@ field can be written without any processing). Other here docu- ments, and words which are not subject to splitting and file name generation, have the CTLESC characters removed during the vari- -able and command substitution phase. Words which are subject +able and command substitution phase. Words which are subject to splitting and file name generation have the CTLESC characters re- moved as part of the file name phase. @@ -212,7 +212,7 @@ eval.c The top level routines. redir.c Code to handle redirection of input and output. jobs.c Code to handle forking, waiting, and job control. - exec.c Code to to path searches and the actual exec sys call. + exec.c Code to do path searches and the actual exec sys call. expand.c Code to evaluate arguments. var.c Maintains the variable symbol table. Called from expand.c. @@ -232,7 +232,7 @@ REDIR.C: Ash allows file descriptors to be redirected and then restored without forking off a child process. This is accom- plished by duplicating the original file descriptors. The redir- -tab structure records where the file descriptors have be dupli- +tab structure records where the file descriptors have been dupli- cated to. EXEC.C: The routine find_command locates a command, and enters @@ -283,8 +283,8 @@ tered throughout the code, depending on which location appears most appropriate. They can be recognized because their names al- ways end in "cmd". The mapping from names to procedures is -specified in the file builtins, which is processed by the mkbuil- -tins command. +specified in the file builtins, which is processed by the mkbuilt- +ins command. A builtin command is invoked with argc and argv set up like a normal program. A builtin command is allowed to overwrite its ==== //depot/projects/ia64/bin/sh/eval.c#15 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.51 2006/04/09 12:20:42 stefanf Exp $"); #include #include @@ -658,8 +658,10 @@ /* Now locate the command. */ if (argc == 0) { + /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; + cmdentry.special = 1; } else { static const char PATH[] = "PATH="; char *path = pathval(); @@ -705,7 +707,8 @@ argv++; if (--argc == 0) break; - if ((cmdentry.u.index = find_builtin(*argv)) < 0) { + if ((cmdentry.u.index = find_builtin(*argv, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 20:27:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F319016A406; Mon, 1 May 2006 20:27:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B2FAE16A400 for ; Mon, 1 May 2006 20:27:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F9D543D4C for ; Mon, 1 May 2006 20:27:57 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41KRvHe021457 for ; Mon, 1 May 2006 20:27:57 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41KRuBq021451 for perforce@freebsd.org; Mon, 1 May 2006 20:27:56 GMT (envelope-from marcel@freebsd.org) Date: Mon, 1 May 2006 20:27:56 GMT Message-Id: <200605012027.k41KRuBq021451@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 Cc: Subject: PERFORCE change 96510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 20:27:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=96510 Change 96510 by marcel@marcel_nfs on 2006/05/01 20:27:47 Change the file type from text+ko to text. Affected files ... .. //depot/projects/uart/dev/ppc/ppc_acpi.c#4 edit .. //depot/projects/uart/dev/ppc/ppc_isa.c#4 edit .. //depot/projects/uart/dev/ppc/ppc_pci.c#4 edit .. //depot/projects/uart/dev/puc/puc_bfe.h#7 edit .. //depot/projects/uart/dev/puc/puc_bus.h#5 edit .. //depot/projects/uart/dev/puc/puc_cfg.c#8 edit .. //depot/projects/uart/dev/puc/puc_cfg.h#8 edit .. //depot/projects/uart/dev/scc/scc_bfe.h#18 edit .. //depot/projects/uart/dev/scc/scc_bfe_ebus.c#8 edit .. //depot/projects/uart/dev/scc/scc_bfe_sbus.c#8 edit .. //depot/projects/uart/dev/scc/scc_bus.h#10 edit .. //depot/projects/uart/dev/scc/scc_core.c#22 edit .. //depot/projects/uart/dev/scc/scc_dev_sab82532.c#10 edit .. //depot/projects/uart/dev/scc/scc_dev_z8530.c#12 edit .. //depot/projects/uart/dev/scc/scc_if.m#9 edit .. //depot/projects/uart/dev/uart/uart_bus_scc.c#10 edit .. //depot/projects/uart/kern/serdev_if.m#8 edit .. //depot/projects/uart/modules/scc/Makefile#5 edit Differences ... ==== //depot/projects/uart/dev/ppc/ppc_acpi.c#4 (text/text+ko) ==== ==== //depot/projects/uart/dev/ppc/ppc_isa.c#4 (text/text+ko) ==== ==== //depot/projects/uart/dev/ppc/ppc_pci.c#4 (text/text+ko) ==== ==== //depot/projects/uart/dev/puc/puc_bfe.h#7 (text/text+ko) ==== ==== //depot/projects/uart/dev/puc/puc_bus.h#5 (text/text+ko) ==== ==== //depot/projects/uart/dev/puc/puc_cfg.c#8 (text/text+ko) ==== ==== //depot/projects/uart/dev/puc/puc_cfg.h#8 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_bfe.h#18 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_bfe_ebus.c#8 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_bfe_sbus.c#8 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_bus.h#10 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_core.c#22 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_dev_sab82532.c#10 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_dev_z8530.c#12 (text/text+ko) ==== ==== //depot/projects/uart/dev/scc/scc_if.m#9 (text/text+ko) ==== ==== //depot/projects/uart/dev/uart/uart_bus_scc.c#10 (text/text+ko) ==== ==== //depot/projects/uart/kern/serdev_if.m#8 (text/text+ko) ==== ==== //depot/projects/uart/modules/scc/Makefile#5 (text/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon May 1 20:41:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEE4016A40F; Mon, 1 May 2006 20:41:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9154B16A405 for ; Mon, 1 May 2006 20:41:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D5E843D46 for ; Mon, 1 May 2006 20:41:29 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41KfTx3026661 for ; Mon, 1 May 2006 20:41:29 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41KeYEP026077 for perforce@freebsd.org; Mon, 1 May 2006 20:40:34 GMT (envelope-from marcel@freebsd.org) Date: Mon, 1 May 2006 20:40:34 GMT Message-Id: <200605012040.k41KeYEP026077@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 Cc: Subject: PERFORCE change 96511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 20:41:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=96511 Change 96511 by marcel@marcel_nfs on 2006/05/01 20:39:42 IFC @96496 Affected files ... .. //depot/projects/tty/MAINTAINERS#17 integrate .. //depot/projects/tty/Makefile#15 integrate .. //depot/projects/tty/Makefile.inc1#27 integrate .. //depot/projects/tty/ObsoleteFiles.inc#4 integrate .. //depot/projects/tty/README#3 integrate .. //depot/projects/tty/UPDATING#27 integrate .. //depot/projects/tty/bin/Makefile#5 integrate .. //depot/projects/tty/bin/Makefile.inc#7 integrate .. //depot/projects/tty/bin/chflags/chflags.1#10 integrate .. //depot/projects/tty/bin/csh/Makefile#7 integrate .. //depot/projects/tty/bin/csh/config.h#6 integrate .. //depot/projects/tty/bin/csh/iconv.h#1 branch .. //depot/projects/tty/bin/csh/iconv_stub.c#1 branch .. //depot/projects/tty/bin/ed/Makefile#6 integrate .. //depot/projects/tty/bin/getfacl/getfacl.1#5 integrate .. //depot/projects/tty/bin/getfacl/getfacl.c#3 integrate .. //depot/projects/tty/bin/ln/ln.1#5 integrate .. //depot/projects/tty/bin/ln/ln.c#6 integrate .. //depot/projects/tty/bin/ls/cmp.c#7 integrate .. //depot/projects/tty/bin/ls/extern.h#6 integrate .. //depot/projects/tty/bin/ls/ls.1#14 integrate .. //depot/projects/tty/bin/ls/ls.c#11 integrate .. //depot/projects/tty/bin/ls/ls.h#5 integrate .. //depot/projects/tty/bin/ls/print.c#8 integrate .. //depot/projects/tty/bin/ls/util.c#10 integrate .. //depot/projects/tty/bin/ps/keyword.c#8 integrate .. //depot/projects/tty/bin/ps/print.c#7 integrate .. //depot/projects/tty/bin/rm/rm.c#7 integrate .. //depot/projects/tty/bin/sh/Makefile#5 integrate .. //depot/projects/tty/bin/sh/TOUR#2 integrate .. //depot/projects/tty/bin/sh/builtins.def#5 integrate .. //depot/projects/tty/bin/sh/error.c#3 integrate .. //depot/projects/tty/bin/sh/eval.c#6 integrate .. //depot/projects/tty/bin/sh/exec.c#7 integrate .. //depot/projects/tty/bin/sh/exec.h#5 integrate .. //depot/projects/tty/bin/sh/expand.c#8 integrate .. //depot/projects/tty/bin/sh/input.c#4 integrate .. //depot/projects/tty/bin/sh/jobs.c#9 integrate .. //depot/projects/tty/bin/sh/main.c#3 integrate .. //depot/projects/tty/bin/sh/miscbltin.c#5 integrate .. //depot/projects/tty/bin/sh/mkbuiltins#6 integrate .. //depot/projects/tty/bin/sh/options.c#6 integrate .. //depot/projects/tty/bin/sh/show.c#4 integrate .. //depot/projects/tty/bin/sh/trap.c#5 integrate .. //depot/projects/tty/bin/sh/var.c#8 integrate .. //depot/projects/tty/bin/sh/var.h#3 integrate .. //depot/projects/tty/contrib/amd/fixmount/fixmount.8#6 integrate .. //depot/projects/tty/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/tty/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/tty/contrib/bsnmp/NEWS#8 integrate .. //depot/projects/tty/contrib/bsnmp/TODO#3 integrate .. //depot/projects/tty/contrib/bsnmp/VERSION#8 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#8 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.c#5 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.h#5 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpclient.c#6 integrate .. //depot/projects/tty/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#9 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#7 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/config.c#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#10 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpd.config#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpmod.3#7 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/tty/contrib/csup/GNUmakefile#1 branch .. //depot/projects/tty/contrib/csup/Makefile#1 branch .. //depot/projects/tty/contrib/csup/README#1 branch .. //depot/projects/tty/contrib/csup/TODO#1 branch .. //depot/projects/tty/contrib/csup/attrstack.c#1 branch .. //depot/projects/tty/contrib/csup/attrstack.h#1 branch .. //depot/projects/tty/contrib/csup/config.c#1 branch .. //depot/projects/tty/contrib/csup/config.h#1 branch .. //depot/projects/tty/contrib/csup/csup.1#1 branch .. //depot/projects/tty/contrib/csup/detailer.c#1 branch .. //depot/projects/tty/contrib/csup/detailer.h#1 branch .. //depot/projects/tty/contrib/csup/diff.c#1 branch .. //depot/projects/tty/contrib/csup/diff.h#1 branch .. //depot/projects/tty/contrib/csup/fattr.c#1 branch .. //depot/projects/tty/contrib/csup/fattr.h#1 branch .. //depot/projects/tty/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/tty/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/tty/contrib/csup/fixups.c#1 branch .. //depot/projects/tty/contrib/csup/fixups.h#1 branch .. //depot/projects/tty/contrib/csup/fnmatch.c#1 branch .. //depot/projects/tty/contrib/csup/fnmatch.h#1 branch .. //depot/projects/tty/contrib/csup/globtree.c#1 branch .. //depot/projects/tty/contrib/csup/globtree.h#1 branch .. //depot/projects/tty/contrib/csup/idcache.c#1 branch .. //depot/projects/tty/contrib/csup/idcache.h#1 branch .. //depot/projects/tty/contrib/csup/keyword.c#1 branch .. //depot/projects/tty/contrib/csup/keyword.h#1 branch .. //depot/projects/tty/contrib/csup/lister.c#1 branch .. //depot/projects/tty/contrib/csup/lister.h#1 branch .. //depot/projects/tty/contrib/csup/main.c#1 branch .. //depot/projects/tty/contrib/csup/main.h#1 branch .. //depot/projects/tty/contrib/csup/misc.c#1 branch .. //depot/projects/tty/contrib/csup/misc.h#1 branch .. //depot/projects/tty/contrib/csup/mux.c#1 branch .. //depot/projects/tty/contrib/csup/mux.h#1 branch .. //depot/projects/tty/contrib/csup/parse.y#1 branch .. //depot/projects/tty/contrib/csup/pathcomp.c#1 branch .. //depot/projects/tty/contrib/csup/pathcomp.h#1 branch .. //depot/projects/tty/contrib/csup/proto.c#1 branch .. //depot/projects/tty/contrib/csup/proto.h#1 branch .. //depot/projects/tty/contrib/csup/queue.h#1 branch .. //depot/projects/tty/contrib/csup/status.c#1 branch .. //depot/projects/tty/contrib/csup/status.h#1 branch .. //depot/projects/tty/contrib/csup/stream.c#1 branch .. //depot/projects/tty/contrib/csup/stream.h#1 branch .. //depot/projects/tty/contrib/csup/threads.c#1 branch .. //depot/projects/tty/contrib/csup/threads.h#1 branch .. //depot/projects/tty/contrib/csup/token.h#1 branch .. //depot/projects/tty/contrib/csup/token.l#1 branch .. //depot/projects/tty/contrib/csup/updater.c#1 branch .. //depot/projects/tty/contrib/csup/updater.h#1 branch .. //depot/projects/tty/contrib/hostapd/ChangeLog#3 integrate .. //depot/projects/tty/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/hostapd/Makefile#3 integrate .. //depot/projects/tty/contrib/hostapd/README#2 integrate .. //depot/projects/tty/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/tty/contrib/hostapd/aes.c#2 integrate .. //depot/projects/tty/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/tty/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/tty/contrib/hostapd/common.c#2 integrate .. //depot/projects/tty/contrib/hostapd/common.h#3 integrate .. //depot/projects/tty/contrib/hostapd/config.c#3 integrate .. //depot/projects/tty/contrib/hostapd/config.h#2 integrate .. //depot/projects/tty/contrib/hostapd/config_types.h#1 branch .. //depot/projects/tty/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/tty/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/tty/contrib/hostapd/ctrl_iface.c#3 integrate .. //depot/projects/tty/contrib/hostapd/defconfig#2 integrate .. //depot/projects/tty/contrib/hostapd/defs.h#2 integrate .. //depot/projects/tty/contrib/hostapd/driver.h#2 integrate .. //depot/projects/tty/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/tty/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap.h#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/tty/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/tty/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/tty/contrib/hostapd/eapol_sm.c#3 integrate .. //depot/projects/tty/contrib/hostapd/eapol_sm.h#3 integrate .. //depot/projects/tty/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/tty/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/tty/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/tty/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/tty/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/tty/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/tty/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/tty/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/tty/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/tty/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/tty/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/tty/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/tty/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/tty/contrib/hostapd/ieee802_1x.c#3 integrate .. //depot/projects/tty/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/tty/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/tty/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/tty/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/tty/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/tty/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/tty/contrib/hostapd/md5.c#2 integrate .. //depot/projects/tty/contrib/hostapd/md5.h#2 integrate .. //depot/projects/tty/contrib/hostapd/ms_funcs.c#3 integrate .. //depot/projects/tty/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/tty/contrib/hostapd/radius.c#2 integrate .. //depot/projects/tty/contrib/hostapd/radius.h#2 integrate .. //depot/projects/tty/contrib/hostapd/radius_client.c#3 integrate .. //depot/projects/tty/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/tty/contrib/hostapd/radius_server.c#3 integrate .. //depot/projects/tty/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/tty/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/tty/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/tty/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/tty/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/tty/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/tty/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/tty/contrib/hostapd/tls.h#2 integrate .. //depot/projects/tty/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/tty/contrib/hostapd/tls_openssl.c#3 integrate .. //depot/projects/tty/contrib/hostapd/version.h#3 integrate .. //depot/projects/tty/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/tty/contrib/hostapd/wpa.c#3 integrate .. //depot/projects/tty/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/tty/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/tty/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/tty/contrib/ipfilter/man/Makefile#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/tty/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/tty/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/tty/contrib/libreadline/CHANGELOG#4 integrate .. //depot/projects/tty/contrib/libreadline/CHANGES#4 integrate .. //depot/projects/tty/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/tty/contrib/libreadline/INSTALL#4 integrate .. //depot/projects/tty/contrib/libreadline/MANIFEST#4 integrate .. //depot/projects/tty/contrib/libreadline/Makefile.in#4 integrate .. //depot/projects/tty/contrib/libreadline/NEWS#2 integrate .. //depot/projects/tty/contrib/libreadline/README#4 integrate .. //depot/projects/tty/contrib/libreadline/aclocal.m4#4 integrate .. //depot/projects/tty/contrib/libreadline/bind.c#5 integrate .. //depot/projects/tty/contrib/libreadline/callback.c#4 integrate .. //depot/projects/tty/contrib/libreadline/chardefs.h#4 integrate .. //depot/projects/tty/contrib/libreadline/complete.c#5 integrate .. //depot/projects/tty/contrib/libreadline/config.h.in#4 integrate .. //depot/projects/tty/contrib/libreadline/configure#4 integrate .. //depot/projects/tty/contrib/libreadline/configure.in#4 integrate .. //depot/projects/tty/contrib/libreadline/display.c#5 integrate .. //depot/projects/tty/contrib/libreadline/doc/readline.3#5 integrate .. //depot/projects/tty/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/tty/contrib/libreadline/examples/Makefile.in#4 integrate .. //depot/projects/tty/contrib/libreadline/examples/histexamp.c#4 integrate .. //depot/projects/tty/contrib/libreadline/examples/rl.c#3 integrate .. //depot/projects/tty/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/tty/contrib/libreadline/examples/rlfe.c#2 delete .. //depot/projects/tty/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/tty/contrib/libreadline/examples/rltest.c#3 integrate .. //depot/projects/tty/contrib/libreadline/examples/rlversion.c#3 integrate .. //depot/projects/tty/contrib/libreadline/funmap.c#4 integrate .. //depot/projects/tty/contrib/libreadline/histexpand.c#4 integrate .. //depot/projects/tty/contrib/libreadline/history.c#4 integrate .. //depot/projects/tty/contrib/libreadline/input.c#4 integrate .. //depot/projects/tty/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/tty/contrib/libreadline/macro.c#3 integrate .. //depot/projects/tty/contrib/libreadline/mbutil.c#4 integrate .. //depot/projects/tty/contrib/libreadline/misc.c#3 integrate .. //depot/projects/tty/contrib/libreadline/readline.c#5 integrate .. //depot/projects/tty/contrib/libreadline/readline.h#5 integrate .. //depot/projects/tty/contrib/libreadline/rldefs.h#4 integrate .. //depot/projects/tty/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/tty/contrib/libreadline/rlprivate.h#4 integrate .. //depot/projects/tty/contrib/libreadline/rltty.c#4 integrate .. //depot/projects/tty/contrib/libreadline/search.c#4 integrate .. //depot/projects/tty/contrib/libreadline/shell.c#5 integrate .. //depot/projects/tty/contrib/libreadline/shlib/Makefile.in#4 integrate .. //depot/projects/tty/contrib/libreadline/signals.c#4 integrate .. //depot/projects/tty/contrib/libreadline/support/config.guess#4 integrate .. //depot/projects/tty/contrib/libreadline/support/shlib-install#4 integrate .. //depot/projects/tty/contrib/libreadline/support/shobj-conf#4 integrate .. //depot/projects/tty/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/tty/contrib/libreadline/terminal.c#5 integrate .. //depot/projects/tty/contrib/libreadline/text.c#3 integrate .. //depot/projects/tty/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/tty/contrib/libreadline/tilde.h#3 integrate .. //depot/projects/tty/contrib/libreadline/undo.c#3 integrate .. //depot/projects/tty/contrib/libreadline/util.c#5 integrate .. //depot/projects/tty/contrib/libreadline/vi_keymap.c#3 integrate .. //depot/projects/tty/contrib/libreadline/vi_mode.c#5 integrate .. //depot/projects/tty/contrib/netcat/nc.1#3 integrate .. //depot/projects/tty/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/tty/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/tty/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/tty/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/tty/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/tty/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/tty/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/tty/contrib/openbsm/HISTORY#1 branch .. //depot/projects/tty/contrib/openbsm/LICENSE#1 branch .. //depot/projects/tty/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/README#1 branch .. //depot/projects/tty/contrib/openbsm/TODO#1 branch .. //depot/projects/tty/contrib/openbsm/VERSION#1 branch .. //depot/projects/tty/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/tty/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/tty/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/tty/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/tty/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/tty/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/tty/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/tty/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/tty/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/tty/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/tty/contrib/openbsm/config/config.h#1 branch .. //depot/projects/tty/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/tty/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/tty/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/tty/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/tty/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/tty/contrib/openbsm/config/missing#1 branch .. //depot/projects/tty/contrib/openbsm/configure#1 branch .. //depot/projects/tty/contrib/openbsm/configure.ac#1 branch .. //depot/projects/tty/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/tty/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/tty/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/tty/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/tty/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/tty/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/tty/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/tty/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/tty/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/tty/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/tty/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/tty/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/tty/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/tty/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/tty/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/tty/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/tty/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/tty/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/tty/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/tty/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/tty/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/tty/contrib/openbsm/tools/audump.c#1 branch .. //depot/projects/tty/contrib/opie/opiepasswd.c#2 integrate .. //depot/projects/tty/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/tty/contrib/pf/pflogd/pflogd.c#6 integrate .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#10 integrate .. //depot/projects/tty/contrib/sendmail/PGPKEYS#6 integrate .. //depot/projects/tty/contrib/sendmail/README#4 integrate .. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#10 integrate .. //depot/projects/tty/contrib/sendmail/cf/README#9 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/Makefile#4 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/knecht.mc#3 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#10 integrate .. //depot/projects/tty/contrib/sendmail/cf/feature/dnsbl.m4#3 integrate .. //depot/projects/tty/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/proto.m4#8 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#10 integrate .. //depot/projects/tty/contrib/sendmail/cf/ostype/darwin.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/cf/sendmail.schema#4 integrate .. //depot/projects/tty/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/doc/op/Makefile#3 integrate .. //depot/projects/tty/contrib/sendmail/doc/op/op.me#9 integrate .. //depot/projects/tty/contrib/sendmail/include/libmilter/mfdef.h#4 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/conf.h#9 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/ldap.h#3 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/tty/contrib/sendmail/libmilter/README#5 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_helo.html#4 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/libmilter.h#7 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/listener.c#8 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/signal.c#7 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/smfi.c#4 integrate .. //depot/projects/tty/contrib/sendmail/libsm/Makefile.m4#5 integrate .. //depot/projects/tty/contrib/sendmail/libsm/b-strcmp.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/b-strl.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/clock.c#6 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fclose.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fflush.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fopen.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fpos.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fseek.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/ldap.c#7 integrate .. //depot/projects/tty/contrib/sendmail/libsm/local.h#5 integrate .. //depot/projects/tty/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/tty/contrib/sendmail/libsm/refill.c#4 integrate .. //depot/projects/tty/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/shm.c#5 integrate .. //depot/projects/tty/contrib/sendmail/libsm/signal.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/stdio.c#7 integrate .. //depot/projects/tty/contrib/sendmail/libsm/strio.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/t-event.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/tty/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/ungetc.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/vfprintf.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/vfscanf.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/README#10 integrate .. //depot/projects/tty/contrib/sendmail/src/TRACEFLAGS#6 integrate .. //depot/projects/tty/contrib/sendmail/src/collect.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.c#12 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.h#5 integrate .. //depot/projects/tty/contrib/sendmail/src/daemon.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/deliver.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/envelope.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/headers.c#11 integrate .. //depot/projects/tty/contrib/sendmail/src/helpfile#3 integrate .. //depot/projects/tty/contrib/sendmail/src/main.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/map.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/mci.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/milter.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/mime.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/parseaddr.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/queue.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/readcf.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/savemail.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.h#10 integrate .. //depot/projects/tty/contrib/sendmail/src/sfsasl.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/sfsasl.h#2 integrate .. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/tls.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/udb.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/usersmtp.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/util.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/version.c#10 integrate .. //depot/projects/tty/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/tty/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/tty/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/tty/contrib/top/top.X#6 integrate .. //depot/projects/tty/contrib/top/top.c#6 integrate .. //depot/projects/tty/contrib/wpa_supplicant/ChangeLog#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/README#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/common.h#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/config.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/ctrl_iface.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/tty/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_mschapv2.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_peap.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_tls_common.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_ttls.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eapol_sm.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/tty/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/ms_funcs.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/tls_openssl.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/version.h#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_ctrl.c#3 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant.c#4 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate .. //depot/projects/tty/crypto/openssh/ChangeLog#7 integrate .. //depot/projects/tty/crypto/openssh/FREEBSD-upgrade#6 integrate .. //depot/projects/tty/crypto/openssh/Makefile.in#7 integrate .. //depot/projects/tty/crypto/openssh/README#7 integrate .. //depot/projects/tty/crypto/openssh/README.platform#4 integrate .. //depot/projects/tty/crypto/openssh/README.tun#1 branch .. //depot/projects/tty/crypto/openssh/acconfig.h#7 delete .. //depot/projects/tty/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/tty/crypto/openssh/auth-krb5.c#7 integrate .. //depot/projects/tty/crypto/openssh/auth-options.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/tty/crypto/openssh/auth-pam.c#7 integrate .. //depot/projects/tty/crypto/openssh/auth2-gss.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth2.c#7 integrate .. //depot/projects/tty/crypto/openssh/bufaux.c#6 integrate .. //depot/projects/tty/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/tty/crypto/openssh/canohost.c#7 integrate .. //depot/projects/tty/crypto/openssh/channels.c#8 integrate .. //depot/projects/tty/crypto/openssh/channels.h#7 integrate .. //depot/projects/tty/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/tty/crypto/openssh/cipher-ctr.c#4 integrate .. //depot/projects/tty/crypto/openssh/cipher.c#7 integrate .. //depot/projects/tty/crypto/openssh/clientloop.c#7 integrate .. //depot/projects/tty/crypto/openssh/config.h#7 integrate .. //depot/projects/tty/crypto/openssh/configure.ac#7 integrate .. //depot/projects/tty/crypto/openssh/defines.h#7 integrate .. //depot/projects/tty/crypto/openssh/dns.c#4 integrate .. //depot/projects/tty/crypto/openssh/dns.h#2 integrate .. //depot/projects/tty/crypto/openssh/entropy.c#4 integrate .. //depot/projects/tty/crypto/openssh/entropy.h#2 integrate .. //depot/projects/tty/crypto/openssh/envpass.sh#2 delete .. //depot/projects/tty/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/tty/crypto/openssh/gss-serv-krb5.c#4 integrate .. //depot/projects/tty/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/tty/crypto/openssh/hostfile.c#6 integrate .. //depot/projects/tty/crypto/openssh/includes.h#7 integrate .. //depot/projects/tty/crypto/openssh/kex.c#6 integrate .. //depot/projects/tty/crypto/openssh/kex.h#5 integrate .. //depot/projects/tty/crypto/openssh/kexdh.c#3 integrate .. //depot/projects/tty/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/tty/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/tty/crypto/openssh/kexgex.c#3 integrate .. //depot/projects/tty/crypto/openssh/kexgexc.c#3 integrate .. //depot/projects/tty/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/tty/crypto/openssh/loginrec.c#7 integrate .. //depot/projects/tty/crypto/openssh/misc.c#8 integrate .. //depot/projects/tty/crypto/openssh/misc.h#6 integrate .. //depot/projects/tty/crypto/openssh/monitor.c#8 integrate .. //depot/projects/tty/crypto/openssh/monitor_wrap.c#7 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/Makefile.in#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/base64.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/basename.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-misc.c#7 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-snprintf.c#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/dirname.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/getcwd.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/getgrouplist.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/getopt.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/getrrsetbyname.c#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/glob.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/glob.h#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/inet_aton.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/inet_ntoa.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/inet_ntop.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/mktemp.c#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/readpassphrase.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/readpassphrase.h#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/realpath.c#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/rresvport.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/setenv.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/sigact.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/strlcat.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/strlcpy.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/strmode.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/strsep.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/sys-tree.h#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/vis.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/vis.h#3 integrate .. //depot/projects/tty/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/tty/crypto/openssh/packet.c#8 integrate .. //depot/projects/tty/crypto/openssh/progressmeter.c#5 integrate .. //depot/projects/tty/crypto/openssh/readconf.c#7 integrate .. //depot/projects/tty/crypto/openssh/readconf.h#7 integrate .. //depot/projects/tty/crypto/openssh/regress/README.regress#3 integrate .. //depot/projects/tty/crypto/openssh/regress/agent-getpeereid.sh#3 integrate .. //depot/projects/tty/crypto/openssh/regress/forwarding.sh#3 integrate .. //depot/projects/tty/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/tty/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/tty/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/tty/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/tty/crypto/openssh/regress/test-exec.sh#6 integrate .. //depot/projects/tty/crypto/openssh/regress/try-ciphers.sh#4 integrate .. //depot/projects/tty/crypto/openssh/regress/yes-head.sh#3 integrate .. //depot/projects/tty/crypto/openssh/scp.1#6 integrate .. //depot/projects/tty/crypto/openssh/scp.c#7 integrate .. //depot/projects/tty/crypto/openssh/servconf.c#7 integrate .. //depot/projects/tty/crypto/openssh/servconf.h#6 integrate .. //depot/projects/tty/crypto/openssh/serverloop.c#6 integrate .. //depot/projects/tty/crypto/openssh/session.c#8 integrate .. //depot/projects/tty/crypto/openssh/sftp-client.c#7 integrate .. //depot/projects/tty/crypto/openssh/sftp-common.h#3 integrate .. //depot/projects/tty/crypto/openssh/sftp-server.c#6 integrate .. //depot/projects/tty/crypto/openssh/sftp.1#6 integrate .. //depot/projects/tty/crypto/openssh/sftp.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-add.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-agent.1#6 integrate .. //depot/projects/tty/crypto/openssh/ssh-agent.c#9 integrate .. //depot/projects/tty/crypto/openssh/ssh-keygen.1#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-keygen.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-keyscan.1#6 integrate .. //depot/projects/tty/crypto/openssh/ssh-keyscan.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-keysign.c#6 integrate .. //depot/projects/tty/crypto/openssh/ssh.1#7 integrate .. //depot/projects/tty/crypto/openssh/ssh.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh_config#9 integrate .. //depot/projects/tty/crypto/openssh/ssh_config.5#9 integrate .. //depot/projects/tty/crypto/openssh/sshconnect.c#7 integrate .. //depot/projects/tty/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/tty/crypto/openssh/sshconnect1.c#6 integrate .. //depot/projects/tty/crypto/openssh/sshconnect2.c#6 integrate .. //depot/projects/tty/crypto/openssh/sshd.8#8 integrate .. //depot/projects/tty/crypto/openssh/sshd.c#9 integrate .. //depot/projects/tty/crypto/openssh/sshd_config#9 integrate .. //depot/projects/tty/crypto/openssh/sshd_config.5#10 integrate .. //depot/projects/tty/crypto/openssh/version.h#10 integrate .. //depot/projects/tty/etc/Makefile#17 integrate .. //depot/projects/tty/etc/cached.conf#1 branch .. //depot/projects/tty/etc/defaults/devfs.rules#4 integrate .. //depot/projects/tty/etc/defaults/periodic.conf#7 integrate .. //depot/projects/tty/etc/defaults/rc.conf#18 integrate .. //depot/projects/tty/etc/devd.conf#18 integrate .. //depot/projects/tty/etc/etc.sparc64/ttys#8 integrate .. //depot/projects/tty/etc/gettytab#5 integrate .. //depot/projects/tty/etc/group#6 integrate .. //depot/projects/tty/etc/hosts.allow#3 integrate .. //depot/projects/tty/etc/inetd.conf#6 integrate .. //depot/projects/tty/etc/isdn/Makefile#5 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#18 integrate .. //depot/projects/tty/etc/mtree/BSD.var.dist#6 integrate .. //depot/projects/tty/etc/mtree/BSD.x11-4.dist#8 integrate .. //depot/projects/tty/etc/mtree/Makefile#3 integrate .. //depot/projects/tty/etc/network.subr#9 integrate .. //depot/projects/tty/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/tty/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/tty/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/tty/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/tty/etc/periodic/daily/Makefile#5 integrate .. //depot/projects/tty/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/tty/etc/rc#8 integrate .. //depot/projects/tty/etc/rc.bsdextended#2 integrate .. //depot/projects/tty/etc/rc.d/Makefile#14 integrate .. //depot/projects/tty/etc/rc.d/SERVERS#4 integrate .. //depot/projects/tty/etc/rc.d/abi#6 integrate .. //depot/projects/tty/etc/rc.d/amd#5 integrate .. //depot/projects/tty/etc/rc.d/archdep#7 integrate .. //depot/projects/tty/etc/rc.d/auditd#1 branch .. //depot/projects/tty/etc/rc.d/cached#1 branch .. //depot/projects/tty/etc/rc.d/hostapd#1 branch .. //depot/projects/tty/etc/rc.d/ike#6 delete .. //depot/projects/tty/etc/rc.d/ipfw#8 integrate .. //depot/projects/tty/etc/rc.d/jail#10 integrate .. //depot/projects/tty/etc/rc.d/kernel#1 branch .. //depot/projects/tty/etc/rc.d/localpkg#6 integrate .. //depot/projects/tty/etc/rc.d/named#7 integrate .. //depot/projects/tty/etc/rc.d/netif#9 integrate .. //depot/projects/tty/etc/rc.d/nsswitch#4 integrate .. //depot/projects/tty/etc/rc.d/ntpd#6 integrate .. //depot/projects/tty/etc/rc.d/pccard#5 delete .. //depot/projects/tty/etc/rc.d/pflog#5 integrate .. //depot/projects/tty/etc/rc.d/root#5 integrate .. //depot/projects/tty/etc/rc.d/serial#5 integrate .. //depot/projects/tty/etc/rc.d/sshd#7 integrate .. //depot/projects/tty/etc/rc.d/syscons#6 integrate .. //depot/projects/tty/etc/rc.subr#12 integrate .. //depot/projects/tty/etc/sendmail/freebsd.mc#5 integrate .. //depot/projects/tty/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/tty/etc/snmpd.config#3 integrate .. //depot/projects/tty/games/factor/Makefile#7 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#21 integrate .. //depot/projects/tty/games/random/random.c#9 integrate .. //depot/projects/tty/games/random/randomize_fd.c#3 integrate .. //depot/projects/tty/gnu/lib/Makefile#3 integrate .. //depot/projects/tty/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/tty/gnu/lib/libg2c/Makefile#7 integrate .. //depot/projects/tty/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/tty/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/tty/gnu/lib/libobjc/Makefile#10 integrate .. //depot/projects/tty/gnu/lib/libreadline/Makefile.inc#5 integrate .. //depot/projects/tty/gnu/lib/libreadline/config.h#4 integrate .. //depot/projects/tty/gnu/usr.bin/Makefile#10 integrate .. //depot/projects/tty/gnu/usr.bin/bc/Makefile#4 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/gdbserver/Makefile#2 delete .. //depot/projects/tty/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete .. //depot/projects/tty/gnu/usr.bin/cc/Makefile#5 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_tools/Makefile#7 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/cvs/Makefile#8 integrate .. //depot/projects/tty/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/tty/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/tty/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/gdbserver/Makefile#1 branch .. //depot/projects/tty/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c#1 branch .. //depot/projects/tty/gnu/usr.bin/gdb/gdbserver/fbsd-low.c#1 branch .. //depot/projects/tty/gnu/usr.bin/gdb/gdbserver/fbsd-low.h#1 branch .. //depot/projects/tty/gnu/usr.bin/gdb/gdbserver/reg-i386.c#1 branch .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/Makefile#5 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 integrate .. //depot/projects/tty/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/tty/include/Makefile#22 integrate .. //depot/projects/tty/include/arpa/inet.h#2 integrate .. //depot/projects/tty/include/arpa/nameser.h#2 integrate .. //depot/projects/tty/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/tty/include/malloc_np.h#1 branch .. //depot/projects/tty/include/netdb.h#11 integrate .. //depot/projects/tty/include/nsswitch.h#3 integrate .. //depot/projects/tty/include/printf.h#2 integrate .. //depot/projects/tty/include/proc_service.h#3 integrate .. //depot/projects/tty/include/res_update.h#1 branch .. //depot/projects/tty/include/resolv.h#6 integrate .. //depot/projects/tty/include/rpc/auth.h#2 integrate .. //depot/projects/tty/include/rpc/rpcent.h#2 integrate .. //depot/projects/tty/include/stdio.h#5 integrate .. //depot/projects/tty/include/stdlib.h#8 integrate .. //depot/projects/tty/include/time.h#5 integrate .. //depot/projects/tty/kerberos5/Makefile#5 integrate .. //depot/projects/tty/kerberos5/lib/libgssapi/Makefile#6 integrate .. //depot/projects/tty/lib/Makefile#21 integrate .. //depot/projects/tty/lib/bind/bind/Makefile#4 integrate .. //depot/projects/tty/lib/bind/bind9/Makefile#4 integrate .. //depot/projects/tty/lib/bind/config.mk#5 integrate .. //depot/projects/tty/lib/bind/dns/Makefile#5 integrate .. //depot/projects/tty/lib/bind/isc/Makefile#5 integrate .. //depot/projects/tty/lib/bind/isccc/Makefile#4 integrate .. //depot/projects/tty/lib/bind/isccfg/Makefile#4 integrate .. //depot/projects/tty/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/tty/lib/libarchive/INSTALL#2 delete .. //depot/projects/tty/lib/libarchive/Makefile#10 integrate .. //depot/projects/tty/lib/libarchive/Makefile.am#4 delete .. //depot/projects/tty/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/tty/lib/libarchive/archive_platform.h#9 integrate .. //depot/projects/tty/lib/libarchive/archive_read_extract.c#9 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/tty/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/tty/lib/libarchive/configure.ac.in#9 delete .. //depot/projects/tty/lib/libarchive/tar.5#7 integrate .. //depot/projects/tty/lib/libbsm/Makefile#1 branch .. //depot/projects/tty/lib/libc/Makefile#10 integrate .. //depot/projects/tty/lib/libc/Versions.def#1 branch .. //depot/projects/tty/lib/libc/alpha/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/amd64/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/arm/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/db/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/db/man/dbm.3#3 integrate .. //depot/projects/tty/lib/libc/gdtoa/Makefile.inc#5 integrate .. //depot/projects/tty/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/gen/Makefile.inc#15 integrate .. //depot/projects/tty/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/tty/lib/libc/gen/_spinlock_stub.c#3 integrate .. //depot/projects/tty/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/tty/lib/libc/gen/getpwent.c#6 integrate .. //depot/projects/tty/lib/libc/gen/tls.c#4 integrate .. //depot/projects/tty/lib/libc/gen/vis.3#6 integrate .. //depot/projects/tty/lib/libc/gen/wordexp.3#6 integrate .. //depot/projects/tty/lib/libc/gmon/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/ia64/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/tty/lib/libc/include/libc_private.h#7 integrate .. //depot/projects/tty/lib/libc/include/namespace.h#5 integrate .. //depot/projects/tty/lib/libc/include/nscache.h#1 branch .. //depot/projects/tty/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/tty/lib/libc/include/port_after.h#1 branch .. //depot/projects/tty/lib/libc/include/port_before.h#1 branch .. //depot/projects/tty/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/tty/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/tty/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/tty/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/tty/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/tty/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/tty/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/tty/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/tty/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/tty/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/tty/lib/libc/locale/Makefile.inc#10 integrate .. //depot/projects/tty/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/locale/utf8.c#7 integrate .. //depot/projects/tty/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/tty/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/tty/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/tty/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/tty/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/tty/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/tty/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/tty/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/tty/lib/libc/net/Makefile.inc#10 integrate .. //depot/projects/tty/lib/libc/net/Symbol.map#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 21:09:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D77A716A408; Mon, 1 May 2006 21:09:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9744A16A400 for ; Mon, 1 May 2006 21:09:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7026D43D66 for ; Mon, 1 May 2006 21:09:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41L94Sw052897 for ; Mon, 1 May 2006 21:09:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41L93qH052879 for perforce@freebsd.org; Mon, 1 May 2006 21:09:03 GMT (envelope-from jhb@freebsd.org) Date: Mon, 1 May 2006 21:09:03 GMT Message-Id: <200605012109.k41L93qH052879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 96514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 21:09:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=96514 Change 96514 by jhb@jhb_slimer on 2006/05/01 21:08:07 IFC @96512. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/DEFAULTS#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#56 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#44 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#29 integrate .. //depot/projects/smpng/sys/conf/NOTES#118 integrate .. //depot/projects/smpng/sys/conf/files#174 integrate .. //depot/projects/smpng/sys/conf/files.amd64#42 integrate .. //depot/projects/smpng/sys/conf/files.i386#96 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#57 integrate .. //depot/projects/smpng/sys/conf/options#119 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#31 integrate .. //depot/projects/smpng/sys/ddb/db_thread.c#6 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#21 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#11 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#39 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#23 integrate .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#5 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#16 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwireg.h#8 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwivar.h#7 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#12 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#42 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#69 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_puc.c#4 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#28 integrate .. //depot/projects/smpng/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/smpng/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/smpng/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/smpng/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#9 delete .. //depot/projects/smpng/sys/dev/puc/puc_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#11 delete .. //depot/projects/smpng/sys/dev/puc/pucdata.c#35 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#14 delete .. //depot/projects/smpng/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/smpng/sys/dev/rr232x/README#1 branch .. //depot/projects/smpng/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/smpng/sys/dev/rr232x/array.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/him.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/smpng/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/list.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/smpng/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/smpng/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/smpng/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/smpng/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/smpng/sys/dev/sio/sio_puc.c#9 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/smpng/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/smpng/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/smpng/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#43 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_puc.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#13 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#89 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#29 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#28 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#74 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#118 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#95 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#78 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#29 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#55 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#28 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#153 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#3 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#127 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#72 integrate .. //depot/projects/smpng/sys/modules/Makefile#121 integrate .. //depot/projects/smpng/sys/modules/puc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sio/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/sk/Makefile#3 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#27 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#21 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#26 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#12 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.h#3 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#62 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#56 delete .. //depot/projects/smpng/sys/pci/if_skreg.h#15 delete .. //depot/projects/smpng/sys/pci/xmaciireg.h#3 delete .. //depot/projects/smpng/sys/pci/yukonreg.h#3 delete .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#67 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#6 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#36 integrate .. //depot/projects/smpng/sys/sys/rman.h#16 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#85 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/DEFAULTS#3 (text+ko) ==== @@ -1,11 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.4 2006/04/28 21:21:50 marcel Exp $ machine alpha # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#56 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.549 2006/04/21 04:50:18 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.552 2006/04/29 00:59:15 alc Exp $"); /* * Manages physical address maps. @@ -1449,6 +1449,9 @@ static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); + #ifdef PV_STATS static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; @@ -1464,8 +1467,6 @@ static long pv_entry_frees, pv_entry_allocs; static int pv_entry_spare; -SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, - "Current number of pv entries"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, "Current number of pv entry frees"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, @@ -1545,6 +1546,7 @@ struct pv_chunk *pc; int idx, field, bit; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; @@ -1566,9 +1568,7 @@ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); - vm_page_lock_queues(); vm_page_free(m); - vm_page_unlock_queues(); } /* @@ -2060,6 +2060,7 @@ boolean_t wired) { vm_paddr_t pa; + pd_entry_t *pde; register pt_entry_t *pte; vm_paddr_t opa; pt_entry_t origpte, newpte; @@ -2097,7 +2098,13 @@ } #endif - pte = pmap_pte(pmap, va); + pde = pmap_pde(pmap, va); + if (pde != NULL) { + if ((*pde & PG_PS) != 0) + panic("pmap_enter: attempted pmap_enter on 2MB page"); + pte = pmap_pde_to_pte(pde, va); + } else + pte = NULL; /* * Page Directory table entry not valid, we need a new PT page @@ -2110,9 +2117,6 @@ origpte = *pte; opa = origpte & PG_FRAME; - if (origpte & PG_PS) - panic("pmap_enter: attempted pmap_enter on 2MB page"); - /* * Mapping has not changed, must be protection or wiring change. */ @@ -2797,14 +2801,12 @@ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); - vm_page_lock_queues(); vm_page_free(m); - vm_page_unlock_queues(); } } + vm_page_unlock_queues(); pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); } /* ==== //depot/projects/smpng/sys/amd64/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.4 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ machine amd64 @@ -11,5 +11,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device - -options PUC_FASTINTR ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#44 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.453 2006/04/24 08:44:33 delphij Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.454 2006/04/28 05:23:10 scottl Exp $ cpu HAMMER ident GENERIC @@ -128,6 +128,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/smpng/sys/amd64/conf/NOTES#29 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.52 2006/03/06 15:29:28 yar Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.53 2006/04/28 05:23:10 scottl Exp $ # # @@ -281,6 +281,11 @@ device hptmv # +# Highpoint RocketRAID 232x. This is software RAID but with hardware +# acceleration assistance for RAID_5. +device rr232x + +# # IBM (now Adaptec) ServeRAID controllers device ips ==== //depot/projects/smpng/sys/conf/NOTES#118 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1358 2006/04/18 22:43:46 mjacob Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1359 2006/04/28 21:21:51 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1689,15 +1689,8 @@ device scc # PCI Universal Communications driver -# Supports various single and multi port PCI serial cards. Maybe later -# also the parallel ports on combination serial/parallel cards. New cards -# can be added in src/sys/dev/puc/pucdata.c. -# -# If the PUC_FASTINTR option is used the driver will try to use fast -# interrupts. The card must then be the only user of that interrupt. -# Interrupts cannot be shared when using PUC_FASTINTR. +# Supports various multi port PCI I/O cards. device puc -options PUC_FASTINTR # # Network interfaces: ==== //depot/projects/smpng/sys/conf/files#174 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1111 2006/04/24 23:31:49 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1113 2006/04/28 21:21:51 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -805,10 +805,9 @@ dev/pst/pst-pci.c optional pst pci dev/pst/pst-raid.c optional pst dev/puc/puc.c optional puc -dev/puc/puc_ebus.c optional puc ebus +dev/puc/puc_cfg.c optional puc dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci -dev/puc/puc_sbus.c optional puc fhc | puc sbus dev/puc/pucdata.c optional puc pci dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral @@ -845,7 +844,8 @@ dev/si/si_pci.c optional si pci dev/sio/sio_pccard.c optional sio pccard dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc pci +dev/sio/sio_puc.c optional sio puc +dev/sk/if_sk.c optional sk pci dev/smbus/smb.c optional smb dev/smbus/smbconf.c optional smbus dev/smbus/smbus.c optional smbus @@ -1320,7 +1320,7 @@ kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule -kern/serdev_if.m optional scc +kern/serdev_if.m optional puc | scc kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard @@ -1838,7 +1838,6 @@ pci/if_rl.c optional rl pci pci/if_sf.c optional sf pci pci/if_sis.c optional sis pci -pci/if_sk.c optional sk pci pci/if_ste.c optional ste pci pci/if_tl.c optional tl pci pci/if_vr.c optional vr pci ==== //depot/projects/smpng/sys/conf/files.amd64#42 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.85 2006/04/24 23:31:50 marcel Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.86 2006/04/28 05:23:09 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -72,6 +72,10 @@ dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \ compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \ no-implicit-rule +rr232x_lib.o optional rr232x \ + dependency "$S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \ + compile-with "uudecode < $S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \ + no-implicit-rule # amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi @@ -174,6 +178,9 @@ dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem dev/nve/if_nve.c optional nve pci +dev/rr232x/os_bsd.c optional rr232x +dev/rr232x/osm_bsd.c optional rr232x +dev/rr232x/rr232x_config.c optional rr232x dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/speaker/spkr.c optional speaker ==== //depot/projects/smpng/sys/conf/files.i386#96 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.555 2006/04/24 23:31:50 marcel Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.556 2006/04/27 20:22:44 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -77,6 +77,11 @@ compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \ no-implicit-rule # +rr232x_lib.o optional rr232x \ + dependency "$S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \ + compile-with "uudecode < $S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \ + no-implicit-rule +# # compat/linux/linux_file.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux @@ -194,6 +199,9 @@ dev/nve/if_nve.c optional nve pci dev/pcf/pcf_isa.c optional pcf dev/random/nehemiah.c optional random +dev/rr232x/os_bsd.c optional rr232x +dev/rr232x/osm_bsd.c optional rr232x +dev/rr232x/rr232x_config.c optional rr232x dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci ==== //depot/projects/smpng/sys/conf/kmod.mk#57 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.206 2006/02/24 01:49:36 marcel Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.207 2006/04/28 21:21:51 marcel Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -321,8 +321,8 @@ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ - dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \ + dev/usb/usb_if.m isa/isa_if.m kern/bus_if.m kern/cpufreq_if.m \ + kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/crypto_if.m \ pc98/pc98/canbus_if.m pci/agp_if.m ==== //depot/projects/smpng/sys/conf/options#119 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.537 2006/04/25 15:56:52 mr Exp $ +# $FreeBSD: src/sys/conf/options,v 1.538 2006/04/28 21:21:51 marcel Exp $ # # On the handling of kernel options # @@ -125,7 +125,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPS_SYNC opt_ntp.h PREEMPTION opt_sched.h -PUC_FASTINTR opt_puc.h QUOTA SCHED_4BSD opt_sched.h SCHED_ULE opt_sched.h ==== //depot/projects/smpng/sys/ddb/db_ps.c#31 (text+ko) ==== @@ -28,143 +28,401 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.55 2004/11/20 02:32:42 das Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.59 2006/04/27 22:09:18 jhb Exp $"); #include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include #include #include #include #include -static void dumpthread(volatile struct proc *p, volatile struct thread *td); +/* XXX I'd prefer a better way. */ +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +#define PTR64 +#endif + +#ifdef PTR64 +CTASSERT(sizeof(uintptr_t) == sizeof(uint64_t)); +#else +CTASSERT(sizeof(uintptr_t) == sizeof(uint32_t)); +#endif + +static void dumpthread(volatile struct proc *p, volatile struct thread *td, + int all); +/* + * Layout: + * - column counts + * - header + * - single-threaded process + * - multi-threaded process + * - thread in a MT process + * + * 1 2 3 4 5 6 7 + * 1234567890123456789012345678901234567890123456789012345678901234567890 + * pid uid ppid pgrp state wmesg wchan cmd + * < wmesg > < wchan > + * (threaded) + * < wmesg > < wchan > + * + * For machines with 64-bit pointers, we expand the wchan field 8 more + * characters. + */ void -db_ps(dummy1, dummy2, dummy3, dummy4) - db_expr_t dummy1; - boolean_t dummy2; - db_expr_t dummy3; - char * dummy4; +db_ps(db_expr_t addr, boolean_t hasaddr, db_expr_t count, char *modif) { volatile struct proc *p, *pp; volatile struct thread *td; - char *state; - int np, quit; + struct ucred *cred; + struct pgrp *pgrp; + char state[9]; + int np, quit, rflag, sflag, dflag, lflag, wflag; np = nprocs; quit = 0; - /* sx_slock(&allproc_lock); */ if (!LIST_EMPTY(&allproc)) p = LIST_FIRST(&allproc); else p = &proc0; db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - db_printf(" pid proc uid ppid pgrp flag stat wmesg wchan cmd\n"); +#ifdef PTR64 + db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); +#else + db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); +#endif while (--np >= 0 && !quit) { if (p == NULL) { - printf("oops, ran out of processes early!\n"); + db_printf("oops, ran out of processes early!\n"); break; } - /* PROC_LOCK(p); */ pp = p->p_pptr; if (pp == NULL) pp = p; + cred = p->p_ucred; + pgrp = p->p_pgrp; + db_printf("%5d %4d %5d %5d ", p->p_pid, + cred != NULL ? cred->cr_ruid : 0, pp->p_pid, + pgrp != NULL ? pgrp->pg_id : 0); - switch(p->p_state) { + /* Determine our primary process state. */ + switch (p->p_state) { case PRS_NORMAL: if (P_SHOULDSTOP(p)) - state = "stop"; - else - state = ""; + state[0] = 'T'; + else { + /* + * One of D, L, R, S, W. For a + * multithreaded process we will use + * the state of the thread with the + * highest precedence. The + * precendence order from high to low + * is R, L, D, S, W. If no thread is + * in a sane state we use '?' for our + * primary state. + */ + rflag = sflag = dflag = lflag = wflag = 0; + FOREACH_THREAD_IN_PROC(p, td) { + if (td->td_state == TDS_RUNNING || + td->td_state == TDS_RUNQ || + td->td_state == TDS_CAN_RUN) + rflag++; + if (TD_ON_LOCK(td)) + lflag++; + if (TD_IS_SLEEPING(td)) { + if (!td->td_flags & TDF_SINTR) + dflag++; + else + sflag++; + } + if (TD_AWAITING_INTR(td)) + wflag++; + } + if (rflag) + state[0] = 'R'; + else if (lflag) + state[0] = 'L'; + else if (dflag) + state[0] = 'D'; + else if (sflag) + state[0] = 'S'; + else if (wflag) + state[0] = 'W'; + else + state[0] = '?'; + } break; case PRS_NEW: - state = "new "; + state[0] = 'N'; break; case PRS_ZOMBIE: - state = "zomb"; + state[0] = 'Z'; break; default: - state = "Unkn"; + state[0] = 'U'; break; } - db_printf("%5d %8p %4d %5d %5d %07x %s", - p->p_pid, (volatile void *)p, - p->p_ucred != NULL ? p->p_ucred->cr_ruid : 0, pp->p_pid, - p->p_pgrp != NULL ? p->p_pgrp->pg_id : 0, p->p_flag, - state); + state[1] = '\0'; + + /* Additional process state flags. */ + if (!p->p_sflag & PS_INMEM) + strlcat(state, "W", sizeof(state)); + if (p->p_flag & P_TRACED) + strlcat(state, "X", sizeof(state)); + if (p->p_flag & P_WEXIT && p->p_state != PRS_ZOMBIE) + strlcat(state, "E", sizeof(state)); + if (p->p_flag & P_PPWAIT) + strlcat(state, "V", sizeof(state)); + if (p->p_flag & P_SYSTEM || p->p_lock > 0) + strlcat(state, "L", sizeof(state)); + if (p->p_session != NULL && SESS_LEADER(p)) + strlcat(state, "s", sizeof(state)); + /* Cheated here and didn't compare pgid's. */ + if (p->p_flag & P_CONTROLT) + strlcat(state, "+", sizeof(state)); + if (cred != NULL && jailed(cred)) + strlcat(state, "J", sizeof(state)); + db_printf(" %-6.6s ", state); if (p->p_flag & P_HADTHREADS) - db_printf("(threaded) %s\n", p->p_comm); +#ifdef PTR64 + db_printf(" (threaded) %s\n", + p->p_comm); +#else + db_printf(" (threaded) %s\n", p->p_comm); +#endif FOREACH_THREAD_IN_PROC(p, td) { - dumpthread(p, td); + dumpthread(p, td, p->p_flag & P_HADTHREADS); if (quit) break; } - /* PROC_UNLOCK(p); */ p = LIST_NEXT(p, p_list); if (p == NULL && np > 0) p = LIST_FIRST(&zombproc); } - /* sx_sunlock(&allproc_lock); */ } static void -dumpthread(volatile struct proc *p, volatile struct thread *td) +dumpthread(volatile struct proc *p, volatile struct thread *td, int all) +{ + char state[9], wprefix; + const char *wmesg; + void *wchan; + + if (all) { + db_printf(" %9d ", td->td_tid); + switch (td->td_state) { + case TDS_RUNNING: + snprintf(state, sizeof(state), "Run"); + break; + case TDS_RUNQ: + snprintf(state, sizeof(state), "RunQ"); + break; + case TDS_CAN_RUN: + snprintf(state, sizeof(state), "CanRun"); + break; + case TDS_INACTIVE: + snprintf(state, sizeof(state), "Inactv"); + break; + case TDS_INHIBITED: + state[0] = '\0'; + if (TD_ON_LOCK(td)) + strlcat(state, "L", sizeof(state)); + if (TD_IS_SLEEPING(td)) { + if (td->td_flags & TDF_SINTR) + strlcat(state, "S", sizeof(state)); + else + strlcat(state, "D", sizeof(state)); + } + if (TD_IS_SWAPPED(td)) + strlcat(state, "W", sizeof(state)); + if (TD_AWAITING_INTR(td)) + strlcat(state, "I", sizeof(state)); + if (TD_IS_SUSPENDED(td)) + strlcat(state, "s", sizeof(state)); + if (state[0] != '\0') + break; + default: + snprintf(state, sizeof(state), "???"); + } + db_printf(" %-6.6s ", state); + } + wprefix = ' '; + if (TD_ON_LOCK(td)) { + wprefix = '*'; + wmesg = td->td_lockname; + wchan = td->td_blocked; + } else if (TD_ON_SLEEPQ(td)) { + wmesg = td->td_wmesg; + wchan = td->td_wchan; + } else if (TD_IS_RUNNING(td)) { + snprintf(state, sizeof(state), "CPU %d", td->td_oncpu); + wmesg = state; + wchan = NULL; + } else { + wmesg = ""; + wchan = NULL; + } + db_printf("%c%-8.8s ", wprefix, wmesg); + if (wchan == NULL) +#ifdef PTR64 + db_printf("%18s ", ""); +#else + db_printf("%10s ", ""); +#endif + else + db_printf("%p ", wchan); + if (p->p_flag & P_SYSTEM) + db_printf("["); + if (td->td_name[0] != '\0') + db_printf("%s", td->td_name); + else + db_printf("%s", td->td_proc->p_comm); + if (p->p_flag & P_SYSTEM) + db_printf("]"); + db_printf("\n"); +} + +DB_SHOW_COMMAND(thread, db_show_thread) { + struct thread *td; + boolean_t comma; + + /* Determine which thread to examine. */ + if (have_addr) + td = db_lookup_thread(addr, FALSE); + else + td = kdb_thread; - if (p->p_flag & P_HADTHREADS) - db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); - if (TD_ON_SLEEPQ(td)) - db_printf("[SLPQ %s %p]", td->td_wmesg, (void *)td->td_wchan); + db_printf("Thread %d at %p:\n", td->td_tid, td); + db_printf(" proc (pid %d): %p ", td->td_proc->p_pid, td->td_proc); + db_printf(" ksegrp: %p\n", td->td_ksegrp); + if (td->td_name[0] != '\0') + db_printf(" name: %s\n", td->td_name); + db_printf(" flags: %#x ", td->td_flags); + db_printf(" pflags: %#x\n", td->td_pflags); + db_printf(" state: "); switch (td->td_state) { + case TDS_INACTIVE: + db_printf("INACTIVE\n"); + break; + case TDS_CAN_RUN: + db_printf("CAN RUN\n"); + break; + case TDS_RUNQ: + db_printf("RUNQ\n"); + break; + case TDS_RUNNING: + db_printf("RUNNING (CPU %d)\n", td->td_oncpu); + break; case TDS_INHIBITED: - if (TD_ON_LOCK(td)) { - db_printf("[LOCK %6s %8p]", - td->td_lockname, - (void *)td->td_blocked); + db_printf("INHIBITED: {"); + comma = FALSE; + if (TD_IS_SLEEPING(td)) { + db_printf("SLEEPING"); + comma = TRUE; + } + if (TD_IS_SUSPENDED(td)) { + if (comma) + db_printf(", "); + db_printf("SUSPENDED"); + comma = TRUE; } - if (TD_IS_SLEEPING(td)) { - db_printf("[SLP]"); - } if (TD_IS_SWAPPED(td)) { - db_printf("[SWAP]"); + if (comma) + db_printf(", "); + db_printf("SWAPPED"); + comma = TRUE; } - if (TD_IS_SUSPENDED(td)) { - db_printf("[SUSP]"); + if (TD_ON_LOCK(td)) { + if (comma) + db_printf(", "); + db_printf("LOCK"); + comma = TRUE; } if (TD_AWAITING_INTR(td)) { - db_printf("[IWAIT]"); + if (comma) + db_printf(", "); + db_printf("IWAIT"); } + db_printf("}\n"); break; - case TDS_CAN_RUN: - db_printf("[Can run]"); + default: + db_printf("??? (%#x)\n", td->td_state); break; - case TDS_RUNQ: - db_printf("[RUNQ]"); + } + if (TD_ON_LOCK(td)) + db_printf(" lock: %s turnstile: %p\n", td->td_lockname, + td->td_blocked); + if (TD_ON_SLEEPQ(td)) + db_printf(" wmesg: %s wchan: %p\n", td->td_wmesg, + td->td_wchan); + db_printf(" priority: %d\n", td->td_priority); +} + +DB_SHOW_COMMAND(proc, db_show_proc) +{ + struct thread *td; + struct proc *p; + int i, quit; + + /* Determine which process to examine. */ + if (have_addr) + p = db_lookup_proc(addr); + else + p = kdb_thread->td_proc; + + quit = 0; + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); + db_printf("Process %d (%s) at %p:\n", p->p_pid, p->p_comm, p); + db_printf(" state: "); + switch (p->p_state) { + case PRS_NEW: + db_printf("NEW\n"); break; - case TDS_RUNNING: - db_printf("[CPU %d]", td->td_oncpu); + case PRS_NORMAL: + db_printf("NORMAL\n"); break; - case TDS_INACTIVE: - db_printf("[INACTIVE]"); + case PRS_ZOMBIE: + db_printf("ZOMBIE\n"); break; default: - db_printf("[UNK: %#x]", td->td_state); + db_printf("??? (%#x)\n", p->p_state); } - if (p->p_flag & P_HADTHREADS) { -#ifdef KEF_DIDRUN - if (td->td_kse) - db_printf("[kse %p]", td->td_kse); -#endif + if (p->p_ucred != NULL) { + db_printf(" uid: %d gids: ", p->p_ucred->cr_uid); + for (i = 0; i < p->p_ucred->cr_ngroups; i++) { + db_printf("%d", p->p_ucred->cr_groups[i]); + if (i < (p->p_ucred->cr_ngroups - 1)) + db_printf(", "); + } db_printf("\n"); - } else - db_printf(" %s\n", p->p_comm); + } + if (p->p_pptr != NULL) + db_printf(" parent: pid %d at %p\n", p->p_pptr->p_pid, + p->p_pptr); + if (p->p_leader != NULL && p->p_leader != p) + db_printf(" leader: pid %d at %p\n", p->p_leader->p_pid, + p->p_leader); + if (p->p_sysent != NULL) + db_printf(" ABI: %s\n", p->p_sysent->sv_name); + if (p->p_args != NULL) + db_printf(" arguments: %.*s\n", (int)p->p_args->ar_length, + p->p_args->ar_args); + db_printf(" threads: %d\n", p->p_numthreads); + FOREACH_THREAD_IN_PROC(p, td) { + dumpthread(p, td, 1); + if (quit) + break; + } } ==== //depot/projects/smpng/sys/ddb/db_thread.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.4 2005/01/06 01:34:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.5 2006/04/25 20:22:48 jhb Exp $"); #include #include @@ -38,6 +38,8 @@ #include #include +static db_expr_t hex2dec(db_expr_t expr); + void db_print_thread(void) { @@ -108,3 +110,93 @@ thr = kdb_thr_next(thr); } } + +/* + * Take the parsed expression value from the command line that was parsed + * as a hexadecimal value and convert it as if the expression was parsed + * as a decimal value. Returns -1 if the expression was not a valid + * decimal value. + */ +static db_expr_t +hex2dec(db_expr_t expr) +{ + uintptr_t x, y; + db_expr_t val; + + y = 1; + val = 0; + x = expr; + while (x != 0) { + if (x % 16 > 9) + return (-1); + val += (x % 16) * (y); + x >>= 4; + y *= 10; + } + return (val); +} + +/* + * Lookup a thread based on a db expression address. We assume that the + * address was parsed in hexadecimal. We reparse the address in decimal + * first and try to treat it as a thread ID to find an associated thread. + * If that fails and check_pid is true, we terat the decimal value as a + * PID. If that matches a process, we return the first thread in that + * process. Otherwise, we treat the addr as a pointer to a thread. + */ +struct thread * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 21:20:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93EEA16A48E; Mon, 1 May 2006 21:20:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 53F8C16A481; Mon, 1 May 2006 21:20:58 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFFA843D49; Mon, 1 May 2006 21:20:57 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id D7A6E46B8F; Mon, 1 May 2006 17:20:56 -0400 (EDT) Date: Mon, 1 May 2006 22:20:56 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Birrell In-Reply-To: <200605010047.k410lYuJ020391@repoman.freebsd.org> Message-ID: <20060501222006.Q92256@fledge.watson.org> References: <200605010047.k410lYuJ020391@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 96455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 21:20:58 -0000 On Mon, 1 May 2006, John Birrell wrote: > On FreeBSD, 'struct sysent' was changed for 6.0. If people > think it is a big issue changing it again for 7.0, I'll have > to revisit this. For the time being it's neat this way. 8-) I wouldn't anticipate any problems here. It probably shouldn't be MFC'd though. (As the guy responsible for the sysent change in 6.x, I claim it's not the end of the world anyway :-). Robert N M Watson From owner-p4-projects@FreeBSD.ORG Mon May 1 21:55:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04C9B16A42C; Mon, 1 May 2006 21:55:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 96FC916A405 for ; Mon, 1 May 2006 21:55:30 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DA1543D45 for ; Mon, 1 May 2006 21:55:30 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41LtUk2078218 for ; Mon, 1 May 2006 21:55:30 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41LtU2g078215 for perforce@freebsd.org; Mon, 1 May 2006 21:55:30 GMT (envelope-from wsalamon@computer.org) Date: Mon, 1 May 2006 21:55:30 GMT Message-Id: <200605012155.k41LtU2g078215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 96523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 21:55:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=96523 Change 96523 by wsalamon@gretsch on 2006/05/01 21:54:35 Correct the command name in the SYNOPSIS section. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditctl.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#5 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In bsm/audit.h .Ft int -.Fn auditon "const char *path" +.Fn auditctl "const char *path" .Sh DESCRIPTION The .Fn auditctl From owner-p4-projects@FreeBSD.ORG Mon May 1 22:36:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC75616A405; Mon, 1 May 2006 22:36:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 795E316A400 for ; Mon, 1 May 2006 22:36:26 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DF6E43D45 for ; Mon, 1 May 2006 22:36:26 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41MaQFl002542 for ; Mon, 1 May 2006 22:36:26 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41MaLYV002539 for perforce@freebsd.org; Mon, 1 May 2006 22:36:21 GMT (envelope-from peter@freebsd.org) Date: Mon, 1 May 2006 22:36:21 GMT Message-Id: <200605012236.k41MaLYV002539@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 Cc: Subject: PERFORCE change 96527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 22:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=96527 Change 96527 by peter@peter_daintree on 2006/05/01 22:35:24 IFC @96522 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#18 integrate .. //depot/projects/hammer/UPDATING#94 integrate .. //depot/projects/hammer/bin/ps/keyword.c#17 integrate .. //depot/projects/hammer/bin/rm/rm.c#12 integrate .. //depot/projects/hammer/bin/sh/Makefile#8 integrate .. //depot/projects/hammer/bin/sh/TOUR#2 integrate .. //depot/projects/hammer/bin/sh/eval.c#13 integrate .. //depot/projects/hammer/bin/sh/exec.c#8 integrate .. //depot/projects/hammer/bin/sh/exec.h#5 integrate .. //depot/projects/hammer/bin/sh/input.c#5 integrate .. //depot/projects/hammer/bin/sh/options.c#6 integrate .. //depot/projects/hammer/bin/sh/show.c#6 integrate .. //depot/projects/hammer/bin/sh/trap.c#7 integrate .. //depot/projects/hammer/bin/sh/var.c#10 integrate .. //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#7 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#13 integrate .. //depot/projects/hammer/contrib/top/top.X#7 integrate .. //depot/projects/hammer/contrib/top/top.c#8 integrate .. //depot/projects/hammer/etc/Makefile#50 integrate .. //depot/projects/hammer/etc/cached.conf#1 branch .. //depot/projects/hammer/etc/defaults/devfs.rules#4 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#70 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#11 integrate .. //depot/projects/hammer/etc/gettytab#5 integrate .. //depot/projects/hammer/etc/network.subr#15 integrate .. //depot/projects/hammer/etc/rc.bsdextended#2 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#49 integrate .. //depot/projects/hammer/etc/rc.d/SERVERS#6 integrate .. //depot/projects/hammer/etc/rc.d/amd#11 integrate .. //depot/projects/hammer/etc/rc.d/cached#1 branch .. //depot/projects/hammer/etc/rc.d/jail#18 integrate .. //depot/projects/hammer/etc/rc.d/named#16 integrate .. //depot/projects/hammer/etc/rc.d/nsswitch#6 integrate .. //depot/projects/hammer/etc/rc.d/ntpd#10 integrate .. //depot/projects/hammer/etc/rc.d/sshd#8 integrate .. //depot/projects/hammer/etc/rc.subr#35 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.mc#6 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#60 integrate .. //depot/projects/hammer/games/random/random.c#8 integrate .. //depot/projects/hammer/games/random/randomize_fd.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/fbsd-low.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/fbsd-low.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/reg-i386.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#10 integrate .. //depot/projects/hammer/include/netdb.h#16 integrate .. //depot/projects/hammer/include/nsswitch.h#3 integrate .. //depot/projects/hammer/include/rpc/rpcent.h#2 integrate .. //depot/projects/hammer/include/stdio.h#11 integrate .. //depot/projects/hammer/include/time.h#6 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#34 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#24 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#28 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#27 integrate .. //depot/projects/hammer/lib/libc/Makefile#25 integrate .. //depot/projects/hammer/lib/libc/db/man/dbm.3#4 integrate .. //depot/projects/hammer/lib/libc/gdtoa/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#10 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#13 integrate .. //depot/projects/hammer/lib/libc/gen/vis.3#8 integrate .. //depot/projects/hammer/lib/libc/gen/wordexp.3#7 integrate .. //depot/projects/hammer/lib/libc/include/nscache.h#1 branch .. //depot/projects/hammer/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/hammer/lib/libc/net/Makefile.inc#15 integrate .. //depot/projects/hammer/lib/libc/net/Symbol.map#4 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#29 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#13 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyht.c#5 integrate .. //depot/projects/hammer/lib/libc/net/gethostbynis.c#7 integrate .. //depot/projects/hammer/lib/libc/net/gethostnamadr.c#6 integrate .. //depot/projects/hammer/lib/libc/net/getnetbydns.c#9 integrate .. //depot/projects/hammer/lib/libc/net/getnetbyht.c#7 integrate .. //depot/projects/hammer/lib/libc/net/getnetbynis.c#6 integrate .. //depot/projects/hammer/lib/libc/net/getnetnamadr.c#7 integrate .. //depot/projects/hammer/lib/libc/net/getproto.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getprotoent.c#5 integrate .. //depot/projects/hammer/lib/libc/net/getprotoname.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getservbyname.c#4 delete .. //depot/projects/hammer/lib/libc/net/getservbyport.c#4 delete .. //depot/projects/hammer/lib/libc/net/getservent.c#8 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#22 integrate .. //depot/projects/hammer/lib/libc/net/netdb_private.h#6 integrate .. //depot/projects/hammer/lib/libc/net/nscache.c#1 branch .. //depot/projects/hammer/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/hammer/lib/libc/net/nsdispatch.c#8 integrate .. //depot/projects/hammer/lib/libc/net/nsparser.y#3 integrate .. //depot/projects/hammer/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/getrpcent.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_qp.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#16 integrate .. //depot/projects/hammer/lib/libc/stdio/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fcloseall.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/local.h#15 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#12 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#29 integrate .. //depot/projects/hammer/lib/libc/sys/getsockopt.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/mmap.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#11 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#13 integrate .. //depot/projects/hammer/lib/libcam/camlib.c#4 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#23 integrate .. //depot/projects/hammer/lib/libgpib/Makefile#5 integrate .. //depot/projects/hammer/lib/libkvm/Makefile#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#20 integrate .. //depot/projects/hammer/lib/libkvm/kvm_i386.c#13 integrate .. //depot/projects/hammer/lib/libkvm/kvm_minidump_amd64.c#1 branch .. //depot/projects/hammer/lib/libkvm/kvm_minidump_i386.c#1 branch .. //depot/projects/hammer/lib/libkvm/kvm_private.h#5 integrate .. //depot/projects/hammer/lib/libpcap/Makefile#10 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#22 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#20 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#19 integrate .. //depot/projects/hammer/lib/libthr/Makefile#18 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#14 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_getschedparam.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#24 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#30 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#32 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#10 integrate .. //depot/projects/hammer/lib/libugidfw/libugidfw.3#6 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#11 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.h#5 integrate .. //depot/projects/hammer/lib/libutil/login.conf.5#8 integrate .. //depot/projects/hammer/lib/libutil/pidfile.c#2 integrate .. //depot/projects/hammer/release/Makefile#86 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#87 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#113 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#39 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#8 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#11 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#30 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.8#13 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#9 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#21 integrate .. //depot/projects/hammer/sbin/dump/traverse.c#10 integrate .. //depot/projects/hammer/sbin/dumpon/dumpon.c#5 integrate .. //depot/projects/hammer/sbin/fsdb/fsdb.c#7 integrate .. //depot/projects/hammer/sbin/fsdb/fsdb.h#2 integrate .. //depot/projects/hammer/sbin/fsdb/fsdbutil.c#3 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#7 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#14 integrate .. //depot/projects/hammer/sbin/ggate/Makefile#4 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#36 integrate .. //depot/projects/hammer/sbin/ipf/ipf/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_nullfs/mount_nullfs.8#9 integrate .. //depot/projects/hammer/sbin/pfctl/Makefile#6 integrate .. //depot/projects/hammer/sbin/reboot/boot_i386.8#17 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#20 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#7 integrate .. //depot/projects/hammer/share/man/man4/Makefile#83 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#38 integrate .. //depot/projects/hammer/share/man/man4/ath.4#30 integrate .. //depot/projects/hammer/share/man/man4/bce.4#1 branch .. //depot/projects/hammer/share/man/man4/bge.4#20 integrate .. //depot/projects/hammer/share/man/man4/ccd.4#7 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#13 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#10 integrate .. //depot/projects/hammer/share/man/man4/ipmi.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#10 integrate .. //depot/projects/hammer/share/man/man4/miibus.4#11 integrate .. //depot/projects/hammer/share/man/man4/polling.4#18 integrate .. //depot/projects/hammer/share/man/man4/rr232x.4#1 branch .. //depot/projects/hammer/share/man/man4/sab.4#3 delete .. //depot/projects/hammer/share/man/man4/snd_via8233.4#5 integrate .. //depot/projects/hammer/share/man/man4/syncache.4#3 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#15 integrate .. //depot/projects/hammer/share/man/man4/watchdog.4#5 integrate .. //depot/projects/hammer/share/man/man4/wi.4#26 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#73 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#3 integrate .. //depot/projects/hammer/share/man/man7/hier.7#27 integrate .. //depot/projects/hammer/share/man/man9/Makefile#63 integrate .. //depot/projects/hammer/share/man/man9/SYSCALL_MODULE.9#4 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#24 integrate .. //depot/projects/hammer/share/man/man9/bus_space.9#3 integrate .. //depot/projects/hammer/share/man/man9/crypto.9#5 integrate .. //depot/projects/hammer/share/man/man9/rwlock.9#2 integrate .. //depot/projects/hammer/share/man/man9/sleep.9#11 integrate .. //depot/projects/hammer/share/man/man9/sx.9#11 integrate .. //depot/projects/hammer/share/man/man9/sysctl.9#1 branch .. //depot/projects/hammer/share/man/man9/sysctl_add_oid.9#6 integrate .. //depot/projects/hammer/share/man/man9/sysctl_ctx_init.9#4 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#32 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#11 integrate .. //depot/projects/hammer/share/syscons/fonts/iso15-8x14.fnt#2 integrate .. //depot/projects/hammer/share/syscons/fonts/iso15-8x16.fnt#2 integrate .. //depot/projects/hammer/share/syscons/fonts/iso15-8x8.fnt#2 integrate .. //depot/projects/hammer/share/syscons/fonts/iso15-thin-8x16.fnt#2 integrate .. //depot/projects/hammer/share/termcap/termcap.src#14 integrate .. //depot/projects/hammer/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#52 integrate .. //depot/projects/hammer/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#34 integrate .. //depot/projects/hammer/sys/alpha/isa/isa.c#13 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs_pci.c#4 integrate .. //depot/projects/hammer/sys/alpha/pci/lca_pci.c#4 integrate .. //depot/projects/hammer/sys/alpha/pci/pcibus.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#31 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#51 integrate .. //depot/projects/hammer/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#120 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#152 integrate .. //depot/projects/hammer/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#89 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#95 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#43 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#37 integrate .. //depot/projects/hammer/sys/amd64/include/minidump.h#1 branch .. //depot/projects/hammer/sys/amd64/include/pmap.h#62 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#32 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/nexus.c#7 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#34 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#17 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#17 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#9 integrate .. //depot/projects/hammer/sys/arm/at91/at91.c#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/hammer/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/hammer/sys/arm/include/asmacros.h#5 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#15 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#16 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0.c#6 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#7 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#9 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321.c#9 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/obio.c#4 integrate .. //depot/projects/hammer/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/hammer/sys/boot/i386/boot2/boot1.S#7 integrate .. //depot/projects/hammer/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#19 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/gatea20.c#3 delete .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#13 integrate .. //depot/projects/hammer/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#10 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/gatea20.c#4 delete .. //depot/projects/hammer/sys/cam/cam.c#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#22 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#35 integrate .. //depot/projects/hammer/sys/conf/NOTES#109 integrate .. //depot/projects/hammer/sys/conf/files#142 integrate .. //depot/projects/hammer/sys/conf/files.alpha#26 integrate .. //depot/projects/hammer/sys/conf/files.amd64#86 integrate .. //depot/projects/hammer/sys/conf/files.i386#72 integrate .. //depot/projects/hammer/sys/conf/files.ia64#35 integrate .. //depot/projects/hammer/sys/conf/files.pc98#55 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#18 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#57 integrate .. //depot/projects/hammer/sys/conf/options#96 integrate .. //depot/projects/hammer/sys/conf/options.alpha#8 integrate .. //depot/projects/hammer/sys/conf/options.amd64#41 integrate .. //depot/projects/hammer/sys/conf/options.arm#7 integrate .. //depot/projects/hammer/sys/conf/options.i386#46 integrate .. //depot/projects/hammer/sys/conf/options.ia64#12 integrate .. //depot/projects/hammer/sys/conf/options.pc98#42 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#13 integrate .. //depot/projects/hammer/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#18 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#17 integrate .. //depot/projects/hammer/sys/ddb/db_thread.c#5 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#13 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#37 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#68 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#25 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#16 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.c#11 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#32 integrate .. //depot/projects/hammer/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#19 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#61 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#33 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#37 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#44 integrate .. //depot/projects/hammer/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/hammer/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#25 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#67 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#33 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#38 integrate .. //depot/projects/hammer/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#14 integrate .. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/r300_cmdbuf.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#14 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#12 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/sis_mm.c#8 integrate .. //depot/projects/hammer/sys/dev/em/LICENSE#4 integrate .. //depot/projects/hammer/sys/dev/em/README#11 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#61 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#16 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#17 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#58 integrate .. //depot/projects/hammer/sys/dev/hptmv/osbsd.h#6 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#15 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#18 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#15 integrate .. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#9 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.c#12 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp_tpublic.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#10 integrate .. //depot/projects/hammer/sys/dev/ispfw/asm_2300.h#8 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#17 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#9 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#9 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#23 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#12 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#15 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#11 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#16 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#30 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#43 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#53 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#13 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#9 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/hammer/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/hammer/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/hammer/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/hammer/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/hammer/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#21 integrate .. //depot/projects/hammer/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/hammer/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/hammer/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/hammer/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/hammer/sys/dev/puc/puc_ebus.c#9 delete .. //depot/projects/hammer/sys/dev/puc/puc_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#11 delete .. //depot/projects/hammer/sys/dev/puc/pucdata.c#25 integrate .. //depot/projects/hammer/sys/dev/puc/pucvar.h#11 delete .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#13 integrate .. //depot/projects/hammer/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/hammer/sys/dev/rr232x/README#1 branch .. //depot/projects/hammer/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/hammer/sys/dev/rr232x/array.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/him.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/hammer/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/list.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/hammer/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/hammer/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/hammer/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/hammer/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/hammer/sys/dev/sab/sab.c#26 delete .. //depot/projects/hammer/sys/dev/sab/sab82532reg.h#3 delete .. //depot/projects/hammer/sys/dev/safe/safe.c#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio_puc.c#7 integrate .. //depot/projects/hammer/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/hammer/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/hammer/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/hammer/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#31 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#17 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_puc.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#14 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#12 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#70 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#23 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#27 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs.h#13 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/hammer/sys/geom/geom.h#35 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#28 integrate .. //depot/projects/hammer/sys/geom/geom_ccd.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#22 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#35 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#25 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#23 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#35 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#32 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#12 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror_ctl.c#10 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#25 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#13 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#12 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#46 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#85 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#18 integrate .. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#32 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#70 integrate .. //depot/projects/hammer/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#56 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#84 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#53 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#18 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#18 integrate .. //depot/projects/hammer/sys/i386/include/minidump.h#1 branch .. //depot/projects/hammer/sys/i386/include/pmap.h#25 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#15 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#28 integrate .. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/nexus.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#61 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#72 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#22 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#41 integrate .. //depot/projects/hammer/sys/kern/serdev_if.m#2 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#48 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#20 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#18 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#55 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#3 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#16 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/hammer/sys/kern/uipc_proto.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#67 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#42 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#55 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#42 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#17 integrate .. //depot/projects/hammer/sys/kern/vfs_hash.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#105 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#43 integrate .. //depot/projects/hammer/sys/modules/Makefile#99 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#22 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_dock/Makefile#1 branch .. //depot/projects/hammer/sys/modules/bce/Makefile#1 branch .. //depot/projects/hammer/sys/modules/puc/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/hammer/sys/modules/sio/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/sk/Makefile#3 integrate .. //depot/projects/hammer/sys/net/if_arc.h#7 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#20 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#26 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#24 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#33 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#14 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#23 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#41 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#27 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#33 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#28 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#60 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#63 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#57 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#37 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#41 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#7 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#16 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#24 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.h#10 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#17 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#18 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#24 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#14 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#22 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#13 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#10 integrate .. //depot/projects/hammer/sys/netipsec/xform_ah.c#10 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#11 integrate .. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#20 integrate .. //depot/projects/hammer/sys/netnatm/natm_pcb.c#7 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#38 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#47 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#16 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#18 integrate .. //depot/projects/hammer/sys/nfsserver/nfsrvcache.h#4 integrate .. //depot/projects/hammer/sys/opencrypto/crypto.c#12 integrate .. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#10 integrate .. //depot/projects/hammer/sys/pc98/cbus/ppc.c#4 delete .. //depot/projects/hammer/sys/pc98/cbus/ppcreg.h#2 delete .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/hammer/sys/pc98/include/minidump.h#1 branch .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#11 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#48 delete .. //depot/projects/hammer/sys/pci/if_skreg.h#15 delete .. //depot/projects/hammer/sys/pci/xmaciireg.h#3 delete .. //depot/projects/hammer/sys/pci/yukonreg.h#3 delete .. //depot/projects/hammer/sys/posix4/ksched.c#9 integrate .. //depot/projects/hammer/sys/posix4/p1003_1b.c#7 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#26 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#11 integrate .. //depot/projects/hammer/sys/powerpc/psim/iobus.c#8 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#10 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#19 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.h#5 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#47 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#20 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#19 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#27 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#21 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#18 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#12 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#7 integrate .. //depot/projects/hammer/sys/sys/bus.h#22 integrate .. //depot/projects/hammer/sys/sys/eventhandler.h#7 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#17 integrate .. //depot/projects/hammer/sys/sys/lock.h#14 integrate .. //depot/projects/hammer/sys/sys/mac.h#29 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#32 integrate .. //depot/projects/hammer/sys/sys/module.h#3 integrate .. //depot/projects/hammer/sys/sys/param.h#77 integrate .. //depot/projects/hammer/sys/sys/rman.h#13 integrate .. //depot/projects/hammer/sys/sys/rwlock.h#2 integrate .. //depot/projects/hammer/sys/sys/turnstile.h#8 integrate .. //depot/projects/hammer/sys/sys/vnode.h#66 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#37 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#60 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#45 integrate .. //depot/projects/hammer/sys/vm/swap_pager.h#11 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#37 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#51 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#22 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_MTREE#3 integrate .. //depot/projects/hammer/tools/regression/bin/sh/builtins/var-assign.0#1 branch .. //depot/projects/hammer/tools/regression/geom_eli/nokey.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_gpt/gctl.t#4 integrate .. //depot/projects/hammer/tools/regression/geom_gpt/test.c#2 integrate .. //depot/projects/hammer/tools/regression/mac/mac_bsdextended/test_matches.sh#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_bsdextended/test_ugidfw.c#2 integrate .. //depot/projects/hammer/tools/regression/sockets/rtsocket/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/rtsocket/rtsocket.c#1 branch .. //depot/projects/hammer/tools/regression/sockets/unix_socket/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/unix_socket/unix_socket.c#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/FlashDevice.sub#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#12 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#24 integrate .. //depot/projects/hammer/usr.bin/Makefile#49 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag#4 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies#2 integrate .. //depot/projects/hammer/usr.bin/elf2aout/elf2aout.c#4 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.1#13 integrate .. //depot/projects/hammer/usr.bin/login/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/lorder/lorder.1#3 integrate .. //depot/projects/hammer/usr.bin/make/make.1#28 integrate .. //depot/projects/hammer/usr.bin/make/var.c#31 integrate .. //depot/projects/hammer/usr.bin/systat/cmdtab.c#4 integrate .. //depot/projects/hammer/usr.bin/systat/icmp.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/icmp6.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/ifstat.c#3 integrate .. //depot/projects/hammer/usr.bin/systat/iostat.c#5 integrate .. //depot/projects/hammer/usr.bin/systat/ip.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/ip6.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/main.c#3 integrate .. //depot/projects/hammer/usr.bin/systat/mbufs.c#4 integrate .. //depot/projects/hammer/usr.bin/systat/netstat.c#5 integrate .. //depot/projects/hammer/usr.bin/systat/pigs.c#5 integrate .. //depot/projects/hammer/usr.bin/systat/swap.c#4 integrate .. //depot/projects/hammer/usr.bin/systat/systat.1#9 integrate .. //depot/projects/hammer/usr.bin/systat/systat.h#2 integrate .. //depot/projects/hammer/usr.bin/systat/tcp.c#3 integrate .. //depot/projects/hammer/usr.bin/systat/vmstat.c#9 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#22 integrate .. //depot/projects/hammer/usr.bin/time/time.c#6 integrate .. //depot/projects/hammer/usr.bin/truncate/truncate.1#4 integrate .. //depot/projects/hammer/usr.bin/truncate/truncate.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#74 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/Makefile#10 integrate .. //depot/projects/hammer/usr.sbin/cached/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/cached/agent.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/agent.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/agents/Makefile.inc#1 branch .. //depot/projects/hammer/usr.sbin/cached/agents/group.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/agents/group.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/agents/passwd.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/agents/passwd.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/agents/services.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/agents/services.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/cached.8#1 branch .. //depot/projects/hammer/usr.sbin/cached/cached.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/cached.conf.5#1 branch .. //depot/projects/hammer/usr.sbin/cached/cachedcli.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/cachedcli.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/cachelib.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/cachelib.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/cacheplcs.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/cacheplcs.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/config.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/config.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/debug.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/debug.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/hashtable.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/log.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/log.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/mp_rs_query.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/mp_rs_query.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/mp_ws_query.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/mp_ws_query.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/parser.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/parser.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/protocol.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/protocol.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/query.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/query.h#1 branch .. //depot/projects/hammer/usr.sbin/cached/singletons.c#1 branch .. //depot/projects/hammer/usr.sbin/cached/singletons.h#1 branch .. //depot/projects/hammer/usr.sbin/inetd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/inetd/builtins.c#2 integrate .. //depot/projects/hammer/usr.sbin/iostat/iostat.8#6 integrate .. //depot/projects/hammer/usr.sbin/iostat/iostat.c#5 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.c#12 integrate .. //depot/projects/hammer/usr.sbin/jexec/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/jexec/jexec.8#3 integrate .. //depot/projects/hammer/usr.sbin/jexec/jexec.c#3 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#9 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#12 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/main.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#11 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#25 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#40 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#15 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslog.conf.5#12 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#28 integrate .. //depot/projects/hammer/usr.sbin/ugidfw/ugidfw.8#7 integrate .. //depot/projects/hammer/usr.sbin/ugidfw/ugidfw.c#6 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.c#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#8 integrate .. //depot/projects/hammer/usr.sbin/ypserv/Makefile.yp#5 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.32 2006/04/03 18:42:43 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.33 2006/04/13 13:19:10 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -2654,6 +2654,8 @@ OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +# 20060413: shared library moved to /usr/lib +OLD_LIBS+=lib/libgpib.so.1 # 20060127: revert libdisk to static-only OLD_LIBS+=usr/lib/libdisk.so.3 # 20050722: bump for 6.0-RELEASE ==== //depot/projects/hammer/UPDATING#94 (text+ko) ==== @@ -429,7 +429,7 @@ make installworld DESTDIR=${CURRENT_ROOT} - cd src/etc; make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd + make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd @@ -543,4 +543,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.444 2006/03/21 10:10:05 ru Exp $ +$FreeBSD: src/UPDATING,v 1.445 2006/04/07 11:36:25 ru Exp $ ==== //depot/projects/hammer/bin/ps/keyword.c#17 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.75 2006/04/05 17:40:46 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); #include #include @@ -302,22 +302,31 @@ hp = strchr(p, '='); if (hp) *hp++ = '\0'; - else - hp = p; key.name = p; v = bsearch(&key, var, sizeof(var)/sizeof(VAR) - 1, sizeof(VAR), vcmp); if (v && v->alias) { /* - * XXX - This processing will not be correct for any alias - * which expands into a list of format keywords. Presently - * there are no aliases which do that. + * If the user specified an alternate-header for this + * (aliased) format-name, then we need to copy that + * alternate-header when making the recursive call to + * process the alias. */ - rflen = strlen(v->alias) + strlen(hp) + 2; - realfmt = malloc(rflen); - snprintf(realfmt, rflen, "%s=%s", v->alias, hp); - parsefmt(realfmt, user); + if (hp == NULL) + parsefmt(v->alias, user); + else { + /* + * XXX - This processing will not be correct for + * any alias which expands into a list of format + * keywords. Presently there are no aliases + * which do that. + */ + rflen = strlen(v->alias) + strlen(hp) + 2; + realfmt = malloc(rflen); + snprintf(realfmt, rflen, "%s=%s", v->alias, hp); + parsefmt(realfmt, user); + } return ((VAR *)NULL); } if (!v) { ==== //depot/projects/hammer/bin/rm/rm.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.53 2005/09/29 20:40:29 dougb Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.54 2006/04/15 09:26:23 maxim Exp $"); #include #include @@ -307,6 +307,7 @@ } if (errno) err(1, "fts_read"); + fts_close(fts); } void ==== //depot/projects/hammer/bin/sh/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.45 2005/08/14 07:46:56 stefanf Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.46 2006/04/17 17:55:11 schweikh Exp $ PROG= sh INSTALLFLAGS= -S @@ -13,7 +13,7 @@ # MLINKS for Shell built in commands for which there are no userland # utilities of the same name are handled with the associated manpage, -# builtin.1 in share/man/man1/. +# builtin.1 in share/man/man1/. DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP} LDADD= -ll -ledit -ltermcap ==== //depot/projects/hammer/bin/sh/TOUR#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)TOUR 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/sh/TOUR,v 1.6 1999/08/27 23:15:07 peter Exp $ +# $FreeBSD: src/bin/sh/TOUR,v 1.7 2006/04/16 11:54:01 schweikh Exp $ NOTE -- This is the original TOUR paper distributed with ash and does not represent the current state of the shell. It is provided anyway @@ -22,8 +22,8 @@ programs that generate source code. A complete list of these programs is: - program intput files generates - ------- ------------ --------- + program input files generates + ------- ----------- --------- mkbuiltins builtins builtins.h builtins.c mkinit *.c init.c mknodes nodetypes nodes.h nodes.c @@ -91,7 +91,7 @@ EXINT exception to return to the main command loop. (Exception: EXINT is not raised if the user traps interrupts using the trap command.) The INTOFF and INTON macros (defined in exception.h) -provide uninterruptable critical sections. Between the execution +provide uninterruptible critical sections. Between the execution of INTOFF and the execution of INTON, interrupt signals will be held for later delivery. INTOFF and INTON can be nested. @@ -110,7 +110,7 @@ p = stackptr; *p++ = c; /* repeated as many times as needed */ stackptr = p; -The folloing three macros (defined in memalloc.h) perform these +The following three macros (defined in memalloc.h) perform these operations, but grow the stack if you run off the end: STARTSTACKSTR(p); STPUTC(c, p); /* repeated as many times as needed */ @@ -119,7 +119,7 @@ We now start a top-down look at the code: MAIN.C: The main routine performs some initialization, executes -the user's profile if necessary, and calls cmdloop. Cmdloop is +the user's profile if necessary, and calls cmdloop. Cmdloop repeatedly parses and executes commands. OPTIONS.C: This file contains the option processing code. It is @@ -178,7 +178,7 @@ VSQUESTION ${var?text} VSQUESTION|VSNUL ${var:?text} VSASSIGN ${var=text} - VSASSIGN|VSNUL ${var=text} + VSASSIGN|VSNUL ${var:=text} In addition, the type field will have the VSQUOTE flag set if the variable is enclosed in double quotes. The name of the variable @@ -204,7 +204,7 @@ field can be written without any processing). Other here docu- ments, and words which are not subject to splitting and file name generation, have the CTLESC characters removed during the vari- -able and command substitution phase. Words which are subject +able and command substitution phase. Words which are subject to splitting and file name generation have the CTLESC characters re- moved as part of the file name phase. @@ -212,7 +212,7 @@ eval.c The top level routines. redir.c Code to handle redirection of input and output. jobs.c Code to handle forking, waiting, and job control. - exec.c Code to to path searches and the actual exec sys call. + exec.c Code to do path searches and the actual exec sys call. expand.c Code to evaluate arguments. var.c Maintains the variable symbol table. Called from expand.c. @@ -232,7 +232,7 @@ REDIR.C: Ash allows file descriptors to be redirected and then restored without forking off a child process. This is accom- plished by duplicating the original file descriptors. The redir- -tab structure records where the file descriptors have be dupli- +tab structure records where the file descriptors have been dupli- cated to. EXEC.C: The routine find_command locates a command, and enters @@ -283,8 +283,8 @@ tered throughout the code, depending on which location appears most appropriate. They can be recognized because their names al- ways end in "cmd". The mapping from names to procedures is -specified in the file builtins, which is processed by the mkbuil- -tins command. +specified in the file builtins, which is processed by the mkbuilt- +ins command. A builtin command is invoked with argc and argv set up like a normal program. A builtin command is allowed to overwrite its ==== //depot/projects/hammer/bin/sh/eval.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.51 2006/04/09 12:20:42 stefanf Exp $"); #include #include @@ -658,8 +658,10 @@ /* Now locate the command. */ if (argc == 0) { + /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; + cmdentry.special = 1; } else { static const char PATH[] = "PATH="; char *path = pathval(); @@ -705,7 +707,8 @@ argv++; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 1 23:35:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3CF716A407; Mon, 1 May 2006 23:35:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5BBD516A406 for ; Mon, 1 May 2006 23:35:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 791FD43D6D for ; Mon, 1 May 2006 23:35:38 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41NZb8e035406 for ; Mon, 1 May 2006 23:35:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41NZbj0035403 for perforce@freebsd.org; Mon, 1 May 2006 23:35:37 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 23:35:37 GMT Message-Id: <200605012335.k41NZbj0035403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 23:35:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=96528 Change 96528 by jb@jb_freebsd2 on 2006/05/01 23:35:17 Remove a debug printf. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#2 (text+ko) ==== @@ -123,7 +123,6 @@ { int n_args = 0; u_int64_t uargs[8]; -printf("sysnum %d sysent %p -> %s\n",sysnum,sysent,syscallnames[sysnum]); /* Is this a return syscall? */ if (sysent == NULL) { From owner-p4-projects@FreeBSD.ORG Mon May 1 23:54:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A02716A404; Mon, 1 May 2006 23:54:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D311316A402 for ; Mon, 1 May 2006 23:54:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F86543D45 for ; Mon, 1 May 2006 23:54:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41Ns0Dx045962 for ; Mon, 1 May 2006 23:54:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41Ns0ZM045959 for perforce@freebsd.org; Mon, 1 May 2006 23:54:00 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 23:54:00 GMT Message-Id: <200605012354.k41Ns0ZM045959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 23:54:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=96529 Change 96529 by jb@jb_freebsd2 on 2006/05/01 23:53:14 Ignore errors when loading and unloading modules. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#10 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#10 (text+ko) ==== @@ -2,6 +2,17 @@ .include -SUBDIR= dtrace +SUBDIR= dtrace \ + systrace + +load : + -kldload dtrace + -kldload systrace + kldstat + +unload : + -kldunload systrace + -kldunload dtrace + kldstat .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#3 (text+ko) ==== @@ -24,13 +24,13 @@ dtrace_probe_lookup load : - kldload dtrace + -kldload dtrace kldstat unload : - kldunload systrace - kldunload fasttrap - kldunload dtrace + -kldunload systrace + -kldunload fasttrap + -kldunload dtrace kldstat .include From owner-p4-projects@FreeBSD.ORG Mon May 1 23:56:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC1BB16A419; Mon, 1 May 2006 23:56:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 877AE16A401 for ; Mon, 1 May 2006 23:56:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 381CF43D49 for ; Mon, 1 May 2006 23:56:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41Nu4cC046127 for ; Mon, 1 May 2006 23:56:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41Nu3fi046124 for perforce@freebsd.org; Mon, 1 May 2006 23:56:03 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 23:56:03 GMT Message-Id: <200605012356.k41Nu3fi046124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 23:56:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=96531 Change 96531 by jb@jb_freebsd2 on 2006/05/01 23:55:18 Just a few remaining issues with this function. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#6 (text+ko) ==== @@ -32,8 +32,10 @@ cookie = dtrace_interrupt_disable(); probe = dtrace_probes[id - 1]; cpuid = CPU->cpu_id; -#ifdef DOODAD + +#if defined(sun) onintr = CPU_ON_INTR(CPU); +#endif if (!onintr && probe->dtpr_predcache != DTRACE_CACHEIDNONE && probe->dtpr_predcache == curthread->t_predcache) { @@ -45,6 +47,7 @@ return; } +#if defined(sun) if (panic_quiesce) { /* * We don't trace anything if we're panicking. @@ -52,8 +55,6 @@ dtrace_interrupt_enable(cookie); return; } -#else -onintr = 0; #endif now = dtrace_gethrtime(); @@ -157,13 +158,12 @@ * profile case, the check above will ensure that * we're examining a user context. */ +#ifdef DOODAD if (ecb->dte_cond & DTRACE_COND_OWNER) { -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); -#ifdef DOODAD cred_t *cr; cred_t *s_cr = ecb->dte_state->dts_cred.dcr_cred; - proc_t *proc; + proc_t *proc = NULL; ASSERT(s_cr != NULL); @@ -177,12 +177,11 @@ (proc = ttoproc(curthread)) == NULL || (proc->p_flag & SNOCD)) continue; + } #endif - } +#if defined(sun) if (ecb->dte_cond & DTRACE_COND_ZONEOWNER) { -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); -#ifdef DOODAD cred_t *cr; cred_t *s_cr = ecb->dte_state->dts_cred.dcr_cred; @@ -193,8 +192,8 @@ s_cr->cr_zone->zone_id != cr->cr_zone->zone_id) continue; + } #endif - } } if (now - state->dts_alive > dtrace_deadman_timeout) { @@ -322,11 +321,10 @@ if (!dtrace_priv_proc(state)) continue; +#if defined(sun) /* * See comment in DIF_VAR_PID. */ -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); -#ifdef DOODAD if (DTRACE_ANCHORED(mstate.dtms_probe) && CPU_ON_INTR(CPU)) { int depth = DTRACE_USTACK_NFRAMES( @@ -446,7 +444,7 @@ case DTRACEACT_USYM: case DTRACEACT_UMOD: case DTRACEACT_UADDR: { -printf("%s(%d): DOODAD\n",__FUNCTION__,__LINE__); +printf("%s(%d): USYM, UMOD or UADDR\n",__FUNCTION__,__LINE__); #ifdef DOODAD struct pid *pid = curthread->t_procp->p_pidp; From owner-p4-projects@FreeBSD.ORG Mon May 1 23:56:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD57B16A4D5; Mon, 1 May 2006 23:56:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D04D316A474 for ; Mon, 1 May 2006 23:56:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8630C43D45 for ; Mon, 1 May 2006 23:56:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41Nu4C6046133 for ; Mon, 1 May 2006 23:56:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41Nu42j046130 for perforce@freebsd.org; Mon, 1 May 2006 23:56:04 GMT (envelope-from jb@freebsd.org) Date: Mon, 1 May 2006 23:56:04 GMT Message-Id: <200605012356.k41Nu42j046130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 23:56:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=96532 Change 96532 by jb@jb_freebsd2 on 2006/05/01 23:56:03 Update my hacks. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#11 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#11 (text+ko) ==== @@ -21,7 +21,7 @@ #define t_dtrace_start td_dtrace_start #define t_dtrace_vtime td_dtrace_vtime #define t_predcache td_predcache -#define ttoproc(_a) ((_d)->th_proc) +#define ttoproc(_a) ((_a)->td_proc) typedef dtrace_mutex_t kmutex_t; #define mutex_enter(_a) dtrace_mutex_lock(_a) @@ -36,6 +36,7 @@ #define mod_modname pathname #define crgetuid(_a) _a->cr_uid #define crgetzoneid(_a) 0 +#define SNOCD 0 #define KM_SLEEP M_WAITOK #define KM_NOSLEEP M_NOWAIT #define kmem_zalloc(_a,_b) malloc(_a, M_DTRACE, _b | M_ZERO) From owner-p4-projects@FreeBSD.ORG Tue May 2 00:00:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC95216A406; Tue, 2 May 2006 00:00:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8278F16A401 for ; Tue, 2 May 2006 00:00:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C3B843D49 for ; Tue, 2 May 2006 00:00:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42009pZ046320 for ; Tue, 2 May 2006 00:00:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k420090L046317 for perforce@freebsd.org; Tue, 2 May 2006 00:00:09 GMT (envelope-from jb@freebsd.org) Date: Tue, 2 May 2006 00:00:09 GMT Message-Id: <200605020000.k420090L046317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 00:00:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=96533 Change 96533 by jb@jb_freebsd2 on 2006/05/01 23:59:55 Work-in-progress update. Lots and lots of issues still with this file. At the moment I'm not sure how to get most of the commented out sections of this file executed. I think I need Sun's DTrace Test Suite for that. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#4 (text+ko) ==== @@ -83,13 +83,8 @@ return (mstate->dtms_timestamp); case DIF_VAR_VTIMESTAMP: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD ASSERT(dtrace_vtime_references != 0); return (curthread->t_dtrace_vtime); -#else -return 0; -#endif case DIF_VAR_WALLTIMESTAMP: if (!(mstate->dtms_present & DTRACE_MSTATE_WALLTIMESTAMP)) { @@ -218,7 +213,6 @@ return ((uint64_t)(uintptr_t) mstate->dtms_probe->dtpr_mod); - case DIF_VAR_PROBEFUNC: ASSERT(mstate->dtms_present & DTRACE_MSTATE_PROBE); return ((uint64_t)(uintptr_t) mstate->dtms_probe->dtpr_func); @@ -338,11 +332,10 @@ dtrace_key_t *tupregs, int nargs, dtrace_mstate_t *mstate, dtrace_state_t *state) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD volatile uint16_t *flags = &cpu_core[CPU->cpu_id].cpuc_dtrace_flags; volatile uintptr_t *illval = &cpu_core[CPU->cpu_id].cpuc_dtrace_illval; +#ifdef DOODAD union { mutex_impl_t mi; uint64_t mx; @@ -352,6 +345,7 @@ krwlock_t ri; uintptr_t rw; } r; +#endif switch (subr) { case DIF_SUBR_RAND: @@ -359,48 +353,69 @@ break; case DIF_SUBR_MUTEX_OWNED: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi)) regs[rd] = MUTEX_OWNER(&m.mi) != MUTEX_NO_OWNER; else regs[rd] = LOCK_HELD(&m.mi.m_spin.m_spinlock); +#endif break; case DIF_SUBR_MUTEX_OWNER: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi) && MUTEX_OWNER(&m.mi) != MUTEX_NO_OWNER) regs[rd] = (uintptr_t)MUTEX_OWNER(&m.mi); else regs[rd] = 0; +#endif break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_ADAPTIVE(&m.mi); +#endif break; case DIF_SUBR_MUTEX_TYPE_SPIN: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_SPIN(&m.mi); +#endif break; case DIF_SUBR_RW_READ_HELD: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD uintptr_t tmp; r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_READ_HELD(&r.ri, tmp); +#endif break; } case DIF_SUBR_RW_WRITE_HELD: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_WRITE_HELD(&r.ri); +#endif break; case DIF_SUBR_RW_ISWRITER: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_ISWRITER(&r.ri); +#endif break; case DIF_SUBR_BCOPY: { @@ -437,7 +452,7 @@ if (mstate->dtms_scratch_ptr + scratch_size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -488,7 +503,7 @@ if (mstate->dtms_scratch_ptr + size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -504,12 +519,14 @@ case DIF_SUBR_MSGSIZE: case DIF_SUBR_MSGDSIZE: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD uintptr_t baddr = tupregs[0].dttk_value, daddr; uintptr_t wptr, rptr; size_t count = 0; int cont = 0; - while (baddr != NULL && !(*flags & CPU_DTRACE_FAULT)) { + while (baddr != 0 && !(*flags & CPU_DTRACE_FAULT)) { wptr = dtrace_loadptr(baddr + offsetof(mblk_t, b_wptr)); @@ -550,10 +567,13 @@ if (!(*flags & CPU_DTRACE_FAULT)) regs[rd] = count; +#endif break; } case DIF_SUBR_PROGENYOF: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD pid_t pid = tupregs[0].dttk_value; proc_t *p; int rval = 0; @@ -570,6 +590,7 @@ DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT); regs[rd] = rval; +#endif break; } @@ -626,7 +647,7 @@ uintptr_t limit = addr + state->dts_options[DTRACEOPT_STRSIZE]; char c, target = (char)tupregs[1].dttk_value; - for (regs[rd] = NULL; addr < limit; addr++) { + for (regs[rd] = 0; addr < limit; addr++) { if ((c = dtrace_load8(addr)) == target) { regs[rd] = addr; @@ -644,6 +665,8 @@ case DIF_SUBR_STRSTR: case DIF_SUBR_INDEX: case DIF_SUBR_RINDEX: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD /* * We're going to iterate over the string looking for the * specified string. We will iterate until we have reached @@ -777,10 +800,13 @@ } } +#endif break; } case DIF_SUBR_STRTOK: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD uintptr_t addr = tupregs[0].dttk_value; uintptr_t tokaddr = tupregs[1].dttk_value; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; @@ -866,10 +892,13 @@ regs[rd] = (uintptr_t)dest; mstate->dtms_scratch_ptr += size; mstate->dtms_strtok = addr; +#endif break; } case DIF_SUBR_SUBSTR: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD uintptr_t s = tupregs[0].dttk_value; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; char *d = (char *)mstate->dtms_scratch_ptr; @@ -912,26 +941,35 @@ mstate->dtms_scratch_ptr += size; regs[rd] = (uintptr_t)d; +#endif break; } case DIF_SUBR_GETMAJOR: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD #ifdef _LP64 regs[rd] = (tupregs[0].dttk_value >> NBITSMINOR64) & MAXMAJ64; #else regs[rd] = (tupregs[0].dttk_value >> NBITSMINOR) & MAXMAJ; #endif +#endif break; case DIF_SUBR_GETMINOR: +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD #ifdef _LP64 regs[rd] = tupregs[0].dttk_value & MAXMIN64; #else regs[rd] = tupregs[0].dttk_value & MAXMIN; #endif +#endif break; case DIF_SUBR_DDI_PATHNAME: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD /* * This one is a galactic mess. We are going to roughly * emulate ddi_pathname(), but it's made more complicated @@ -1111,10 +1149,13 @@ mstate->dtms_scratch_ptr += size; } +#endif break; } case DIF_SUBR_STRJOIN: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD char *d = (char *)mstate->dtms_scratch_ptr; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t s1 = tupregs[0].dttk_value; @@ -1157,10 +1198,13 @@ regs[rd] = (uintptr_t)d; } +#endif break; } case DIF_SUBR_LLTOSTR: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD int64_t i = (int64_t)tupregs[0].dttk_value; int64_t val = i < 0 ? i * -1 : i; uint64_t size = 22; /* enough room for 2^64 in decimal */ @@ -1184,11 +1228,14 @@ regs[rd] = (uintptr_t)end + 1; mstate->dtms_scratch_ptr += size; +#endif break; } case DIF_SUBR_DIRNAME: case DIF_SUBR_BASENAME: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD char *dest = (char *)mstate->dtms_scratch_ptr; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t src = tupregs[0].dttk_value; @@ -1311,10 +1358,13 @@ dest[j] = '\0'; regs[rd] = (uintptr_t)dest; mstate->dtms_scratch_ptr += size; +#endif break; } case DIF_SUBR_CLEANPATH: { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD char *dest = (char *)mstate->dtms_scratch_ptr, c; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t src = tupregs[0].dttk_value; @@ -1415,10 +1465,10 @@ dest[j] = '\0'; regs[rd] = (uintptr_t)dest; mstate->dtms_scratch_ptr += size; +#endif break; } } -#endif } /* @@ -1659,53 +1709,32 @@ regs[rd] = dtrace_load64(regs[r1]); break; case DIF_OP_ULDSB: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD regs[rd] = (int8_t) dtrace_fuword8((void *)(uintptr_t)regs[r1]); -#endif break; case DIF_OP_ULDSH: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD regs[rd] = (int16_t) dtrace_fuword16((void *)(uintptr_t)regs[r1]); -#endif break; case DIF_OP_ULDSW: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD regs[rd] = (int32_t) dtrace_fuword32((void *)(uintptr_t)regs[r1]); -#endif break; case DIF_OP_ULDUB: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD regs[rd] = dtrace_fuword8((void *)(uintptr_t)regs[r1]); -#endif break; case DIF_OP_ULDUH: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD regs[rd] = dtrace_fuword16((void *)(uintptr_t)regs[r1]); -#endif break; case DIF_OP_ULDUW: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD regs[rd] = dtrace_fuword32((void *)(uintptr_t)regs[r1]); -#endif break; case DIF_OP_ULDX: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD regs[rd] = dtrace_fuword64((void *)(uintptr_t)regs[r1]); -#endif break; case DIF_OP_RET: rval = regs[rd]; @@ -1894,6 +1923,7 @@ break; case DIF_OP_LDTS: { +printf("%s(%d):\n",__FUNCTION__,__LINE__); printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD dtrace_dynvar_t *dvar; From owner-p4-projects@FreeBSD.ORG Tue May 2 00:58:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F10A16A407; Tue, 2 May 2006 00:58:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 12CE616A400 for ; Tue, 2 May 2006 00:58:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE97B43D46 for ; Tue, 2 May 2006 00:58:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k420wKdt087032 for ; Tue, 2 May 2006 00:58:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k420wKXF087029 for perforce@freebsd.org; Tue, 2 May 2006 00:58:20 GMT (envelope-from jb@freebsd.org) Date: Tue, 2 May 2006 00:58:20 GMT Message-Id: <200605020058.k420wKXF087029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 00:58:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=96535 Change 96535 by jb@jb_freebsd2 on 2006/05/02 00:58:13 Add my CDDL copyright. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#3 (text+ko) ==== @@ -18,6 +18,8 @@ * * CDDL HEADER END * + * Portions Copyright 2006 John Birrell jb@freebsd.org + * * $FreeBSD$ * */ From owner-p4-projects@FreeBSD.ORG Tue May 2 01:01:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B24516A406; Tue, 2 May 2006 01:01:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3B47616A404 for ; Tue, 2 May 2006 01:01:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E52CA43D45 for ; Tue, 2 May 2006 01:01:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4211OYG088059 for ; Tue, 2 May 2006 01:01:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4211OQ5088056 for perforce@freebsd.org; Tue, 2 May 2006 01:01:24 GMT (envelope-from jb@freebsd.org) Date: Tue, 2 May 2006 01:01:24 GMT Message-Id: <200605020101.k4211OQ5088056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 01:01:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=96536 Change 96536 by jb@jb_freebsd2 on 2006/05/02 01:01:23 Add my CDDL copyright. It's hard to know when to add this and when not to. In the case of this file I'll add it because of the grief. 8-) Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#18 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#18 (text+ko) ==== @@ -18,6 +18,8 @@ * * CDDL HEADER END * + * Portions Copyright 2006 John Birrell jb@freebsd.org + * * $FreeBSD$ * */ From owner-p4-projects@FreeBSD.ORG Tue May 2 03:46:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BBCD16A402; Tue, 2 May 2006 03:46:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5E39716A400 for ; Tue, 2 May 2006 03:46:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1591F43D48 for ; Tue, 2 May 2006 03:46:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k423kiU2080819 for ; Tue, 2 May 2006 03:46:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k423ki9S080811 for perforce@freebsd.org; Tue, 2 May 2006 03:46:44 GMT (envelope-from jb@freebsd.org) Date: Tue, 2 May 2006 03:46:44 GMT Message-Id: <200605020346.k423ki9S080811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 03:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=96540 Change 96540 by jb@jb_freebsd2 on 2006/05/02 03:46:15 The DTrace 'profile' provider provides probes associated with a time-based interrupt firing every fixed, specified time interval. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#11 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#1 add Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#11 (text+ko) ==== @@ -3,6 +3,7 @@ .include SUBDIR= dtrace \ + profile \ systrace load : From owner-p4-projects@FreeBSD.ORG Tue May 2 16:34:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F74916A403; Tue, 2 May 2006 16:34:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C917A16A400 for ; Tue, 2 May 2006 16:34:27 +0000 (UTC) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92B3F43D72 for ; Tue, 2 May 2006 16:34:27 +0000 (GMT) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42GYRU4031789 for ; Tue, 2 May 2006 16:34:27 GMT (envelope-from tkuik@freefall.freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42GYRjD031780 for perforce@freebsd.org; Tue, 2 May 2006 16:34:27 GMT (envelope-from tkuik@freefall.freebsd.org) Date: Tue, 2 May 2006 16:34:27 GMT Message-Id: <200605021634.k42GYRjD031780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tkuik@freefall using -f From: tkuik To: Perforce Change Reviews Cc: Subject: PERFORCE change 96551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 16:34:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=96551 Change 96551 by tkuik@tkuik_freebsd on 2006/05/02 16:33:34 Disable use of balloon locking mechanism since balloon driver isn't done yet. Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/include/xenfunc.h#3 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/include/xenfunc.h#3 (text+ko) ==== @@ -62,8 +62,13 @@ void ap_cpu_initclocks(void); extern struct mtx balloon_lock; +#if 0 #define balloon_lock(__flags) mtx_lock_irqsave(&balloon_lock, __flags) #define balloon_unlock(__flags) mtx_unlock_irqrestore(&balloon_lock, __flags) +#else +#define balloon_lock(__flags) __flags = 1 +#define balloon_unlock(__flags) __flags = 0 +#endif From owner-p4-projects@FreeBSD.ORG Tue May 2 19:30:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50A0016AA56; Tue, 2 May 2006 19:30:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 32AE516AA4D for ; Tue, 2 May 2006 19:30:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1F0C43D5C for ; Tue, 2 May 2006 19:29:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42JTAC8040626 for ; Tue, 2 May 2006 19:29:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42JTAPH040623 for perforce@freebsd.org; Tue, 2 May 2006 19:29:10 GMT (envelope-from imp@freebsd.org) Date: Tue, 2 May 2006 19:29:10 GMT Message-Id: <200605021929.k42JTAPH040623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 19:30:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96558 Change 96558 by imp@imp_hammer on 2006/05/02 19:28:30 Checkin working FPGA code. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 2 20:13:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 973F216A403; Tue, 2 May 2006 20:13:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5841716A413 for ; Tue, 2 May 2006 20:13:06 +0000 (UTC) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B7CF43D48 for ; Tue, 2 May 2006 20:13:05 +0000 (GMT) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42KD5BZ065705 for ; Tue, 2 May 2006 20:13:05 GMT (envelope-from tkuik@freefall.freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42KD5rN065687 for perforce@freebsd.org; Tue, 2 May 2006 20:13:05 GMT (envelope-from tkuik@freefall.freebsd.org) Date: Tue, 2 May 2006 20:13:05 GMT Message-Id: <200605022013.k42KD5rN065687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tkuik@freefall using -f From: tkuik To: Perforce Change Reviews Cc: Subject: PERFORCE change 96562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 20:13:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=96562 Change 96562 by tkuik@tkuik_freebsd on 2006/05/02 20:13:04 Fixed use of xen_create_contiguous_region() function Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#15 edit .. //depot/projects/xen3/src/sys/vm/vm_contig.c#4 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#15 (text+ko) ==== @@ -202,7 +202,7 @@ if (__predict_false(error < 0)) { for (i = 0; i < _xpq_idx; i++) - printk("val: %x ptr: %p\n", XPQ_QUEUE[i].val, XPQ_QUEUE[i].ptr); + printf("val: %llx ptr: %llx\n", XPQ_QUEUE[i].val, XPQ_QUEUE[i].ptr); panic("Failed to execute MMU updates: %d", error); } @@ -339,6 +339,7 @@ } +#if 0 /* * Bitmap is indexed by page number. If bit is set, the page is part of a * xen_create_contiguous_region() area of memory. @@ -386,6 +387,7 @@ contiguous_bitmap[curr_idx] &= -(1UL<> PAGE_SHIFT, 1UL << order); +#endif balloon_unlock(flags); @@ -482,11 +486,13 @@ PANIC_IF(ffs(npages) != fls(npages)); /* 0. determine order */ - order = (ffs(npages) == fls(npages)) ? fls(npages) : (ffs(npages) + 1); + order = (ffs(npages) == fls(npages)) ? fls(npages) - 1 : fls(npages); balloon_lock(flags); +#if 0 contiguous_bitmap_clear(vtophys(addr) >> PAGE_SHIFT, 1UL << order); +#endif /* 1. Zap current PTEs, giving away the underlying pages. */ for (i = 0; i < (1 << order); i++) { ==== //depot/projects/xen3/src/sys/vm/vm_contig.c#4 (text+ko) ==== @@ -574,8 +574,13 @@ vm_page_t pages; vm_pindex_t npgs; - /* XXXEN should consider rounding to nearest power of two */ npgs = round_page(size) >> PAGE_SHIFT; + +#ifdef XEN + /* Round to the nearest power of two */ + npgs = 1 << ((ffs(npgs) == fls(npgs)) ? fls(npgs) - 1 : fls(npgs)); +#endif + mtx_lock(&Giant); if (vm_old_contigmalloc) { ret = contigmalloc1(size, type, flags, low, high, alignment, From owner-p4-projects@FreeBSD.ORG Tue May 2 22:03:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5881316A407; Tue, 2 May 2006 22:03:23 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 16E1416A403 for ; Tue, 2 May 2006 22:03:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0E9F43D45 for ; Tue, 2 May 2006 22:03:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42M3Mi4038420 for ; Tue, 2 May 2006 22:03:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42M3M4b038414 for perforce@freebsd.org; Tue, 2 May 2006 22:03:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 May 2006 22:03:22 GMT Message-Id: <200605022203.k42M3M4b038414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 22:03:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=96570 Change 96570 by rwatson@rwatson_peppercorn on 2006/05/02 22:03:11 Early pass at per-pipe preselection: - Add new fields to struct audit_pipe to describe the preselection preferences for the pipe. Currently, this consists of two masks, flags and naflags, with similar meanings to those used for trails. In addition, a linked list of audit_pipe_preselect structures provides similar functionality to audit_user, assigning masks to specific auids. The details here need refinement. - Add two new functions, audit_pipe_preselect_check(), which checks whether a record with the passed {auid, event, class, sorf} is matched, and audit_pipe_preselect(), which iterates over available pipes. This will be called by the system preselection mechanisms to poll the audit pipe subsystem for interest in a particular record. - Modify audit_pipe_submit() to accept additional fields auid, class, sorf for a BSM record, so that preselection can be performed when delivering to pipes. The old preselection-free audit_pipe_submit() continues to exist, for now, as audit_pipe_submit_user(), to be called on user records since we don't currently extract sufficient information from user submitted records to perform full preselection. - Modify audit worker code to pass additional record properties into audit_pipe_submit(). This almost certainly doesn't work yet. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#25 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#14 (text+ko) ==== @@ -82,6 +82,19 @@ }; /* + * Audit pipes allow processes to express "interest" in the set of records + * that are delivered via the pipe. They do this in a similar manner to the + * mechanism for audit trail configuration, by expressing two global masks, + * and optionally expressing per-auid masks. The following data structures + * define by the global masks for each pipe, and a list of per-auid masks. + */ +struct audit_pipe_preselect { + au_id_t app_auid; + au_mask_t app_mask; + TAILQ_ENTRY(audit_pipe_preselect) app_list; +}; + +/* * Description of an individual audit_pipe. Consists largely of a bounded * length queue. */ @@ -102,8 +115,24 @@ u_int64_t ap_drops; /* Records dropped. */ u_int64_t ap_truncates; /* Records too long. */ + + /* + * Fields relating to pipe interest: global masks for unmatched + * processes (attributable, non-attributable), and a list of specific + * interest specifications by auid. + */ + au_mask_t ap_preselect_flags; + au_mask_t ap_preselect_naflags; + TAILQ_HEAD(, audit_pipe_preselect) ap_preselect_list; + + /* + * Record list. + */ TAILQ_HEAD(, audit_pipe_entry) ap_queue; + /* + * Global pipe list. + */ TAILQ_ENTRY(audit_pipe) ap_list; }; @@ -167,6 +196,49 @@ } /* + * Determine whether a specific audit pipe matches a record with these + * properties. + */ +static int +audit_pipe_preselect_check(struct audit_pipe *ap, au_id_t auid, + au_event_t event, au_class_t class, int sorf) +{ + struct audit_pipe_preselect *app; + + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { + if (app->app_auid == auid) + break; + } + if (app == NULL) { + if (auid == AU_DEFAUDITID) + return (au_preselect(event, &ap->ap_preselect_naflags, + sorf)); + else + return (au_preselect(event, &ap->ap_preselect_flags, + sorf)); + } else + return (au_preselect(event, &app->app_mask, sorf)); + return (0); +} + +/* + * Determine whether there exists a pipe interested in a record with these + * properties. + */ +int +audit_pipe_preselect(au_id_t auid, au_event_t event, au_class_t class, + int sorf) +{ + struct audit_pipe *ap; + + TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + return (1); + } + return (0); +} + +/* * Apparent individual record to a queue -- allocate queue-local buffer, and * add to the queue. We try to drop from the head of the queue so that more * recent events take precedence over older ones, but if allocation fails we @@ -219,7 +291,37 @@ * interface, which arranges for them to be delivered to pipe queues. */ void -audit_pipe_submit(void *record, u_int record_len) +audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, int sorf, + void *record, u_int record_len) +{ + struct audit_pipe *ap; + + /* + * Lockless read to avoid mutex overhead if pipes are not in use. + */ + if (TAILQ_FIRST(&audit_pipe_list) == NULL) + return; + + mtx_lock(&audit_pipe_mtx); + TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + audit_pipe_append(ap, record, record_len); + } + audit_pipe_records++; + mtx_unlock(&audit_pipe_mtx); + cv_signal(&audit_pipe_cv); +} + +/* + * audit_pipe_submit_user(): the same as audit_pipe_submit(), except that + * since we don't currently have selection information available, it is + * delivered to the pipe unconditionally. + * + * XXXRW: This is a bug. The BSM check routine for submitting a user record + * should parse that information and return it. + */ +void +audit_pipe_submit_user(void *record, u_int record_len) { struct audit_pipe *ap; @@ -237,6 +339,7 @@ cv_signal(&audit_pipe_cv); } + /* * Read the next record off of an audit pipe. */ @@ -273,9 +376,14 @@ return (NULL); ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); + bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); + bzero(&ap->ap_preselect_naflags, sizeof(ap->ap_preselect_naflags)); + TAILQ_INIT(&ap->ap_preselect_list); + TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); audit_pipe_count++; audit_pipe_ever++; + return (ap); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#25 (text+ko) ==== @@ -337,6 +337,10 @@ /* * Audit pipe functions. */ -void audit_pipe_submit(void *record, u_int record_len); +int audit_pipe_preselect(au_id_t auid, au_event_t event, + au_class_t class, int sorf); +void audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, + int sorf, void *record, u_int record_len); +void audit_pipe_submit_user(void *record, u_int record_len); #endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#9 (text+ko) ==== @@ -315,7 +315,11 @@ struct thread *audit_td, struct kaudit_record *ar) { struct au_record *bsm; + au_class_t class; + au_event_t event; int error, ret; + au_id_t auid; + int sorf; if (ar->k_ar_commit & AR_COMMIT_USER) { error = audit_record_write(audit_vp, audit_cred, audit_td, @@ -324,10 +328,18 @@ panic("audit_worker: write error %d\n", error); else if (error) printf("audit_worker: write error %d\n", error); - audit_pipe_submit(ar->k_udata, ar->k_ulen); + audit_pipe_submit_user(ar->k_udata, ar->k_ulen); } if (ar->k_ar_commit & AR_COMMIT_KERNEL) { + auid = ar->k_ar.ar_subj_auid; + event = ar->k_ar.ar_event; + class = au_event_class(event); + if (ar->k_ar.ar_errno == 0) + sorf = AU_PRS_SUCCESS; + else + sorf = AU_PRS_FAILURE; + ret = kaudit_to_bsm(ar, &bsm); switch (ret) { case BSM_NOAUDIT: @@ -346,7 +358,8 @@ else if (error) printf("audit_worker: write error %d\n", error); - audit_pipe_submit(bsm->data, bsm->len); + audit_pipe_submit(auid, event, class, sorf, + bsm->data, bsm->len); kau_free(bsm); break; From owner-p4-projects@FreeBSD.ORG Tue May 2 22:39:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C58516A404; Tue, 2 May 2006 22:39:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2FCD516A402 for ; Tue, 2 May 2006 22:39:06 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE2D343D46 for ; Tue, 2 May 2006 22:39:05 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42Md5Ul056577 for ; Tue, 2 May 2006 22:39:05 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42Md5uh056574 for perforce@freebsd.org; Tue, 2 May 2006 22:39:05 GMT (envelope-from imp@freebsd.org) Date: Tue, 2 May 2006 22:39:05 GMT Message-Id: <200605022239.k42Md5uh056574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 22:39:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=96571 Change 96571 by imp@imp_hammer on 2006/05/02 22:38:06 need more like 700us delay, not 70us. blame scale=5. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#9 (text+ko) ==== @@ -60,7 +60,7 @@ // wait for completion while (!((v = pSPI->SPI_SR) & AT91C_SPI_SPENDRX)) - Delay(70); + Delay(700); } From owner-p4-projects@FreeBSD.ORG Tue May 2 22:39:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A416A16A466; Tue, 2 May 2006 22:39:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8209816A45E for ; Tue, 2 May 2006 22:39:06 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3842843D46 for ; Tue, 2 May 2006 22:39:06 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42Md6F1056589 for ; Tue, 2 May 2006 22:39:06 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42Md5Pu056583 for perforce@freebsd.org; Tue, 2 May 2006 22:39:05 GMT (envelope-from imp@freebsd.org) Date: Tue, 2 May 2006 22:39:05 GMT Message-Id: <200605022239.k42Md5Pu056583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 22:39:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=96572 Change 96572 by imp@imp_hammer on 2006/05/02 22:38:23 slightly better delay routine. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/delay.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/delay.c#2 (text+ko) ==== @@ -5,9 +5,10 @@ void Delay(int us) { - unsigned later; + unsigned later, now; - later = (AT91C_BASE_ST->ST_CRTR + us / 3 + 1) & AT91C_ST_CRTV; + now = AT91C_BASE_ST->ST_CRTR; + later = (now + us / 25 + 1) & AT91C_ST_CRTV; while (later != AT91C_BASE_ST->ST_CRTR) continue; } From owner-p4-projects@FreeBSD.ORG Tue May 2 22:39:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA8BA16A4E4; Tue, 2 May 2006 22:39:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C6BBE16A4CF for ; Tue, 2 May 2006 22:39:06 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9061A43D46 for ; Tue, 2 May 2006 22:39:06 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42Md6X5056601 for ; Tue, 2 May 2006 22:39:06 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42Md6pl056593 for perforce@freebsd.org; Tue, 2 May 2006 22:39:06 GMT (envelope-from imp@freebsd.org) Date: Tue, 2 May 2006 22:39:06 GMT Message-Id: <200605022239.k42Md6pl056593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 22:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=96573 Change 96573 by imp@imp_hammer on 2006/05/02 22:38:41 checkpoint FPGA burning routine. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#9 (text) ==== @@ -39,34 +39,40 @@ AT91C_BASE_PIOC, AT91C_PIO_PC12 }; +#define BURN_FPGA 1 int main(void) { - int len; + int len, i, j, off; char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ -#if 0 +#ifdef BURN_FPGA char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */ char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ #endif SPI_InitFlash(); -#if 0 while ((len = xmodem_rx(addr)) == -1) continue; - printf("Downloaded %u bytes.\r\n", len); +#ifdef BURN_FPGA + printf("\r\nDownloaded %u bytes.\r\n", len); p_memcpy(addr3, addr, len); printf("Writing %u bytes to flash\r\n", len); - SPI_WriteFlash(15 * FLASH_PAGE_SIZE, addr, len); - printf("Reading back %u bytes from flash\r\n", len); - SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr2, len); - if (p_memcmp(addr3, addr2, len) != 0) - printf("Readback failed\r\n"); - else - printf("Readback OK\r\n"); + for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { + for (j = 0; j < 10; j++) { + off = i + 15 * FLASH_PAGE_SIZE; + SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); + SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE); + if (p_memcmp(addr3 + off, addr2 + off, FLASH_PAGE_SIZE) == 0) + break; + } + if (j >= 10) + printf("Bad Readback at %u\r\n", i); + } #else len = 212482; SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len); + printf("Downloaded %u bytes... burning FPGA...\r\n", len); fpga_init(&main_fpga); fpga_clear(&main_fpga); fpga_write_bytes(&main_fpga, addr, len); From owner-p4-projects@FreeBSD.ORG Tue May 2 22:41:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3145916A406; Tue, 2 May 2006 22:41:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0FA7716A400 for ; Tue, 2 May 2006 22:41:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C613143D48 for ; Tue, 2 May 2006 22:41:09 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k42Mf9Ci058155 for ; Tue, 2 May 2006 22:41:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k42Mf9Zg058149 for perforce@freebsd.org; Tue, 2 May 2006 22:41:09 GMT (envelope-from marcel@freebsd.org) Date: Tue, 2 May 2006 22:41:09 GMT Message-Id: <200605022241.k42Mf9Zg058149@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 Cc: Subject: PERFORCE change 96574 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 22:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=96574 Change 96574 by marcel@marcel_nfs on 2006/05/02 22:41:09 o Add a PCI bus frontend for scc(4) and recognize the Digi Sync/570i 2-port and 4-port cards. o Since the Digi cards are based on the Hitachi HD64570, add a new class and hardware backend. The attach fails unconditionally now. We already have a header for the hd64570 under dev/ic. See ar(4). o Renumber the SCC class to be 1-based. This avoids that an uninitialized variable is misinterpreted. Resort the list while I'm renumbering. Notes: o The HD64570 needs 2 I/O resources. This will cause changes to uart(4) as well. It is assumed that a single I/O resource is enough. o The ar(4) driver is a good source of information. While it only compiles on i386 and doesn't use newbus(9), it should work isufficiently. o Also, the ar(4) driver hooks up with netgraph, which is what hdlc(4) is going to do as well. This too is very convenient. Affected files ... .. //depot/projects/uart/conf/files#66 edit .. //depot/projects/uart/dev/scc/scc_bfe.h#19 edit .. //depot/projects/uart/dev/scc/scc_bfe_ebus.c#9 edit .. //depot/projects/uart/dev/scc/scc_bfe_macio.c#2 edit .. //depot/projects/uart/dev/scc/scc_bfe_pci.c#1 add .. //depot/projects/uart/dev/scc/scc_bfe_sbus.c#9 edit .. //depot/projects/uart/dev/scc/scc_bus.h#11 edit .. //depot/projects/uart/dev/scc/scc_core.c#23 edit .. //depot/projects/uart/dev/scc/scc_dev_hd64570.c#1 add Differences ... ==== //depot/projects/uart/conf/files#66 (text+ko) ==== @@ -838,8 +838,10 @@ dev/sbsh/if_sbsh.c optional sbsh dev/scc/scc_if.m optional scc dev/scc/scc_bfe_ebus.c optional scc ebus +dev/scc/scc_bfe_pci.c optional scc pci dev/scc/scc_bfe_sbus.c optional scc fhc | scc sbus dev/scc/scc_core.c optional scc +dev/scc/scc_dev_hd64570.c optional scc dev/scc/scc_dev_sab82532.c optional scc dev/scc/scc_dev_z8530.c optional scc dev/scd/scd.c optional scd isa ==== //depot/projects/uart/dev/scc/scc_bfe.h#19 (text) ==== @@ -109,6 +109,7 @@ int cl_range; }; +extern struct scc_class scc_hd64570_class; extern struct scc_class scc_sab82532_class; extern struct scc_class scc_z8530_class; @@ -138,7 +139,7 @@ int scc_bfe_attach(device_t dev); int scc_bfe_detach(device_t dev); -int scc_bfe_probe(device_t dev, u_int, u_int); +int scc_bfe_probe(device_t dev, u_int regshft, u_int rclk, u_int rid); struct resource *scc_bus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); ==== //depot/projects/uart/dev/scc/scc_bfe_ebus.c#9 (text) ==== @@ -59,7 +59,7 @@ if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); sc->sc_class = &scc_sab82532_class; - return (scc_bfe_probe(dev, EBUS_REGSHFT, EBUS_RCLK)); + return (scc_bfe_probe(dev, EBUS_REGSHFT, EBUS_RCLK, 0)); } return (ENXIO); } ==== //depot/projects/uart/dev/scc/scc_bfe_macio.c#2 (text) ==== @@ -56,7 +56,7 @@ if (!strcmp(nm, "escc")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); sc->sc_class = &scc_z8530_class; - return (scc_bfe_probe(dev, MACIO_REGSHFT, MACIO_RCLK)); + return (scc_bfe_probe(dev, MACIO_REGSHFT, MACIO_RCLK, 0)); } return (ENXIO); } ==== //depot/projects/uart/dev/scc/scc_bfe_sbus.c#9 (text) ==== @@ -56,7 +56,7 @@ if (!strcmp(nm, "zs")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); sc->sc_class = &scc_z8530_class; - return (scc_bfe_probe(dev, SBUS_REGSHFT, SBUS_RCLK)); + return (scc_bfe_probe(dev, SBUS_REGSHFT, SBUS_RCLK, 0)); } return (ENXIO); } ==== //depot/projects/uart/dev/scc/scc_bus.h#11 (text) ==== @@ -40,8 +40,9 @@ #define SCC_IVAR_HWMTX 5 /* Hardware class -- the SCC type. */ -#define SCC_CLASS_SAB82532 0 -#define SCC_CLASS_Z8530 1 +#define SCC_CLASS_HD64570 1 +#define SCC_CLASS_SAB82532 2 +#define SCC_CLASS_Z8530 3 /* The possible modes supported by the SCC. */ #define SCC_MODE_ASYNC 0x01 ==== //depot/projects/uart/dev/scc/scc_core.c#23 (text) ==== @@ -330,7 +330,7 @@ } int -scc_bfe_probe(device_t dev, u_int regshft, u_int rclk) +scc_bfe_probe(device_t dev, u_int regshft, u_int rclk, u_int rid) { struct scc_softc *sc; struct scc_class *cl; @@ -359,12 +359,12 @@ * I/O space. Any SCC that needs multiple windows will consequently * not be supported by this driver as-is. */ - sc->sc_rrid = 0; + sc->sc_rrid = rid; sc->sc_rtype = SYS_RES_MEMORY; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, 0, ~0, cl->cl_channels * size, RF_ACTIVE); if (sc->sc_rres == NULL) { - sc->sc_rrid = 0; + sc->sc_rrid = rid; sc->sc_rtype = SYS_RES_IOPORT; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, 0, ~0, cl->cl_channels * size, RF_ACTIVE); From owner-p4-projects@FreeBSD.ORG Wed May 3 05:00:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E57D116A404; Wed, 3 May 2006 05:00:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B17A216A401 for ; Wed, 3 May 2006 05:00:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4212243D45 for ; Wed, 3 May 2006 05:00:03 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43503gg082590 for ; Wed, 3 May 2006 05:00:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k435020C082584 for perforce@freebsd.org; Wed, 3 May 2006 05:00:02 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 3 May 2006 05:00:02 GMT Message-Id: <200605030500.k435020C082584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 05:00:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=96586 Change 96586 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/03 04:59:12 simplify tte_hash interface - hide locking from outside callers - add tte_hash_update to get an atomic view of the tte before a change - change tte_hash_delete to return the value of the tte being deleted to avoid redundant lookup Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#11 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#40 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#16 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#11 (text+ko) ==== @@ -14,22 +14,23 @@ tte_hash_t tte_hash_create(uint64_t context, uint64_t *scratchval); -void tte_hash_bucket_unlock(tte_hash_t hash, vm_offset_t va); - void tte_hash_destroy(tte_hash_t th); -int tte_hash_delete(tte_hash_t hash, vm_offset_t va, int locked); +tte_t tte_hash_delete(tte_hash_t hash, vm_offset_t va); void tte_hash_delete_all(tte_hash_t hash); void tte_hash_insert(tte_hash_t hash, vm_offset_t va, tte_t data); -tte_t *tte_hash_lookup(tte_hash_t hash, vm_offset_t va, int leave_locked); +tte_t tte_hash_lookup(tte_hash_t hash, vm_offset_t va); + +tte_t tte_hash_lookup_nolock(tte_hash_t hash, vm_offset_t va); uint64_t tte_hash_set_scratchpad_kernel(tte_hash_t th); uint64_t tte_hash_set_scratchpad_user(tte_hash_t th, uint64_t context); +tte_t tte_hash_update(tte_hash_t hash, vm_offset_t va, tte_t tte_data); #endif /* _MACHINE_TTE_HASH_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#40 (text+ko) ==== @@ -126,7 +126,7 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -int pmap_debug = 0; +int pmap_debug = 1; static struct mtx pmap_ctx_lock; static uint16_t ctx_stack[PMAP_CONTEXT_MAX]; @@ -196,7 +196,7 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); -static void pmap_remove_tte(pmap_t pmap, uint64_t *tte, vm_offset_t va); +static void pmap_remove_tte(pmap_t pmap, tte_t tte_data, vm_offset_t va); /* * Quick sort callout for comparing memory regions. @@ -277,7 +277,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; struct vpgqueues *vpq; - uint64_t *tte, tte_data; + uint64_t tte_data; pmap_t pmap; pv_entry_t allocated_pv, next_pv, pv; vm_offset_t va; @@ -319,9 +319,7 @@ continue; pmap->pm_stats.resident_count--; - tte = tte_hash_lookup(pmap->pm_hash, va, TRUE); - tte_data = *tte; - tte_hash_delete(pmap->pm_hash, va, TRUE); + tte_data = tte_hash_delete(pmap->pm_hash, va); KASSERT((tte_data & VTD_WIRED) == 0, ("get_pv_entry: wired pte %#jx", (uintmax_t)tte_data)); @@ -815,12 +813,8 @@ { vm_offset_t addr, end_addr; - end_addr = src_addr + len; - if (dst_addr != src_addr) - return; - /* * Don't let optional prefaulting of pages make us go * way below the low water mark of free pages or way @@ -840,13 +834,13 @@ } sched_pin(); for (addr = src_addr; addr < end_addr; addr += PAGE_SIZE) { - tte_t *src_tte, *dst_tte, tte_data; + tte_t tte_data; vm_page_t m; - src_tte = tte_hash_lookup(src_pmap->pm_hash, addr, FALSE); - tte_data = src_tte ? *src_tte : 0; + tte_data = tte_hash_lookup_nolock(src_pmap->pm_hash, addr); + if ((tte_data & VTD_MANAGED) != 0) { - if ((dst_tte = tte_hash_lookup(dst_pmap->pm_hash, addr, FALSE)) == NULL) { + if (tte_hash_lookup_nolock(dst_pmap->pm_hash, addr) == 0) { m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); tte_hash_insert(dst_pmap->pm_hash, addr, tte_data & ~(VTD_W|VTD_REF)); dst_pmap->pm_stats.resident_count++; @@ -885,7 +879,7 @@ boolean_t wired) { vm_paddr_t pa, opa; - uint64_t tte_data, otte_data, *otte; + uint64_t tte_data, otte_data; vm_page_t om; int invlva; @@ -900,8 +894,7 @@ sched_pin(); tte_data = pa = VM_PAGE_TO_PHYS(m); - otte = tte_hash_lookup(pmap->pm_hash, va, TRUE); - otte_data = otte ? *otte : 0; + otte_data = tte_hash_lookup(pmap->pm_hash, va); opa = TTE_GET_PA(otte_data); /* * Mapping has not changed, must be protection or wiring change. @@ -972,9 +965,10 @@ else tte_data |= TTE_MINFLAGS; - if ((otte_data & ~(VTD_W|VTD_REF|VTD_LOCK)) != tte_data) { + otte_data = tte_hash_update(pmap->pm_hash, va, tte_data); + invlva = FALSE; + if ((otte_data & ~(VTD_W|VTD_REF)) != tte_data) { if (otte_data & VTD_V) { - invlva = FALSE; if (otte_data & VTD_REF) { if (otte_data & VTD_MANAGED) vm_page_flag_set(om, PG_REFERENCED); @@ -985,28 +979,16 @@ if ((otte_data & VTD_MANAGED) && pmap_track_modified(pmap, va)) vm_page_dirty(om); - if ((prot & VM_PROT_WRITE) == 0) +#if 0 + if ((prot & VM_PROT_WRITE) == 0) /* XXX double check */ +#endif invlva = TRUE; } - DPRINTF("update *otte 0x%lx -> 0x%lx\n", otte_data, tte_data); - *otte = tte_data; + } + } - if (!(otte_data & VTD_LOCK)) - tte_hash_bucket_unlock(pmap->pm_hash, va); -#ifdef notyet - if (invlva) -#endif - pmap_invalidate_page(pmap, va); - } else { - tte_hash_insert(pmap->pm_hash, va, tte_data); - membar(Sync); - } - } else { - if (!(*otte & VTD_LOCK)) - tte_hash_bucket_unlock(pmap->pm_hash, va); - else - *otte = (*otte & ~VTD_LOCK); - } + if (invlva) + pmap_invalidate_page(pmap, va); sched_unpin(); PMAP_UNLOCK(pmap); @@ -1067,10 +1049,10 @@ pmap_extract(pmap_t pmap, vm_offset_t va) { vm_paddr_t pa; - tte_t *tte; + tte_t tte_data; - tte = tte_hash_lookup(pmap->pm_hash, va, FALSE); - pa = TTE_GET_PA(*tte) | (va & TTE_GET_PAGE_MASK(*tte)); + tte_data = tte_hash_lookup(pmap->pm_hash, va); + pa = TTE_GET_PA(tte_data) | (va & TTE_GET_PAGE_MASK(tte_data)); return (pa); } @@ -1083,17 +1065,17 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - tte_t *tte_data; + tte_t tte_data; vm_page_t m; m = NULL; vm_page_lock_queues(); PMAP_LOCK(pmap); sched_pin(); - tte_data = tte_hash_lookup(pmap->pm_hash, va, FALSE); + tte_data = tte_hash_lookup_nolock(pmap->pm_hash, va); if (tte_data != 0 && - ((*tte_data & VTD_SW_W) || (prot & VM_PROT_WRITE) == 0)) { - m = PHYS_TO_VM_PAGE(TTE_GET_PA(*tte_data)); + ((tte_data & VTD_SW_W) || (prot & VM_PROT_WRITE) == 0)) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); vm_page_hold(m); } sched_unpin(); @@ -1252,7 +1234,6 @@ invlpg(va, pmap->pm_context); #ifdef SMP - pmap_ipi(pmap, (void *)tl_invlpg, (uint64_t)va, (uint64_t)pmap->pm_context); #endif spinlock_exit(); @@ -1349,7 +1330,7 @@ boolean_t pmap_is_prefaultable(pmap_t pmap, vm_offset_t va) { - return (tte_hash_lookup(pmap->pm_hash, va, FALSE) == NULL); + return (tte_hash_lookup(pmap->pm_hash, va) == 0); } /* @@ -1369,7 +1350,7 @@ vm_paddr_t pmap_kextract(vm_offset_t va) { - uint64_t *tte, tte_data; + tte_t tte_data; vm_paddr_t pa; pa = 0; @@ -1381,8 +1362,8 @@ if ((pa == 0) && (tte_data = tsb_lookup_tte(va, 0)) != 0) pa = TTE_GET_PA(tte_data) | (va & TTE_GET_PAGE_MASK(tte_data)); - if ((pa == 0) && (tte = tte_hash_lookup(kernel_pmap->pm_hash, va, FALSE)) != NULL) - pa = TTE_GET_PA(*tte) | (va & TTE_GET_PAGE_MASK(*tte)); + if ((pa == 0) && (tte_data = tte_hash_lookup(kernel_pmap->pm_hash, va)) != 0) + pa = TTE_GET_PA(tte_data) | (va & TTE_GET_PAGE_MASK(tte_data)); return pa; } @@ -1390,7 +1371,7 @@ static void pmap_kremove(vm_offset_t va) { - tte_hash_delete(kernel_pmap->pm_hash, va, FALSE); + tte_hash_delete(kernel_pmap->pm_hash, va); } static void @@ -1540,7 +1521,6 @@ { int anychanged; - uint64_t *tte; vm_offset_t tva; DPRINTF("pmap_protect(0x%lx, 0x%lx, %d)\n", sva, eva, prot); @@ -1562,40 +1542,32 @@ for (tva = sva; tva < eva; tva += PAGE_SIZE) { uint64_t otte_data, tte_data; vm_page_t m; - retry: - tte = tte_hash_lookup(pmap->pm_hash, tva, TRUE); - if (tte == NULL) + + if ((otte_data = tte_hash_lookup(pmap->pm_hash, tva)) == 0) continue; - otte_data = tte_data = *tte; + tte_data = otte_data; + + tte_data &= ~(VTD_SW_W | VTD_W | VTD_REF); + otte_data = tte_hash_update(pmap->pm_hash, tva, tte_data); + + if (tte_data != otte_data) + anychanged = 1; - if (tte_data & VTD_MANAGED) { + if (otte_data & VTD_MANAGED) { m = NULL; - if (tte_data & VTD_REF) { - m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); + + if (otte_data & VTD_REF) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(otte_data)); vm_page_flag_set(m, PG_REFERENCED); - tte_data &= ~VTD_REF; } - if ((tte_data & VTD_W) && pmap_track_modified(pmap, tva)) { - m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); + if ((otte_data & VTD_W) && pmap_track_modified(pmap, tva)) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(otte_data)); vm_page_dirty(m); } - } - - tte_data &= ~(VTD_SW_W | VTD_W); - - if (tte_data != otte_data) { - if (!atomic_cmpset_long(tte, otte_data, tte_data)) { - /* XXX this should never happen with hash bucket locks - FIXME */ - panic("bucket locked but tte data changed"); - tte_hash_bucket_unlock(pmap->pm_hash, tva); - goto retry; - } - anychanged = 1; + } - tte_hash_bucket_unlock(pmap->pm_hash, tva); } - sched_unpin(); if (anychanged) @@ -1669,33 +1641,30 @@ { int invlva; vm_offset_t tva; - uint64_t *tte; + uint64_t tte_data; /* * Perform an unsynchronized read. This is, however, safe. */ if (pmap->pm_stats.resident_count == 0) return; + DPRINTF("pmap_remove(start=0x%lx, end=0x%lx)\n", + start, end); invlva = 0; vm_page_lock_queues(); sched_pin(); PMAP_LOCK(pmap); for (tva = start; tva < end; tva += PAGE_SIZE) { - if ((tte = tte_hash_lookup(pmap->pm_hash, tva, TRUE)) == NULL) + if ((tte_data = tte_hash_delete(pmap->pm_hash, tva)) == 0) continue; - pmap_remove_tte(pmap, tte, tva); - tte_hash_delete(pmap->pm_hash, tva, TRUE); - + pmap_remove_tte(pmap, tte_data, tva); invlva = 1; } sched_unpin(); vm_page_unlock_queues(); - if (invlva) { - if (pmap == kernel_pmap) - pmap_invalidate_range(pmap, start, end); - else - pmap_invalidate_all(pmap); - } + if (invlva) + pmap_invalidate_range(pmap, start, end); + PMAP_UNLOCK(pmap); } @@ -1717,7 +1686,7 @@ pmap_remove_all(vm_page_t m) { pv_entry_t pv; - uint64_t *tte, tte_data; + uint64_t tte_data; DPRINTF("pmap_remove_all 0x%lx\n", VM_PAGE_TO_PHYS(m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -1725,9 +1694,9 @@ while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pv->pv_pmap->pm_stats.resident_count--; - tte = tte_hash_lookup(pv->pv_pmap->pm_hash, pv->pv_va, TRUE); - tte_data = *tte; - tte_hash_delete(pv->pv_pmap->pm_hash, pv->pv_va, TRUE); + + tte_data = tte_hash_delete(pv->pv_pmap->pm_hash, pv->pv_va); + if (tte_data & VTD_WIRED) pv->pv_pmap->pm_stats.wired_count--; if (tte_data & VTD_REF) @@ -1790,17 +1759,17 @@ vm_page_t m; pv_entry_t pv, npv; - tte_t *tte, tte_data; - + tte_t tte_data; + + DPRINTF("pmap_remove_pages(ctx=0x%lx)\n", pmap->pm_context); vm_page_lock_queues(); PMAP_LOCK(pmap); sched_pin(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - tte = tte_hash_lookup(pmap->pm_hash, pv->pv_va, FALSE); - tte_data = tte ? *tte : 0; + tte_data = tte_hash_delete(pmap->pm_hash, pv->pv_va); if (tte_data == 0) { - printf("TTE at %p IS ZERO @ VA %016lx\n", tte, pv->pv_va); + printf("TTE IS ZERO @ VA %016lx\n", pv->pv_va); panic("bad tte"); } @@ -1815,7 +1784,9 @@ } m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); pmap->pm_stats.resident_count--; - + if ((uint64_t)m < KERNBASE) + panic("m=%p va=0x%lx tte_data=0x%lx", + m, pv->pv_va, tte_data); if (tte_data & VTD_W) { vm_page_dirty(m); @@ -1823,7 +1794,7 @@ npv = TAILQ_NEXT(pv, pv_plist); TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - + m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) @@ -1831,7 +1802,6 @@ free_pv_entry(pv); } - tte_hash_delete_all(pmap->pm_hash); sched_unpin(); pmap_invalidate_all(pmap); @@ -1852,31 +1822,31 @@ } } static void -pmap_remove_tte(pmap_t pmap, uint64_t *tte, vm_offset_t va) +pmap_remove_tte(pmap_t pmap, tte_t tte_data, vm_offset_t va) { vm_page_t m; if (pmap != kernel_pmap) - DPRINTF("pmap_remove_tte(va=0x%lx, pa=0x%lx)\n", va, TTE_GET_PA(*tte)); + DPRINTF("pmap_remove_tte(va=0x%lx, pa=0x%lx)\n", va, TTE_GET_PA(tte_data)); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - if (*tte & VTD_WIRED) - pmap->pm_stats.wired_count -= 1; + if (tte_data & VTD_WIRED) + pmap->pm_stats.wired_count--; - pmap->pm_stats.resident_count -= 1; + pmap->pm_stats.resident_count--; - if (*tte & VTD_MANAGED) { - m = PHYS_TO_VM_PAGE(TTE_GET_PA(*tte)); - if (*tte & VTD_W) { + if (tte_data & VTD_MANAGED) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); + if (tte_data & VTD_W) { if (pmap_track_modified(pmap, va)) vm_page_dirty(m); } - if (*tte & VTD_REF) + if (tte_data & VTD_REF) vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); } - } /* @@ -1921,21 +1891,6 @@ void pmap_zero_page_idle(vm_page_t m) { - int i; - for (i = 0; i < (nucleus_memory >> PAGE_SHIFT_4M); i++) { - if (VM_PAGE_TO_PHYS(m) >= nucleus_mappings[i] && - VM_PAGE_TO_PHYS(m) < nucleus_mappings[i] + PAGE_SIZE_4M) - panic("zeroing nucleus"); - - if (pmap_kextract(TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m))) >= - nucleus_mappings[i] && - pmap_kextract(TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m))) < - nucleus_mappings[i] + PAGE_SIZE_4M) - panic("zeroing nucleus in direct area"); - } - - - bzero((char *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)), PAGE_SIZE); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#7 (text+ko) ==== @@ -24,8 +24,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - - * $ Exp $ */ @@ -59,7 +57,6 @@ tte_clear_phys_bit(vm_page_t m, uint64_t flags) { pv_entry_t pv; - uint64_t tte_data, *tte; if ((m->flags & PG_FICTITIOUS) || (flags == VTD_SW_W && (m->flags & PG_WRITEABLE) == 0)) @@ -71,6 +68,7 @@ * setting RO do we need to clear the VAC? */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + tte_t otte_data, tte_data; /* * don't write protect pager mappings */ @@ -78,24 +76,23 @@ if (!pmap_track_modified(pv->pv_pmap, pv->pv_va)) continue; } - PMAP_LOCK(pv->pv_pmap); - tte = tte_hash_lookup(pv->pv_pmap->pm_hash, pv->pv_va, FALSE); - retry: - tte_data = *tte; - if (tte_data & flags) { + otte_data = tte_hash_lookup(pv->pv_pmap->pm_hash, pv->pv_va); + + if (otte_data & flags) { if (flags == VTD_SW_W) { - if (!atomic_cmpset_long((u_long *)tte, tte_data, - tte_data & ~(VTD_SW_W | VTD_W))) - goto retry; - if (tte_data & VTD_W) { - vm_page_dirty(m); - } + tte_data = otte_data & ~(VTD_SW_W | VTD_W); } else { - atomic_clear_long((u_long *)tte, flags); + tte_data = otte_data & ~flags; } + otte_data = tte_hash_update(pv->pv_pmap->pm_hash, pv->pv_va, tte_data); + + if (otte_data & VTD_W) + vm_page_dirty(m); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } - PMAP_UNLOCK(pv->pv_pmap); + + } if (flags == VTD_SW_W) vm_page_flag_clear(m, PG_WRITEABLE); @@ -118,12 +115,12 @@ void tte_clear_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags) { - tte_t *tte; + tte_t tte_data; - tte = tte_hash_lookup(pmap->pm_hash, va, FALSE); + tte_data = tte_hash_lookup(pmap->pm_hash, va); - if (tte) { - atomic_clear_long((u_long *)tte, flags); + if (tte_data) { + tte_hash_update(pmap->pm_hash, va, tte_data & ~flags); pmap_invalidate_page(pmap, va); } } @@ -137,11 +134,9 @@ boolean_t tte_get_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags) { - tte_t ttedata, *tte; + tte_t tte_data; - tte = tte_hash_lookup(pmap->pm_hash, va, FALSE); + tte_data = tte_hash_lookup(pmap->pm_hash, va); - ttedata = tte ? *tte : 0; - - return ((ttedata & flags) == flags); + return ((tte_data & flags) == flags); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#16 (text+ko) ==== @@ -59,6 +59,8 @@ #define HASH_MASK(th) ((th->th_size << (PAGE_SHIFT - THE_SHIFT)) - 1) #define HASH_VALID 0x1 +#define DEBUG + struct tte_hash_entry; typedef union { @@ -121,7 +123,8 @@ hash_bucket_lock(tte_hash_field_t fields) { uint64_t data; - + + spinlock_enter(); data = fields[0].tte.data & ~VTD_LOCK; while (atomic_cmpset_long(&fields[0].tte.data, data, data | VTD_LOCK)) data = fields[0].tte.data & ~VTD_LOCK; @@ -130,25 +133,6 @@ } -void -tte_hash_bucket_unlock(tte_hash_t th, vm_offset_t va) -{ - uint64_t hash_shift, hash_index; - tte_hash_field_t fields; - - /* XXX - only handle 8K pages for now */ - hash_shift = PAGE_SHIFT; - hash_index = (va >> hash_shift) & HASH_MASK(th); - fields = (th->th_hashtable[hash_index].the_fields); - -#ifdef DEBUG - if ((fields[0].tte.data & VTD_LOCK) == 0) - panic("trying to unlock bucket that isn't locked"); -#endif - fields[0].tte.data &= ~VTD_LOCK; - membar(StoreLoad); -} - static __inline void hash_bucket_unlock_inline(tte_hash_field_t fields) { @@ -158,6 +142,7 @@ #endif fields[0].tte.data &= ~VTD_LOCK; membar(StoreLoad); + spinlock_exit(); } void @@ -233,12 +218,6 @@ } void -tte_hash_clear(tte_hash_t th) -{ - bzero(th->th_hashtable, th->th_size*PAGE_SIZE); -} - -void tte_hash_destroy(tte_hash_t th) { vm_page_t m, hash_pages[MAX_HASH_SIZE]; @@ -264,52 +243,74 @@ } -int -tte_hash_delete(tte_hash_t th, vm_offset_t va, int locked) +static __inline tte_t +tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, int *index) +{ + uint64_t hash_shift, hash_index; + tte_hash_field_t fields; + int i; + tte_t entry; + /* XXX - only handle 8K pages for now */ + + hash_shift = PAGE_SHIFT; + hash_index = (va >> hash_shift) & HASH_MASK(th); + fields = (th->th_hashtable[hash_index].the_fields); + entry = 0; + + for (i = 0; i < 4 && fields[i].tte.tag != 0; i++) { + if (((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M))) { + entry = (fields[i].tte.data & ~VTD_LOCK); + break; + } + } + if (index) + *index = i; + /* + * XXX handle the case of collisions > 3 + */ + return (entry); +} + + +tte_t +tte_hash_delete(tte_hash_t th, vm_offset_t va) { uint64_t hash_shift, hash_index; tte_hash_field_t fields; int i, vaindex, lastindex; + tte_t tte_data; + /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); + + tte_data = 0; -#if 0 - KASSERT(tte_hash_lookup(th, va, FALSE) != 0, ("attempting to delete non-existent entry")); -#endif - if (locked == FALSE) - hash_bucket_lock(fields); + hash_bucket_lock(fields); + + tte_data = tte_hash_lookup_inline(th, va, &vaindex); - for (i = 0; i <= 3; i++) - if ((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M)) - break; - vaindex = i; + if (tte_data == 0) + goto done; - for (i = 0; i <= 3; i++) - if (fields[i].tte.tag == 0) - break; + for (i = 0; (i < 4) && (fields[i + 1].tte.tag != 0); i++) + ; lastindex = i; - if (vaindex != lastindex && (vaindex < 4)) { + if (vaindex != lastindex) { fields[vaindex].tte.tag = fields[lastindex].tte.tag; - fields[vaindex].tte.data = fields[lastindex].tte.data; + fields[vaindex].tte.data = fields[lastindex].tte.data | + (fields[vaindex].tte.data & VTD_LOCK); } fields[lastindex].tte.tag = 0; - fields[lastindex].tte.data = 0; - - if (lastindex != 0) - hash_bucket_unlock_inline(fields); + fields[lastindex].tte.data = 0 | (fields[lastindex].tte.data & VTD_LOCK); - return (vaindex < 4); -} +done: + hash_bucket_unlock_inline(fields); -void -tte_hash_delete_all(tte_hash_t th) -{ - - bzero(th->th_hashtable, th->th_size*PAGE_SIZE); + return (tte_data); } void @@ -318,77 +319,69 @@ uint64_t hash_shift, hash_index, tte_tag; tte_hash_field_t fields; - int i; + int cookie; + tte_t otte_data; + - -#if 0 - tte_t *tte; - tte = tte_hash_lookup(th, va, FALSE); - if (tte) - panic("mapping for va=0x%lx already exists tte_data=0x%lx\n", va, *tte); -#endif /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); - hash_bucket_lock(fields); tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); - for (i = 0; i <= 3; i++) { - if ((fields[i].tte.tag == 0) || (fields[i].tte.tag == tte_tag)) { - fields[i].tte.data = tte_data | (i ? 0 : VTD_LOCK); - fields[i].tte.tag = tte_tag; - goto done; - } + hash_bucket_lock(fields); + otte_data = tte_hash_lookup_inline(th, va, &cookie); +#ifdef DEBUG + if (otte_data) + panic("mapping for va=0x%lx already exists tte_data=0x%lx\n", va, otte_data); +#endif + fields[cookie].tte.data = tte_data | (fields[cookie].tte.data & VTD_LOCK); + fields[cookie].tte.tag = tte_tag; - } - panic("collision handling unimplemented - please re-consider"); + if (cookie == 4) + panic("collision handling unimplemented - please re-consider"); -done: hash_bucket_unlock_inline(fields); th->th_entries++; } + + +tte_t +tte_hash_lookup_nolock(tte_hash_t th, vm_offset_t va) +{ + return tte_hash_lookup_inline(th, va, NULL); +} + + /* * If leave_locked is true the tte's data field will be returned to * the caller with the hash bucket left locked */ -tte_t * -tte_hash_lookup(tte_hash_t th, vm_offset_t va, int leave_locked) +tte_t +tte_hash_lookup(tte_hash_t th, vm_offset_t va) { uint64_t hash_shift, hash_index; tte_hash_field_t fields; - int i; - tte_t *entry; + tte_t tte_data; /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); - entry = NULL; hash_bucket_lock(fields); - for (i = 0; i <= 3; i++) { - if (((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M)) && - (fields[i].tte.data != 0)) { - entry = &(fields[i].tte.data); - break; - } - } - if (entry == NULL || leave_locked == FALSE) - hash_bucket_unlock_inline(fields); + tte_data = tte_hash_lookup_inline(th, va, NULL); + hash_bucket_unlock_inline(fields); - /* - * XXX handle the case of collisions > 3 - * - */ - return (entry); + return (tte_data); } + uint64_t tte_hash_set_scratchpad_kernel(tte_hash_t th) { @@ -418,3 +411,30 @@ return hash_scratch; } +tte_t +tte_hash_update(tte_hash_t th, vm_offset_t va, tte_t tte_data) +{ + uint64_t hash_shift, hash_index; + tte_hash_field_t fields; + int cookie; + tte_t otte_data; + + /* XXX - only handle 8K pages for now */ + hash_shift = PAGE_SHIFT; + hash_index = (va >> hash_shift) & HASH_MASK(th); + fields = (th->th_hashtable[hash_index].the_fields); + + hash_bucket_lock(fields); + otte_data = tte_hash_lookup_inline(th, va, &cookie); +#ifdef TTE_DEBUG + printf("tte_hash_update(va=0x%lx, tte_data=0x%lx, index=%d)\n", va, tte_data, cookie); +#endif + fields[cookie].tte.tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); + fields[cookie].tte.data = tte_data | (fields[cookie].tte.data & VTD_LOCK); + hash_bucket_unlock_inline(fields); + + if (otte_data == 0) + th->th_entries++; + + return otte_data; +} From owner-p4-projects@FreeBSD.ORG Wed May 3 05:12:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD39B16A408; Wed, 3 May 2006 05:12:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A9A9B16A400 for ; Wed, 3 May 2006 05:12:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6696F43D4C for ; Wed, 3 May 2006 05:12:18 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k435CIFP088473 for ; Wed, 3 May 2006 05:12:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k435CIQC088468 for perforce@freebsd.org; Wed, 3 May 2006 05:12:18 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 3 May 2006 05:12:18 GMT Message-Id: <200605030512.k435CIQC088468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 05:12:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=96587 Change 96587 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/03 05:11:23 don't enable debugging by default remove unused panic Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#41 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#41 (text+ko) ==== @@ -126,7 +126,7 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -int pmap_debug = 1; +int pmap_debug = 0; static struct mtx pmap_ctx_lock; static uint16_t ctx_stack[PMAP_CONTEXT_MAX]; @@ -1784,9 +1784,6 @@ } m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); pmap->pm_stats.resident_count--; - if ((uint64_t)m < KERNBASE) - panic("m=%p va=0x%lx tte_data=0x%lx", - m, pv->pv_va, tte_data); if (tte_data & VTD_W) { vm_page_dirty(m); From owner-p4-projects@FreeBSD.ORG Wed May 3 15:08:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB3E116A403; Wed, 3 May 2006 15:08:23 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 48CCD16A400 for ; Wed, 3 May 2006 15:08:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AA0643D55 for ; Wed, 3 May 2006 15:08:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43F8MOq037291 for ; Wed, 3 May 2006 15:08:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43F8M0c037288 for perforce@freebsd.org; Wed, 3 May 2006 15:08:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 15:08:22 GMT Message-Id: <200605031508.k43F8M0c037288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 15:08:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=96592 Change 96592 by rwatson@rwatson_zoo on 2006/05/03 15:07:21 Define ioctls for getting and setting per-pipe preselection properties. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#5 (text+ko) ==== @@ -34,6 +34,16 @@ #define AUDITPIPE_IOBASE 'A' /* + * Data structures used for complex ioctl arguments. Do not change existing + * structures, add new revised ones to be used by new ioctls, and keep the + * old structures and ioctls for backwards compatibility. + */ +struct auditpipe_preselect { + au_id_t ap_auid; + au_mask_t ap_mask; +}; + +/* * Ioctls to read and control the behavior of individual audit pipe devices. */ #define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) @@ -41,6 +51,15 @@ #define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) #define AUDITPIPE_GET_QLIMIT_MIN _IOR(AUDITPIPE_IOBASE, 4, u_int) #define AUDITPIPE_GET_QLIMIT_MAX _IOR(AUDITPIPE_IOBASE, 5, u_int) +#define AUDITPIPE_GET_FLAGS _IOR(AUDITPIPE_IOBASE, 6, au_mask_t) +#define AUDITPIPE_SET_FLAGS _IOW(AUDITPIPE_IOBASE, 7, au_mask_t) +#define AUDITPIPE_GET_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) +#define AUDITPIPE_SET_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) +#define AUDITPIPE_GET_PRESELECT _IOR(AUDITPIPE_IOBASE, 10, \ + struct auditpipe_preselect) +#define AUDITPIPE_SET_PRESELECT _IOW(AUDITPIPE_IOBASE, 11, \ + struct auditpipe_preselect) +#define AUDITPIPE_FLUSH_PRESELECT _IO(AUDITPIPE_IOBASE, 11) /* * Ioctls to retrieve audit pipe statistics. From owner-p4-projects@FreeBSD.ORG Wed May 3 15:23:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EB5B16A404; Wed, 3 May 2006 15:23:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0490016A402 for ; Wed, 3 May 2006 15:23:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDD9543D48 for ; Wed, 3 May 2006 15:23:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43FNfnj047961 for ; Wed, 3 May 2006 15:23:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43FNfaf047958 for perforce@freebsd.org; Wed, 3 May 2006 15:23:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 15:23:41 GMT Message-Id: <200605031523.k43FNfaf047958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 15:23:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=96593 Change 96593 by rwatson@rwatson_zoo on 2006/05/03 15:23:36 Rename pipe preselect ioctls to all include the word 'PRESELECT'. Implement simple pipe preselect audit ioctls, but not per-auid ioctls yet. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#6 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#6 (text+ko) ==== @@ -51,15 +51,15 @@ #define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) #define AUDITPIPE_GET_QLIMIT_MIN _IOR(AUDITPIPE_IOBASE, 4, u_int) #define AUDITPIPE_GET_QLIMIT_MAX _IOR(AUDITPIPE_IOBASE, 5, u_int) -#define AUDITPIPE_GET_FLAGS _IOR(AUDITPIPE_IOBASE, 6, au_mask_t) -#define AUDITPIPE_SET_FLAGS _IOW(AUDITPIPE_IOBASE, 7, au_mask_t) -#define AUDITPIPE_GET_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) -#define AUDITPIPE_SET_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) -#define AUDITPIPE_GET_PRESELECT _IOR(AUDITPIPE_IOBASE, 10, \ +#define AUDITPIPE_GET_PRESELECT_FLAGS _IOR(AUDITPIPE_IOBASE, 6, au_mask_t) +#define AUDITPIPE_SET_PRESELECT_FLAGS _IOW(AUDITPIPE_IOBASE, 7, au_mask_t) +#define AUDITPIPE_GET_PRESELECT_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) +#define AUDITPIPE_SET_PRESELECT_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) +#define AUDITPIPE_GET_PRESELECT_AUID _IOR(AUDITPIPE_IOBASE, 10, \ struct auditpipe_preselect) -#define AUDITPIPE_SET_PRESELECT _IOW(AUDITPIPE_IOBASE, 11, \ +#define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ struct auditpipe_preselect) -#define AUDITPIPE_FLUSH_PRESELECT _IO(AUDITPIPE_IOBASE, 11) +#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 11) /* * Ioctls to retrieve audit pipe statistics. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#15 (text+ko) ==== @@ -499,11 +499,19 @@ audit_pipe_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { + struct auditpipe_preselect *aps; struct audit_pipe *ap; + au_mask_t *maskp; int error; ap = dev->si_drv1; KASSERT(ap != NULL, ("audit_pipe_ioctl: ap == NULL")); + + /* + * Audit pipe ioctls: first come standard device node ioctls, then + * manipulation of pipe settings, and finally, statistics query + * ioctls. + */ switch (cmd) { case FIONBIO: mtx_lock(&audit_pipe_mtx); @@ -575,6 +583,44 @@ error = 0; break; + case AUDITPIPE_GET_PRESELECT_FLAGS: + maskp = (au_mask_t *)data; + *maskp = ap->ap_preselect_flags; + error = 0; + break; + + case AUDITPIPE_SET_PRESELECT_FLAGS: + maskp = (au_mask_t *)data; + ap->ap_preselect_flags = *maskp; + error = 0; + break; + + case AUDITPIPE_GET_PRESELECT_NAFLAGS: + maskp = (au_mask_t *)data; + *maskp = ap->ap_preselect_naflags; + error = 0; + break; + + case AUDITPIPE_SET_PRESELECT_NAFLAGS: + maskp = (au_mask_t *)data; + ap->ap_preselect_naflags = *maskp; + error = 0; + break; + + case AUDITPIPE_GET_PRESELECT_AUID: + aps = (struct auditpipe_preselect *)data; + error = EOPNOTSUPP; + break; + + case AUDITPIPE_SET_PRESELECT_AUID: + aps = (struct auditpipe_preselect *)data; + error = EOPNOTSUPP; + break; + + case AUDITPIPE_FLUSH_PRESELECT_AUID: + error = EOPNOTSUPP; + break; + case AUDITPIPE_GET_INSERTS: *(u_int *)data = ap->ap_inserts; error = 0; From owner-p4-projects@FreeBSD.ORG Wed May 3 15:43:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDDED16A411; Wed, 3 May 2006 15:43:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B05C416A406 for ; Wed, 3 May 2006 15:43:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 728E843D62 for ; Wed, 3 May 2006 15:43:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43FhltB058529 for ; Wed, 3 May 2006 15:43:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43FhlXH058526 for perforce@freebsd.org; Wed, 3 May 2006 15:43:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 15:43:47 GMT Message-Id: <200605031543.k43FhlXH058526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 15:43:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=96595 Change 96595 by rwatson@rwatson_zoo on 2006/05/03 15:43:11 Default pre-selection masks for pipes to be full tracking, so that praudit on /dev/auditpipe will "just work". Add a flush ioctl that applications can use to empty a pipe of records that may not interest them, but were queued before they set up preselection. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#7 (text+ko) ==== @@ -59,7 +59,8 @@ struct auditpipe_preselect) #define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ struct auditpipe_preselect) -#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 11) +#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 12) +#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 13) /* * Ioctls to retrieve audit pipe statistics. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#16 (text+ko) ==== @@ -377,7 +377,11 @@ ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); + ap->ap_preselect_flags.am_success = 0xffffffff; + ap->ap_preselect_flags.am_failure = 0xffffffff; bzero(&ap->ap_preselect_naflags, sizeof(ap->ap_preselect_naflags)); + ap->ap_preselect_naflags.am_success = 0xffffffff; + ap->ap_preselect_naflags.am_failure = 0xffffffff; TAILQ_INIT(&ap->ap_preselect_list); TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); @@ -388,11 +392,10 @@ } /* - * Free an audit pipe. Assumes mutex is held, audit_pipe is still on the - * global list. Frees any audit pipe entries in the queue. + * Flush all records from an audit pipe; assume mutex is held. */ static void -audit_pipe_free(struct audit_pipe *ap) +audit_pipe_flush(struct audit_pipe *ap) { struct audit_pipe_entry *ape; @@ -405,6 +408,17 @@ ap->ap_qlen--; } KASSERT(ap->ap_qlen == 0, ("audit_pipe_free: ap_qlen")); +} + +/* + * Free an audit pipe. Assumes mutex is held, audit_pipe is still on the + * global list. Frees any audit pipe entries in the queue. + */ +static void +audit_pipe_free(struct audit_pipe *ap) +{ + + audit_pipe_flush(ap); free(ap, M_AUDIT_PIPE); audit_pipe_count--; } @@ -621,6 +635,11 @@ error = EOPNOTSUPP; break; + case AUDITPIPE_FLUSH: + audit_pipe_flush(ap); + error = 0; + break; + case AUDITPIPE_GET_INSERTS: *(u_int *)data = ap->ap_inserts; error = 0; From owner-p4-projects@FreeBSD.ORG Wed May 3 16:03:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1449D16A416; Wed, 3 May 2006 16:03:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C72CB16A40B for ; Wed, 3 May 2006 16:03:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E39B43D46 for ; Wed, 3 May 2006 16:03:09 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43G39YI069549 for ; Wed, 3 May 2006 16:03:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43G39ga069544 for perforce@freebsd.org; Wed, 3 May 2006 16:03:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 16:03:09 GMT Message-Id: <200605031603.k43G39ga069544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 16:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=96597 Change 96597 by rwatson@rwatson_zoo on 2006/05/03 16:02:56 Comment on preselection at top. Add memory type for per-auid preselection structures. Assert mutex when checking for interest. Acquire mutex in external API for preselection. Comment on why we initialize preselection masks for pipes the way we do. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#17 (text+ko) ==== @@ -55,7 +55,8 @@ * Implementation of a clonable special device providing a live stream of BSM * audit data. This is a "tee" of the data going to the file. It provides * unreliable but timely access to audit events. Consumers of this interface - * should be very careful to avoid introducing event cycles. + * should be very careful to avoid introducing event cycles. Consumers may + * express interest via a set of preselection ioctls. */ /* @@ -64,6 +65,8 @@ static MALLOC_DEFINE(M_AUDIT_PIPE, "audit_pipe", "Audit pipes"); static MALLOC_DEFINE(M_AUDIT_PIPE_ENTRY, "audit_pipeent", "Audit pipe entries and buffers"); +static MALLOC_DEFINE(M_AUDIT_PIPE_PRESELECT, "audit_pipe_preselect", + "Audit pipe preselection structure"); /* * Audit pipe buffer parameters. @@ -205,6 +208,8 @@ { struct audit_pipe_preselect *app; + mtx_assert(&audit_pipe_mtx, MA_OWNED); + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { if (app->app_auid == auid) break; @@ -231,10 +236,14 @@ { struct audit_pipe *ap; + mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { - if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) { + mtx_lock(&audit_pipe_mtx); return (1); + } } + mtx_unlock(&audit_pipe_mtx); return (0); } @@ -376,6 +385,16 @@ return (NULL); ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); + + /* + * Initialize pre-selection state to match all events by default, and + * have no particular auid-specific entries. This allows praudit(1) + * to be run directly on an audit pipe without any configuration or + * special handling. However, it also requires that applications + * flush the pipe after specifying preselection prequirements so that + * they don't see events captured before they completed + * configuration. + */ bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); ap->ap_preselect_flags.am_success = 0xffffffff; ap->ap_preselect_flags.am_failure = 0xffffffff; From owner-p4-projects@FreeBSD.ORG Wed May 3 19:37:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F28016A41F; Wed, 3 May 2006 19:37:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 50E0516A401 for ; Wed, 3 May 2006 19:37:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F25E43D8B for ; Wed, 3 May 2006 19:37:51 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43Jbp6W094242 for ; Wed, 3 May 2006 19:37:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Jbpc7094229 for perforce@freebsd.org; Wed, 3 May 2006 19:37:51 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 19:37:51 GMT Message-Id: <200605031937.k43Jbpc7094229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 19:37:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=96608 Change 96608 by imp@imp_hammer on 2006/05/03 19:37:50 Save about 40 bytes by not being stupid. Note: The register that's being read is specific to some board that isn't this board, so some care needs to be taken in fixing this right... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#11 (text+ko) ==== @@ -367,27 +367,17 @@ MII_GetLinkSpeed(AT91PS_EMAC pEmac) { unsigned short stat2; - unsigned update = 0; + unsigned update; stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); - - if (!(stat2 & 0x400)) { + if (!(stat2 & 0x400)) return ; - - } else if (stat2 & 0x4000) { - + update = pEmac->EMAC_CFG & ~(AT91C_EMAC_SPD | AT91C_EMAC_FD); + if (stat2 & 0x4000) update |= AT91C_EMAC_SPD; - - if (stat2 & 0x200) { - update |= AT91C_EMAC_FD; - } - - } else if (stat2 & 0x200) { + if (stat2 & 0x200) update |= AT91C_EMAC_FD; - } - - pEmac->EMAC_CFG = - (pEmac->EMAC_CFG & ~(AT91C_EMAC_SPD | AT91C_EMAC_FD)) | update; + pEmac->EMAC_CFG = update; } From owner-p4-projects@FreeBSD.ORG Wed May 3 19:39:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98B1316A474; Wed, 3 May 2006 19:39:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 76EAB16A448 for ; Wed, 3 May 2006 19:39:03 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B6F343D6D for ; Wed, 3 May 2006 19:38:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43JcrUf095011 for ; Wed, 3 May 2006 19:38:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Jcqih095003 for perforce@freebsd.org; Wed, 3 May 2006 19:38:52 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 19:38:52 GMT Message-Id: <200605031938.k43Jcqih095003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 19:39:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=96609 Change 96609 by imp@imp_hammer on 2006/05/03 19:38:50 Support FreeBSD booting as well as Linux. load 12 * 2 512 byte pages, not 12 * 1024 512 byte pages... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#3 (text+ko) ==== @@ -59,7 +59,7 @@ dabtvec: B dabtvec @; Data Abort rsvdvec: - .long ((1056 << 17) | (13 << 13) | (12 * 1024)) + .long ((1056 << 17) | (13 << 13) | (12 * 2)) irqvec: ldr pc, [pc,#-0xF20] @; IRQ : read the AIC fiqvec: @@ -101,9 +101,18 @@ .global BootCommandSection BootCommandSection: +#ifdef SUPPORT_LINUX .string "Bootloader for KB9202 Evaluation Board." .string "c 0x20210000 0x10100000 0x80000 " .string "m 0 0 0 0 0 0 " .string "t 0x20000100 console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933" .string "e 0x10000000 " .string " " +#else + .string "Bootloader for KB9202 Evaluation Board." + .string "m 42 53 44 0 0 1 " + .string "ip 206 168 13 194 " + .string "server_ip 206 168 13 207 " + .string "tftp 0x20000000 kernel.bin " + .string "e 0x20000000 " +#endif From owner-p4-projects@FreeBSD.ORG Wed May 3 19:39:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C2B816A406; Wed, 3 May 2006 19:39:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 12DE916A401 for ; Wed, 3 May 2006 19:39:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4BBA43DA0 for ; Wed, 3 May 2006 19:39:55 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43JdsCV095708 for ; Wed, 3 May 2006 19:39:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Jds8q095702 for perforce@freebsd.org; Wed, 3 May 2006 19:39:54 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 19:39:54 GMT Message-Id: <200605031939.k43Jds8q095702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 19:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=96610 Change 96610 by imp@imp_hammer on 2006/05/03 19:39:25 round the size to burn/compare to be a full flash page. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#10 (text) ==== @@ -41,6 +41,9 @@ #define BURN_FPGA 1 +//#define OFFSET (15 * FLASH_PAGE_SIZE) +#define OFFSET 0 + int main(void) { @@ -52,18 +55,19 @@ #endif SPI_InitFlash(); + printf("Waiting for data\r\n"); while ((len = xmodem_rx(addr)) == -1) continue; #ifdef BURN_FPGA printf("\r\nDownloaded %u bytes.\r\n", len); - p_memcpy(addr3, addr, len); - printf("Writing %u bytes to flash\r\n", len); + p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); + printf("Writing %u bytes to flash at %u\r\n", len, OFFSET); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { for (j = 0; j < 10; j++) { - off = i + 15 * FLASH_PAGE_SIZE; + off = i + OFFSET; SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE); - if (p_memcmp(addr3 + off, addr2 + off, FLASH_PAGE_SIZE) == 0) + if (p_memcmp(addr3 + i, addr2 + i, FLASH_PAGE_SIZE) == 0) break; } if (j >= 10) From owner-p4-projects@FreeBSD.ORG Wed May 3 20:27:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20ED516A629; Wed, 3 May 2006 20:27:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 94FC216A5E6 for ; Wed, 3 May 2006 20:27:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B297C43D6D for ; Wed, 3 May 2006 20:27:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43KRCLl021008 for ; Wed, 3 May 2006 20:27:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43KRC0L021002 for perforce@freebsd.org; Wed, 3 May 2006 20:27:12 GMT (envelope-from marcel@freebsd.org) Date: Wed, 3 May 2006 20:27:12 GMT Message-Id: <200605032027.k43KRC0L021002@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 Cc: Subject: PERFORCE change 96612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 20:27:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=96612 Change 96612 by marcel@marcel_nfs on 2006/05/03 20:26:00 IFC @96606 Affected files ... .. //depot/projects/busdma/Makefile#1 branch .. //depot/projects/busdma/alpha/Makefile#1 branch .. //depot/projects/busdma/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/busdma/alpha/alpha/atomic.s#1 branch .. //depot/projects/busdma/alpha/alpha/autoconf.c#1 branch .. //depot/projects/busdma/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/busspace.c#1 branch .. //depot/projects/busdma/alpha/alpha/clock.c#1 branch .. //depot/projects/busdma/alpha/alpha/clock_if.m#1 branch .. //depot/projects/busdma/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/busdma/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/busdma/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/busdma/alpha/alpha/db_interface.c#1 branch .. //depot/projects/busdma/alpha/alpha/db_trace.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/busdma/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/busdma/alpha/alpha/divrem.m4#1 branch .. //depot/projects/busdma/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/exception.s#1 branch .. //depot/projects/busdma/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/busdma/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/genassym.c#1 branch .. //depot/projects/busdma/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/busdma/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/busdma/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/busdma/alpha/alpha/interrupt.c#1 branch .. //depot/projects/busdma/alpha/alpha/locore.s#1 branch .. //depot/projects/busdma/alpha/alpha/machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/mem.c#1 branch .. //depot/projects/busdma/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/pal.s#1 branch .. //depot/projects/busdma/alpha/alpha/pmap.c#1 branch .. //depot/projects/busdma/alpha/alpha/prom.c#1 branch .. //depot/projects/busdma/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/busdma/alpha/alpha/promcons.c#1 branch .. //depot/projects/busdma/alpha/alpha/sgmap.c#1 branch .. //depot/projects/busdma/alpha/alpha/support.s#1 branch .. //depot/projects/busdma/alpha/alpha/swtch.s#1 branch .. //depot/projects/busdma/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/trap.c#1 branch .. //depot/projects/busdma/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/busdma/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/busdma/alpha/compile/.cvsignore#1 branch .. //depot/projects/busdma/alpha/conf/.cvsignore#1 branch .. //depot/projects/busdma/alpha/conf/DEFAULTS#1 branch .. //depot/projects/busdma/alpha/conf/GENERIC#1 branch .. //depot/projects/busdma/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/busdma/alpha/conf/MAC#1 branch .. //depot/projects/busdma/alpha/conf/Makefile#1 branch .. //depot/projects/busdma/alpha/conf/NOTES#1 branch .. //depot/projects/busdma/alpha/include/_bus.h#1 branch .. //depot/projects/busdma/alpha/include/_inttypes.h#1 branch .. //depot/projects/busdma/alpha/include/_limits.h#1 branch .. //depot/projects/busdma/alpha/include/_stdint.h#1 branch .. //depot/projects/busdma/alpha/include/_types.h#1 branch .. //depot/projects/busdma/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/busdma/alpha/include/asm.h#1 branch .. //depot/projects/busdma/alpha/include/atomic.h#1 branch .. //depot/projects/busdma/alpha/include/bootinfo.h#1 branch .. //depot/projects/busdma/alpha/include/bus.h#1 branch .. //depot/projects/busdma/alpha/include/bus_dma.h#1 branch .. //depot/projects/busdma/alpha/include/bwx.h#1 branch .. //depot/projects/busdma/alpha/include/chipset.h#1 branch .. //depot/projects/busdma/alpha/include/clock.h#1 branch .. //depot/projects/busdma/alpha/include/clockvar.h#1 branch .. //depot/projects/busdma/alpha/include/cpu.h#1 branch .. //depot/projects/busdma/alpha/include/cpuconf.h#1 branch .. //depot/projects/busdma/alpha/include/cpufunc.h#1 branch .. //depot/projects/busdma/alpha/include/db_machdep.h#1 branch .. //depot/projects/busdma/alpha/include/elf.h#1 branch .. //depot/projects/busdma/alpha/include/endian.h#1 branch .. //depot/projects/busdma/alpha/include/exec.h#1 branch .. //depot/projects/busdma/alpha/include/float.h#1 branch .. //depot/projects/busdma/alpha/include/floatingpoint.h#1 branch .. //depot/projects/busdma/alpha/include/fpu.h#1 branch .. //depot/projects/busdma/alpha/include/frame.h#1 branch .. //depot/projects/busdma/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/busdma/alpha/include/ieee.h#1 branch .. //depot/projects/busdma/alpha/include/ieeefp.h#1 branch .. //depot/projects/busdma/alpha/include/in_cksum.h#1 branch .. //depot/projects/busdma/alpha/include/inst.h#1 branch .. //depot/projects/busdma/alpha/include/intr.h#1 branch .. //depot/projects/busdma/alpha/include/intrcnt.h#1 branch .. //depot/projects/busdma/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/busdma/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/busdma/alpha/include/kdb.h#1 branch .. //depot/projects/busdma/alpha/include/limits.h#1 branch .. //depot/projects/busdma/alpha/include/md_var.h#1 branch .. //depot/projects/busdma/alpha/include/memdev.h#1 branch .. //depot/projects/busdma/alpha/include/mutex.h#1 branch .. //depot/projects/busdma/alpha/include/pal.h#1 branch .. //depot/projects/busdma/alpha/include/param.h#1 branch .. //depot/projects/busdma/alpha/include/pc/bios.h#1 branch .. //depot/projects/busdma/alpha/include/pc/display.h#1 branch .. //depot/projects/busdma/alpha/include/pc/vesa.h#1 branch .. //depot/projects/busdma/alpha/include/pcb.h#1 branch .. //depot/projects/busdma/alpha/include/pcpu.h#1 branch .. //depot/projects/busdma/alpha/include/pmap.h#1 branch .. //depot/projects/busdma/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/busdma/alpha/include/ppireg.h#1 branch .. //depot/projects/busdma/alpha/include/proc.h#1 branch .. //depot/projects/busdma/alpha/include/profile.h#1 branch .. //depot/projects/busdma/alpha/include/prom.h#1 branch .. //depot/projects/busdma/alpha/include/pte.h#1 branch .. //depot/projects/busdma/alpha/include/ptrace.h#1 branch .. //depot/projects/busdma/alpha/include/reg.h#1 branch .. //depot/projects/busdma/alpha/include/reloc.h#1 branch .. //depot/projects/busdma/alpha/include/resource.h#1 branch .. //depot/projects/busdma/alpha/include/rpb.h#1 branch .. //depot/projects/busdma/alpha/include/runq.h#1 branch .. //depot/projects/busdma/alpha/include/setjmp.h#1 branch .. //depot/projects/busdma/alpha/include/sf_buf.h#1 branch .. //depot/projects/busdma/alpha/include/sgmap.h#1 branch .. //depot/projects/busdma/alpha/include/sigframe.h#1 branch .. //depot/projects/busdma/alpha/include/signal.h#1 branch .. //depot/projects/busdma/alpha/include/smp.h#1 branch .. //depot/projects/busdma/alpha/include/stdarg.h#1 branch .. //depot/projects/busdma/alpha/include/swiz.h#1 branch .. //depot/projects/busdma/alpha/include/sysarch.h#1 branch .. //depot/projects/busdma/alpha/include/timerreg.h#1 branch .. //depot/projects/busdma/alpha/include/ucontext.h#1 branch .. //depot/projects/busdma/alpha/include/varargs.h#1 branch .. //depot/projects/busdma/alpha/include/vmparam.h#1 branch .. //depot/projects/busdma/alpha/isa/isa.c#1 branch .. //depot/projects/busdma/alpha/isa/isa_dma.c#1 branch .. //depot/projects/busdma/alpha/isa/isavar.h#1 branch .. //depot/projects/busdma/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/busdma/alpha/linux/Makefile#1 branch .. //depot/projects/busdma/alpha/linux/linux.h#1 branch .. //depot/projects/busdma/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/busdma/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/busdma/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/busdma/alpha/linux/linux_locore.s#1 branch .. //depot/projects/busdma/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/busdma/alpha/linux/linux_proto.h#1 branch .. //depot/projects/busdma/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/busdma/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/busdma/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/busdma/alpha/linux/syscalls.conf#1 branch .. //depot/projects/busdma/alpha/linux/syscalls.master#1 branch .. //depot/projects/busdma/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/busdma/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/busdma/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/busdma/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/busdma/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/busdma/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/busdma/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/busdma/alpha/osf1/Makefile#1 branch .. //depot/projects/busdma/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/busdma/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/busdma/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/busdma/alpha/osf1/osf1.h#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/busdma/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/busdma/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/busdma/alpha/osf1/syscalls.master#1 branch .. //depot/projects/busdma/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/busdma/alpha/pci/apecs.c#1 branch .. //depot/projects/busdma/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/busdma/alpha/pci/apecsreg.h#1 branch .. //depot/projects/busdma/alpha/pci/apecsvar.h#1 branch .. //depot/projects/busdma/alpha/pci/bwx.c#1 branch .. //depot/projects/busdma/alpha/pci/cia.c#1 branch .. //depot/projects/busdma/alpha/pci/cia_pci.c#1 branch .. //depot/projects/busdma/alpha/pci/ciareg.h#1 branch .. //depot/projects/busdma/alpha/pci/ciavar.h#1 branch .. //depot/projects/busdma/alpha/pci/irongate.c#1 branch .. //depot/projects/busdma/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/busdma/alpha/pci/irongatereg.h#1 branch .. //depot/projects/busdma/alpha/pci/irongatevar.h#1 branch .. //depot/projects/busdma/alpha/pci/lca.c#1 branch .. //depot/projects/busdma/alpha/pci/lca_pci.c#1 branch .. //depot/projects/busdma/alpha/pci/lcareg.h#1 branch .. //depot/projects/busdma/alpha/pci/lcavar.h#1 branch .. //depot/projects/busdma/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/busdma/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/busdma/alpha/pci/pcibus.c#1 branch .. //depot/projects/busdma/alpha/pci/pcibus.h#1 branch .. //depot/projects/busdma/alpha/pci/swiz.c#1 branch .. //depot/projects/busdma/alpha/pci/t2.c#1 branch .. //depot/projects/busdma/alpha/pci/t2_pci.c#1 branch .. //depot/projects/busdma/alpha/pci/t2reg.h#1 branch .. //depot/projects/busdma/alpha/pci/t2var.h#1 branch .. //depot/projects/busdma/alpha/pci/tsunami.c#1 branch .. //depot/projects/busdma/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/busdma/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/busdma/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/busdma/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/busdma/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/busdma/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/busdma/alpha/tlsb/gbus.c#1 branch .. //depot/projects/busdma/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/busdma/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/busdma/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/busdma/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/busdma/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/busdma/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/busdma/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/busdma/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/busdma/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/busdma/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/busdma/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/busdma/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/busdma/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/busdma/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/busdma/amd64/Makefile#1 branch .. //depot/projects/busdma/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/busdma/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/busdma/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/busdma/amd64/acpica/madt.c#1 branch .. //depot/projects/busdma/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/busdma/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/busdma/amd64/amd64/atomic.c#1 branch .. //depot/projects/busdma/amd64/amd64/autoconf.c#1 branch .. //depot/projects/busdma/amd64/amd64/bios.c#1 branch .. //depot/projects/busdma/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/busdma/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/busdma/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/busdma/amd64/amd64/db_interface.c#1 branch .. //depot/projects/busdma/amd64/amd64/db_trace.c#1 branch .. //depot/projects/busdma/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/exception.S#1 branch .. //depot/projects/busdma/amd64/amd64/fpu.c#1 branch .. //depot/projects/busdma/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/genassym.c#1 branch .. //depot/projects/busdma/amd64/amd64/identcpu.c#1 branch .. //depot/projects/busdma/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/busdma/amd64/amd64/initcpu.c#1 branch .. //depot/projects/busdma/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/io.c#1 branch .. //depot/projects/busdma/amd64/amd64/io_apic.c#1 branch .. //depot/projects/busdma/amd64/amd64/legacy.c#1 branch .. //depot/projects/busdma/amd64/amd64/local_apic.c#1 branch .. //depot/projects/busdma/amd64/amd64/locore.S#1 branch .. //depot/projects/busdma/amd64/amd64/machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/mem.c#1 branch .. //depot/projects/busdma/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/busdma/amd64/amd64/mpboot.S#1 branch .. //depot/projects/busdma/amd64/amd64/mptable.c#1 branch .. //depot/projects/busdma/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/busdma/amd64/amd64/nexus.c#1 branch .. //depot/projects/busdma/amd64/amd64/pmap.c#1 branch .. //depot/projects/busdma/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/busdma/amd64/amd64/support.S#1 branch .. //depot/projects/busdma/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/trap.c#1 branch .. //depot/projects/busdma/amd64/amd64/tsc.c#1 branch .. //depot/projects/busdma/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/busdma/amd64/compile/.cvsignore#1 branch .. //depot/projects/busdma/amd64/conf/.cvsignore#1 branch .. //depot/projects/busdma/amd64/conf/DEFAULTS#1 branch .. //depot/projects/busdma/amd64/conf/GENERIC#1 branch .. //depot/projects/busdma/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/busdma/amd64/conf/MAC#1 branch .. //depot/projects/busdma/amd64/conf/Makefile#1 branch .. //depot/projects/busdma/amd64/conf/NOTES#1 branch .. //depot/projects/busdma/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/busdma/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/busdma/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/busdma/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/busdma/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/busdma/amd64/include/_bus.h#1 branch .. //depot/projects/busdma/amd64/include/_inttypes.h#1 branch .. //depot/projects/busdma/amd64/include/_limits.h#1 branch .. //depot/projects/busdma/amd64/include/_stdint.h#1 branch .. //depot/projects/busdma/amd64/include/_types.h#1 branch .. //depot/projects/busdma/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/busdma/amd64/include/apicreg.h#1 branch .. //depot/projects/busdma/amd64/include/apicvar.h#1 branch .. //depot/projects/busdma/amd64/include/asm.h#1 branch .. //depot/projects/busdma/amd64/include/asmacros.h#1 branch .. //depot/projects/busdma/amd64/include/atomic.h#1 branch .. //depot/projects/busdma/amd64/include/bus.h#1 branch .. //depot/projects/busdma/amd64/include/bus_dma.h#1 branch .. //depot/projects/busdma/amd64/include/clock.h#1 branch .. //depot/projects/busdma/amd64/include/cpu.h#1 branch .. //depot/projects/busdma/amd64/include/cpufunc.h#1 branch .. //depot/projects/busdma/amd64/include/cputypes.h#1 branch .. //depot/projects/busdma/amd64/include/db_machdep.h#1 branch .. //depot/projects/busdma/amd64/include/elf.h#1 branch .. //depot/projects/busdma/amd64/include/endian.h#1 branch .. //depot/projects/busdma/amd64/include/exec.h#1 branch .. //depot/projects/busdma/amd64/include/float.h#1 branch .. //depot/projects/busdma/amd64/include/floatingpoint.h#1 branch .. //depot/projects/busdma/amd64/include/fpu.h#1 branch .. //depot/projects/busdma/amd64/include/frame.h#1 branch .. //depot/projects/busdma/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/busdma/amd64/include/ieeefp.h#1 branch .. //depot/projects/busdma/amd64/include/in_cksum.h#1 branch .. //depot/projects/busdma/amd64/include/intr_machdep.h#1 branch .. //depot/projects/busdma/amd64/include/iodev.h#1 branch .. //depot/projects/busdma/amd64/include/kdb.h#1 branch .. //depot/projects/busdma/amd64/include/legacyvar.h#1 branch .. //depot/projects/busdma/amd64/include/limits.h#1 branch .. //depot/projects/busdma/amd64/include/md_var.h#1 branch .. //depot/projects/busdma/amd64/include/memdev.h#1 branch .. //depot/projects/busdma/amd64/include/metadata.h#1 branch .. //depot/projects/busdma/amd64/include/minidump.h#1 branch .. //depot/projects/busdma/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/busdma/amd64/include/mptable.h#1 branch .. //depot/projects/busdma/amd64/include/mutex.h#1 branch .. //depot/projects/busdma/amd64/include/param.h#1 branch .. //depot/projects/busdma/amd64/include/pc/bios.h#1 branch .. //depot/projects/busdma/amd64/include/pc/display.h#1 branch .. //depot/projects/busdma/amd64/include/pcb.h#1 branch .. //depot/projects/busdma/amd64/include/pcb_ext.h#1 branch .. //depot/projects/busdma/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/busdma/amd64/include/pcpu.h#1 branch .. //depot/projects/busdma/amd64/include/pmap.h#1 branch .. //depot/projects/busdma/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/busdma/amd64/include/ppireg.h#1 branch .. //depot/projects/busdma/amd64/include/proc.h#1 branch .. //depot/projects/busdma/amd64/include/profile.h#1 branch .. //depot/projects/busdma/amd64/include/psl.h#1 branch .. //depot/projects/busdma/amd64/include/ptrace.h#1 branch .. //depot/projects/busdma/amd64/include/reg.h#1 branch .. //depot/projects/busdma/amd64/include/reloc.h#1 branch .. //depot/projects/busdma/amd64/include/resource.h#1 branch .. //depot/projects/busdma/amd64/include/runq.h#1 branch .. //depot/projects/busdma/amd64/include/segments.h#1 branch .. //depot/projects/busdma/amd64/include/setjmp.h#1 branch .. //depot/projects/busdma/amd64/include/sf_buf.h#1 branch .. //depot/projects/busdma/amd64/include/sigframe.h#1 branch .. //depot/projects/busdma/amd64/include/signal.h#1 branch .. //depot/projects/busdma/amd64/include/smp.h#1 branch .. //depot/projects/busdma/amd64/include/specialreg.h#1 branch .. //depot/projects/busdma/amd64/include/stdarg.h#1 branch .. //depot/projects/busdma/amd64/include/sysarch.h#1 branch .. //depot/projects/busdma/amd64/include/timerreg.h#1 branch .. //depot/projects/busdma/amd64/include/trap.h#1 branch .. //depot/projects/busdma/amd64/include/tss.h#1 branch .. //depot/projects/busdma/amd64/include/ucontext.h#1 branch .. //depot/projects/busdma/amd64/include/varargs.h#1 branch .. //depot/projects/busdma/amd64/include/vmparam.h#1 branch .. //depot/projects/busdma/amd64/isa/atpic.c#1 branch .. //depot/projects/busdma/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/busdma/amd64/isa/clock.c#1 branch .. //depot/projects/busdma/amd64/isa/elcr.c#1 branch .. //depot/projects/busdma/amd64/isa/icu.h#1 branch .. //depot/projects/busdma/amd64/isa/isa.c#1 branch .. //depot/projects/busdma/amd64/isa/isa.h#1 branch .. //depot/projects/busdma/amd64/isa/isa_dma.c#1 branch .. //depot/projects/busdma/amd64/isa/nmi.c#1 branch .. //depot/projects/busdma/amd64/linux32/Makefile#1 branch .. //depot/projects/busdma/amd64/linux32/linux.h#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/busdma/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/busdma/amd64/linux32/syscalls.master#1 branch .. //depot/projects/busdma/amd64/pci/pci_bus.c#1 branch .. //depot/projects/busdma/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/busdma/arm/arm/autoconf.c#1 branch .. //depot/projects/busdma/arm/arm/bcopy_page.S#1 branch .. //depot/projects/busdma/arm/arm/bcopyinout.S#1 branch .. //depot/projects/busdma/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/busdma/arm/arm/blockio.S#1 branch .. //depot/projects/busdma/arm/arm/bootconfig.c#1 branch .. //depot/projects/busdma/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/busdma/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/busdma/arm/arm/copystr.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc.c#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/busdma/arm/arm/db_disasm.c#1 branch .. //depot/projects/busdma/arm/arm/db_interface.c#1 branch .. //depot/projects/busdma/arm/arm/db_trace.c#1 branch .. //depot/projects/busdma/arm/arm/disassem.c#1 branch .. //depot/projects/busdma/arm/arm/dump_machdep.c#1 branch .. //depot/projects/busdma/arm/arm/elf_machdep.c#1 branch .. //depot/projects/busdma/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/busdma/arm/arm/exception.S#1 branch .. //depot/projects/busdma/arm/arm/fiq.c#1 branch .. //depot/projects/busdma/arm/arm/fiq_subr.S#1 branch .. //depot/projects/busdma/arm/arm/fusu.S#1 branch .. //depot/projects/busdma/arm/arm/genassym.c#1 branch .. //depot/projects/busdma/arm/arm/identcpu.c#1 branch .. //depot/projects/busdma/arm/arm/in_cksum.c#1 branch .. //depot/projects/busdma/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/busdma/arm/arm/inckern.S#1 branch .. //depot/projects/busdma/arm/arm/intr.c#1 branch .. //depot/projects/busdma/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/busdma/arm/arm/locore.S#1 branch .. //depot/projects/busdma/arm/arm/machdep.c#1 branch .. //depot/projects/busdma/arm/arm/mem.c#1 branch .. //depot/projects/busdma/arm/arm/nexus.c#1 branch .. //depot/projects/busdma/arm/arm/nexus_io.c#1 branch .. //depot/projects/busdma/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/busdma/arm/arm/pmap.c#1 branch .. //depot/projects/busdma/arm/arm/setcpsr.S#1 branch .. //depot/projects/busdma/arm/arm/setstack.s#1 branch .. //depot/projects/busdma/arm/arm/support.S#1 branch .. //depot/projects/busdma/arm/arm/swtch.S#1 branch .. //depot/projects/busdma/arm/arm/sys_machdep.c#1 branch .. //depot/projects/busdma/arm/arm/trap.c#1 branch .. //depot/projects/busdma/arm/arm/uio_machdep.c#1 branch .. //depot/projects/busdma/arm/arm/undefined.c#1 branch .. //depot/projects/busdma/arm/arm/vectors.S#1 branch .. //depot/projects/busdma/arm/arm/vm_machdep.c#1 branch .. //depot/projects/busdma/arm/at91/at91.c#1 branch .. //depot/projects/busdma/arm/at91/at91_pio.c#1 branch .. //depot/projects/busdma/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_pmc.c#1 branch .. //depot/projects/busdma/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/busdma/arm/at91/at91_rtc.c#1 branch .. //depot/projects/busdma/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_spi.c#1 branch .. //depot/projects/busdma/arm/at91/at91_spiio.h#1 branch .. //depot/projects/busdma/arm/at91/at91_spireg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_ssc.c#1 branch .. //depot/projects/busdma/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_st.c#1 branch .. //depot/projects/busdma/arm/at91/at91_streg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_twi.c#1 branch .. //depot/projects/busdma/arm/at91/at91_twiio.h#1 branch .. //depot/projects/busdma/arm/at91/at91_twireg.h#1 branch .. //depot/projects/busdma/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/busdma/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/busdma/arm/at91/at91var.h#1 branch .. //depot/projects/busdma/arm/at91/files.at91#1 branch .. //depot/projects/busdma/arm/at91/files.kb920x#1 branch .. //depot/projects/busdma/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/busdma/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/busdma/arm/at91/if_ate.c#1 branch .. //depot/projects/busdma/arm/at91/if_atereg.h#1 branch .. //depot/projects/busdma/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/busdma/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/busdma/arm/at91/std.at91#1 branch .. //depot/projects/busdma/arm/at91/std.kb920x#1 branch .. //depot/projects/busdma/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/busdma/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/busdma/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/busdma/arm/compile/.cvsignore#1 branch .. //depot/projects/busdma/arm/conf/.cvsignore#1 branch .. //depot/projects/busdma/arm/conf/IQ31244#1 branch .. //depot/projects/busdma/arm/conf/KB920X#1 branch .. //depot/projects/busdma/arm/conf/SIMICS#1 branch .. //depot/projects/busdma/arm/conf/SKYEYE#1 branch .. //depot/projects/busdma/arm/include/_bus.h#1 branch .. //depot/projects/busdma/arm/include/_inttypes.h#1 branch .. //depot/projects/busdma/arm/include/_limits.h#1 branch .. //depot/projects/busdma/arm/include/_stdint.h#1 branch .. //depot/projects/busdma/arm/include/_types.h#1 branch .. //depot/projects/busdma/arm/include/armreg.h#1 branch .. //depot/projects/busdma/arm/include/asm.h#1 branch .. //depot/projects/busdma/arm/include/asmacros.h#1 branch .. //depot/projects/busdma/arm/include/atomic.h#1 branch .. //depot/projects/busdma/arm/include/blockio.h#1 branch .. //depot/projects/busdma/arm/include/bootconfig.h#1 branch .. //depot/projects/busdma/arm/include/bus.h#1 branch .. //depot/projects/busdma/arm/include/bus_dma.h#1 branch .. //depot/projects/busdma/arm/include/clock.h#1 branch .. //depot/projects/busdma/arm/include/cpu.h#1 branch .. //depot/projects/busdma/arm/include/cpuconf.h#1 branch .. //depot/projects/busdma/arm/include/cpufunc.h#1 branch .. //depot/projects/busdma/arm/include/db_machdep.h#1 branch .. //depot/projects/busdma/arm/include/disassem.h#1 branch .. //depot/projects/busdma/arm/include/elf.h#1 branch .. //depot/projects/busdma/arm/include/endian.h#1 branch .. //depot/projects/busdma/arm/include/exec.h#1 branch .. //depot/projects/busdma/arm/include/fiq.h#1 branch .. //depot/projects/busdma/arm/include/float.h#1 branch .. //depot/projects/busdma/arm/include/floatingpoint.h#1 branch .. //depot/projects/busdma/arm/include/fp.h#1 branch .. //depot/projects/busdma/arm/include/frame.h#1 branch .. //depot/projects/busdma/arm/include/ieee.h#1 branch .. //depot/projects/busdma/arm/include/ieeefp.h#1 branch .. //depot/projects/busdma/arm/include/in_cksum.h#1 branch .. //depot/projects/busdma/arm/include/intr.h#1 branch .. //depot/projects/busdma/arm/include/katelib.h#1 branch .. //depot/projects/busdma/arm/include/kdb.h#1 branch .. //depot/projects/busdma/arm/include/limits.h#1 branch .. //depot/projects/busdma/arm/include/machdep.h#1 branch .. //depot/projects/busdma/arm/include/md_var.h#1 branch .. //depot/projects/busdma/arm/include/memdev.h#1 branch .. //depot/projects/busdma/arm/include/metadata.h#1 branch .. //depot/projects/busdma/arm/include/mutex.h#1 branch .. //depot/projects/busdma/arm/include/param.h#1 branch .. //depot/projects/busdma/arm/include/pcb.h#1 branch .. //depot/projects/busdma/arm/include/pcpu.h#1 branch .. //depot/projects/busdma/arm/include/pmap.h#1 branch .. //depot/projects/busdma/arm/include/pmc_mdep.h#1 branch .. //depot/projects/busdma/arm/include/proc.h#1 branch .. //depot/projects/busdma/arm/include/profile.h#1 branch .. //depot/projects/busdma/arm/include/psl.h#1 branch .. //depot/projects/busdma/arm/include/pte.h#1 branch .. //depot/projects/busdma/arm/include/ptrace.h#1 branch .. //depot/projects/busdma/arm/include/reg.h#1 branch .. //depot/projects/busdma/arm/include/reloc.h#1 branch .. //depot/projects/busdma/arm/include/resource.h#1 branch .. //depot/projects/busdma/arm/include/runq.h#1 branch .. //depot/projects/busdma/arm/include/setjmp.h#1 branch .. //depot/projects/busdma/arm/include/sf_buf.h#1 branch .. //depot/projects/busdma/arm/include/sigframe.h#1 branch .. //depot/projects/busdma/arm/include/signal.h#1 branch .. //depot/projects/busdma/arm/include/smp.h#1 branch .. //depot/projects/busdma/arm/include/stdarg.h#1 branch .. //depot/projects/busdma/arm/include/swi.h#1 branch .. //depot/projects/busdma/arm/include/sysarch.h#1 branch .. //depot/projects/busdma/arm/include/trap.h#1 branch .. //depot/projects/busdma/arm/include/ucontext.h#1 branch .. //depot/projects/busdma/arm/include/undefined.h#1 branch .. //depot/projects/busdma/arm/include/utrap.h#1 branch .. //depot/projects/busdma/arm/include/vmparam.h#1 branch .. //depot/projects/busdma/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/busdma/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/busdma/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/busdma/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/busdma/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/busdma/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/busdma/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/busdma/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/busdma/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/busdma/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/busdma/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/busdma/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/busdma/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/busdma/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/busdma/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/busdma/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/busdma/arm/xscale/std.xscale#1 branch .. //depot/projects/busdma/arm/xscale/xscalereg.h#1 branch .. //depot/projects/busdma/arm/xscale/xscalevar.h#1 branch .. //depot/projects/busdma/boot/Makefile#1 branch .. //depot/projects/busdma/boot/README#1 branch .. //depot/projects/busdma/boot/alpha/Makefile#1 branch .. //depot/projects/busdma/boot/alpha/Makefile.inc#1 branch .. //depot/projects/busdma/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/busdma/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/busdma/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/busdma/boot/alpha/cdboot/version#1 branch .. //depot/projects/busdma/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/busdma/boot/alpha/common/conf.c#1 branch .. //depot/projects/busdma/boot/alpha/common/help.alpha#1 branch .. //depot/projects/busdma/boot/alpha/common/ldscript#1 branch .. //depot/projects/busdma/boot/alpha/common/main.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/busdma/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/busdma/boot/alpha/loader/Makefile#1 branch .. //depot/projects/busdma/boot/alpha/loader/version#1 branch .. //depot/projects/busdma/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/busdma/boot/alpha/netboot/version#1 branch .. //depot/projects/busdma/boot/arc/Makefile#1 branch .. //depot/projects/busdma/boot/arc/Makefile.inc#1 branch .. //depot/projects/busdma/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/busdma/boot/arc/include/arctypes.h#1 branch .. //depot/projects/busdma/boot/arc/include/libarc.h#1 branch .. //depot/projects/busdma/boot/arc/lib/Makefile#1 branch .. //depot/projects/busdma/boot/arc/lib/abort.c#1 branch .. //depot/projects/busdma/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/busdma/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/busdma/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/busdma/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/busdma/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/busdma/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/busdma/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/busdma/boot/arc/lib/delay.c#1 branch .. //depot/projects/busdma/boot/arc/lib/devicename.c#1 branch .. //depot/projects/busdma/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/busdma/boot/arc/lib/module.c#1 branch .. //depot/projects/busdma/boot/arc/lib/prom.c#1 branch .. //depot/projects/busdma/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/busdma/boot/arc/lib/time.c#1 branch .. //depot/projects/busdma/boot/arc/loader/Makefile#1 branch .. //depot/projects/busdma/boot/arc/loader/conf.c#1 branch .. //depot/projects/busdma/boot/arc/loader/help.alpha#1 branch .. //depot/projects/busdma/boot/arc/loader/main.c#1 branch .. //depot/projects/busdma/boot/arc/loader/version#1 branch .. //depot/projects/busdma/boot/arm/at91/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0/README#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/busdma/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/busdma/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/busdma/boot/common/Makefile.inc#1 branch .. //depot/projects/busdma/boot/common/bcache.c#1 branch .. //depot/projects/busdma/boot/common/boot.c#1 branch .. //depot/projects/busdma/boot/common/bootstrap.h#1 branch .. //depot/projects/busdma/boot/common/commands.c#1 branch .. //depot/projects/busdma/boot/common/console.c#1 branch .. //depot/projects/busdma/boot/common/dev_net.c#1 branch .. //depot/projects/busdma/boot/common/dev_net.h#1 branch .. //depot/projects/busdma/boot/common/devopen.c#1 branch .. //depot/projects/busdma/boot/common/help.common#1 branch .. //depot/projects/busdma/boot/common/interp.c#1 branch .. //depot/projects/busdma/boot/common/interp_backslash.c#1 branch .. //depot/projects/busdma/boot/common/interp_forth.c#1 branch .. //depot/projects/busdma/boot/common/interp_parse.c#1 branch .. //depot/projects/busdma/boot/common/isapnp.c#1 branch .. //depot/projects/busdma/boot/common/isapnp.h#1 branch .. //depot/projects/busdma/boot/common/load.c#1 branch .. //depot/projects/busdma/boot/common/load_elf.c#1 branch .. //depot/projects/busdma/boot/common/load_elf32.c#1 branch .. //depot/projects/busdma/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/busdma/boot/common/load_elf64.c#1 branch .. //depot/projects/busdma/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/busdma/boot/common/load_elf_obj.c#1 branch .. //depot/projects/busdma/boot/common/loader.8#1 branch .. //depot/projects/busdma/boot/common/ls.c#1 branch .. //depot/projects/busdma/boot/common/merge_help.awk#1 branch .. //depot/projects/busdma/boot/common/misc.c#1 branch .. //depot/projects/busdma/boot/common/module.c#1 branch .. //depot/projects/busdma/boot/common/newvers.sh#1 branch .. //depot/projects/busdma/boot/common/panic.c#1 branch .. //depot/projects/busdma/boot/common/pnp.c#1 branch .. //depot/projects/busdma/boot/common/pnpdata#1 branch .. //depot/projects/busdma/boot/common/reloc_elf.c#1 branch .. //depot/projects/busdma/boot/common/reloc_elf32.c#1 branch .. //depot/projects/busdma/boot/common/reloc_elf64.c#1 branch .. //depot/projects/busdma/boot/common/ufsread.c#1 branch .. //depot/projects/busdma/boot/efi/Makefile#1 branch .. //depot/projects/busdma/boot/efi/Makefile.inc#1 branch .. //depot/projects/busdma/boot/efi/include/README#1 branch .. //depot/projects/busdma/boot/efi/include/efi.h#1 branch .. //depot/projects/busdma/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/busdma/boot/efi/include/efiapi.h#1 branch .. //depot/projects/busdma/boot/efi/include/eficon.h#1 branch .. //depot/projects/busdma/boot/efi/include/efidebug.h#1 branch .. //depot/projects/busdma/boot/efi/include/efidef.h#1 branch .. //depot/projects/busdma/boot/efi/include/efidevp.h#1 branch .. //depot/projects/busdma/boot/efi/include/efierr.h#1 branch .. //depot/projects/busdma/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/busdma/boot/efi/include/efifs.h#1 branch .. //depot/projects/busdma/boot/efi/include/efilib.h#1 branch .. //depot/projects/busdma/boot/efi/include/efinet.h#1 branch .. //depot/projects/busdma/boot/efi/include/efipart.h#1 branch .. //depot/projects/busdma/boot/efi/include/efiprot.h#1 branch .. //depot/projects/busdma/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/busdma/boot/efi/include/efiser.h#1 branch .. //depot/projects/busdma/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/busdma/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/busdma/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/busdma/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/busdma/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/busdma/boot/efi/libefi/Makefile#1 branch .. //depot/projects/busdma/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/copy.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/delay.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/busdma/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/module.c#1 branch .. //depot/projects/busdma/boot/efi/libefi/time.c#1 branch .. //depot/projects/busdma/boot/ficl/Makefile#1 branch .. //depot/projects/busdma/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/busdma/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/busdma/boot/ficl/dict.c#1 branch .. //depot/projects/busdma/boot/ficl/ficl.c#1 branch .. //depot/projects/busdma/boot/ficl/ficl.h#1 branch .. //depot/projects/busdma/boot/ficl/fileaccess.c#1 branch .. //depot/projects/busdma/boot/ficl/float.c#1 branch .. //depot/projects/busdma/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/busdma/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/busdma/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/busdma/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/busdma/boot/ficl/loader.c#1 branch .. //depot/projects/busdma/boot/ficl/math64.c#1 branch .. //depot/projects/busdma/boot/ficl/math64.h#1 branch .. //depot/projects/busdma/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/busdma/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/busdma/boot/ficl/prefix.c#1 branch .. //depot/projects/busdma/boot/ficl/search.c#1 branch .. //depot/projects/busdma/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/busdma/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/busdma/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/busdma/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/busdma/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/busdma/boot/ficl/stack.c#1 branch .. //depot/projects/busdma/boot/ficl/testmain.c#1 branch .. //depot/projects/busdma/boot/ficl/tools.c#1 branch .. //depot/projects/busdma/boot/ficl/unix.c#1 branch .. //depot/projects/busdma/boot/ficl/vm.c#1 branch .. //depot/projects/busdma/boot/ficl/words.c#1 branch .. //depot/projects/busdma/boot/forth/beastie.4th#1 branch .. //depot/projects/busdma/boot/forth/frames.4th#1 branch .. //depot/projects/busdma/boot/forth/loader.4th#1 branch .. //depot/projects/busdma/boot/forth/loader.4th.8#1 branch .. //depot/projects/busdma/boot/forth/loader.conf#1 branch .. //depot/projects/busdma/boot/forth/loader.conf.5#1 branch .. //depot/projects/busdma/boot/forth/loader.rc#1 branch .. //depot/projects/busdma/boot/forth/pnp.4th#1 branch .. //depot/projects/busdma/boot/forth/screen.4th#1 branch .. //depot/projects/busdma/boot/forth/support.4th#1 branch .. //depot/projects/busdma/boot/i386/Makefile#1 branch .. //depot/projects/busdma/boot/i386/Makefile.inc#1 branch .. //depot/projects/busdma/boot/i386/boot0/Makefile#1 branch .. //depot/projects/busdma/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/busdma/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/busdma/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/busdma/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/busdma/boot/i386/boot2/Makefile#1 branch .. //depot/projects/busdma/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/busdma/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/busdma/boot/i386/boot2/lib.h#1 branch .. //depot/projects/busdma/boot/i386/boot2/sio.S#1 branch .. //depot/projects/busdma/boot/i386/btx/Makefile#1 branch .. //depot/projects/busdma/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/busdma/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/busdma/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/busdma/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/busdma/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/busdma/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/busdma/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/busdma/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/busdma/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/busdma/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/busdma/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/busdma/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/busdma/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/busdma/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/busdma/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/busdma/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/busdma/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/busdma/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/busdma/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/busdma/boot/i386/libi386/Makefile#1 branch .. //depot/projects/busdma/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/busdma/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/busdma/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/pread.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/busdma/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/busdma/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/time.c#1 branch .. //depot/projects/busdma/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/busdma/boot/i386/loader/Makefile#1 branch .. //depot/projects/busdma/boot/i386/loader/conf.c#1 branch .. //depot/projects/busdma/boot/i386/loader/help.i386#1 branch .. //depot/projects/busdma/boot/i386/loader/loader.rc#1 branch .. //depot/projects/busdma/boot/i386/loader/main.c#1 branch .. //depot/projects/busdma/boot/i386/loader/version#1 branch .. //depot/projects/busdma/boot/i386/mbr/Makefile#1 branch .. //depot/projects/busdma/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/busdma/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/busdma/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/busdma/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/busdma/boot/ia64/Makefile#1 branch .. //depot/projects/busdma/boot/ia64/Makefile.inc#1 branch .. //depot/projects/busdma/boot/ia64/efi/Makefile#1 branch .. //depot/projects/busdma/boot/ia64/efi/conf.c#1 branch .. //depot/projects/busdma/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/busdma/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/busdma/boot/ia64/efi/main.c#1 branch .. //depot/projects/busdma/boot/ia64/efi/start.S#1 branch .. //depot/projects/busdma/boot/ia64/efi/version#1 branch .. //depot/projects/busdma/boot/ia64/ski/Makefile#1 branch .. //depot/projects/busdma/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/conf.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/copy.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/delay.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/exit.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/busdma/boot/ia64/ski/libski.h#1 branch .. //depot/projects/busdma/boot/ia64/ski/main.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/busdma/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/busdma/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/start.S#1 branch .. //depot/projects/busdma/boot/ia64/ski/time.c#1 branch .. //depot/projects/busdma/boot/ia64/ski/version#1 branch .. //depot/projects/busdma/boot/ofw/Makefile#1 branch .. //depot/projects/busdma/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/busdma/boot/ofw/common/main.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/busdma/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/busdma/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/busdma/boot/pc98/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/Makefile.inc#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/busdma/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/busdma/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/busdma/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/busdma/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/busdma/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/busdma/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/busdma/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/busdma/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/busdma/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/busdma/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/busdma/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/busdma/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/busdma/boot/pc98/boot2/io.c#1 branch .. //depot/projects/busdma/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/busdma/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/busdma/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/busdma/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/busdma/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/busdma/boot/pc98/boot2/start.S#1 branch .. //depot/projects/busdma/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/busdma/boot/pc98/boot2/table.c#1 branch .. //depot/projects/busdma/boot/pc98/btx/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/busdma/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/busdma/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/busdma/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/busdma/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/busdma/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/busdma/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/busdma/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/busdma/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/busdma/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/busdma/boot/pc98/libpc98/biosmem.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 3 21:17:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BCA616A404; Wed, 3 May 2006 21:17:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D70A116A401 for ; Wed, 3 May 2006 21:17:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9099143D46 for ; Wed, 3 May 2006 21:17:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43LHZEE057674 for ; Wed, 3 May 2006 21:17:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43LHZPx057671 for perforce@freebsd.org; Wed, 3 May 2006 21:17:35 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 21:17:35 GMT Message-Id: <200605032117.k43LHZPx057671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 21:17:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=96616 Change 96616 by imp@imp_hammer on 2006/05/03 21:17:19 terminate Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#4 (text+ko) ==== @@ -115,4 +115,5 @@ .string "server_ip 206 168 13 207 " .string "tftp 0x20000000 kernel.bin " .string "e 0x20000000 " + .word 0 #endif From owner-p4-projects@FreeBSD.ORG Wed May 3 21:18:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3A0C16A403; Wed, 3 May 2006 21:18:37 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9836A16A400 for ; Wed, 3 May 2006 21:18:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5847E43D45 for ; Wed, 3 May 2006 21:18:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43LIbsb058384 for ; Wed, 3 May 2006 21:18:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43LIaTd058376 for perforce@freebsd.org; Wed, 3 May 2006 21:18:36 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 21:18:36 GMT Message-Id: <200605032118.k43LIaTd058376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 21:18:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=96617 Change 96617 by imp@imp_hammer on 2006/05/03 21:17:55 12k images, allow FPGA burning (note: we have to load the FPGA image from the SPI part). Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#14 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#14 (text+ko) ==== @@ -20,7 +20,7 @@ .if defined(P) ${P}: ${P}.out objcopy -S -O binary ${P}.out ${.TARGET} - @set -- `ls -l ${.TARGET}`; x=$$((8192-$$5)); \ + @set -- `ls -l ${.TARGET}`; x=$$((12288-$$5)); \ echo "$$x bytes available"; test $$x -ge 0 ${P}.out: ${OBJS} @@ -35,4 +35,10 @@ MK_TAG_LIST:=no .endif +.if defined(WITHOUT_FPGA) +MK_FPGA:=no +.else +MK_FPGA:=yes +.endif + .endif ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#8 (text+ko) ==== @@ -8,3 +8,12 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include + +.if ${MK_TAG_LIST} != "no" +CFLAGS += -I${.CURDIR}/.. -DSUPPORT_TAG_LIST +SRCS+=tag_list.c +.endif + +.if ${MK_FPGA} != "no" +CFLAGS += -DTSC_FPGA +.endif ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#5 (text+ko) ==== @@ -1,57 +1,85 @@ -/******************************************************************************* +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * - * Filename: main.c + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * Basic entry points for top-level functions + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * Revision information: + * This software is derived from software provided by kwikbyte without + * copyright as follows: * - * 20AUG2004 kb_admin initial creation - * 12JAN2005 kb_admin cosmetic changes - * 29APR2005 kb_admin modified boot delay - * - * BEGIN_KBDD_BLOCK * No warranty, expressed or implied, is included with this software. It is * provided "AS IS" and no warranty of any kind including statutory or aspects * relating to merchantability or fitness for any purpose is provided. All * intellectual property rights of others is maintained with the respective * owners. This software is not copyrighted and is intended for reference * only. - * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.1 2006/04/19 17:16:48 imp Exp $ - ******************************************************************************/ + * $FreeBSD$ + */ #include "env_vars.h" +#include "at91rm9200.h" #include "at91rm9200_lowlevel.h" #include "loader_prompt.h" #include "emac.h" #include "lib.h" +#ifdef TSC_FPGA +#include "spi_flash.h" +#include "fpga.h" + +struct fpga main_fpga = +{ + AT91C_BASE_PIOB, AT91C_PIO_PB0, + AT91C_BASE_PIOC, AT91C_PIO_PC11, + AT91C_BASE_PIOB, AT91C_PIO_PB2, + AT91C_BASE_PIOC, AT91C_PIO_PC12 +}; + +static void +fpga_load(void) +{ + int len; + char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + + SPI_InitFlash(); + len = 212482; + SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len); + printf("Loading %u bytes into the FPGA...\r\n", len); + fpga_init(&main_fpga); + fpga_clear(&main_fpga); + fpga_write_bytes(&main_fpga, addr, len); + fpga_done(&main_fpga); +} +#endif -/* - * .KB_C_FN_DEFINITION_START - * int main(void) - * This global function waits at least one second, but not more than two - * seconds, for input from the serial port. If no response is recognized, - * it acts according to the parameters specified by the environment. For - * example, the function might boot an operating system. Do not return - * from this function. - * .KB_C_FN_DEFINITION_END - */ int main(void) { - +#ifdef TSC_FPGA + fpga_load(); +#endif EMAC_Init(); - LoadBootCommands(); - printf("\r\nSPI Boot loader.\r\nAutoboot...\r\n"); - if (getc(1) == -1) ExecuteEnvironmentFunctions(); - Bootloader(0); - return (1); } From owner-p4-projects@FreeBSD.ORG Wed May 3 21:51:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29A6216A455; Wed, 3 May 2006 21:51:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DB34816A427 for ; Wed, 3 May 2006 21:51:55 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93B4243D62 for ; Wed, 3 May 2006 21:51:55 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43LptSr076084 for ; Wed, 3 May 2006 21:51:55 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Lptli076074 for perforce@freebsd.org; Wed, 3 May 2006 21:51:55 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 21:51:55 GMT Message-Id: <200605032151.k43Lptli076074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 21:51:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=96620 Change 96620 by imp@imp_hammer on 2006/05/03 21:51:23 Add support for updating the boot flash (I), the FPGA (F) and Reset (R) commands. This should remove the need for jumpers most of the time... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#2 (text+ko) ==== @@ -204,5 +204,6 @@ currentOffset = 0; DumpBootCommands(); + printf("Autoboot...\r\n"); Bootloader(ReadCharFromEnvironment); } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ #include "loader_prompt.h" #include "env_vars.h" #include "lib.h" - +#include "spi_flash.h" /******************************* GLOBALS *************************************/ @@ -62,6 +62,9 @@ {COMMAND_TFTP, "tftp"}, {COMMAND_WRITE, "w"}, {COMMAND_XMODEM, "x"}, + {COMMAND_RESET, "R"}, + {COMMAND_REPLACE_FLASH_VIA_XMODEM, "I"}, + {COMMAND_REPLACE_FPGA_VIA_XMODEM, "F"}, {COMMAND_FINAL_FLAG, 0} }; @@ -164,6 +167,34 @@ } +static void +UpdateFlash(int offset) +{ + char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */ + char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ + int len, i, j, off; + + while ((len = xmodem_rx(addr)) == -1) + continue; + printf("\r\nDownloaded %u bytes.\r\n", len); + p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / + FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); + printf("Writing %u bytes to flash at %u\r\n", len, offset); + for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { + for (j = 0; j < 10; j++) { + off = i + offset * FLASH_PAGE_SIZE; + printf("%u/%u\r", off, len + offset); + SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); + SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE); + if (p_memcmp(addr3 + i, addr2 + i, FLASH_PAGE_SIZE) == 0) + break; + } + if (j >= 10) + printf("Bad Readback at %u\r\n", i); + } +} + /* * .KB_C_FN_DEFINITION_START * void ParseCommand(char *) @@ -237,19 +268,22 @@ case COMMAND_HELP: // dump command info printf("Commands:\r\n" - "\tc\r\n" - "\td\r\n" - "\te\r\n" - "\tip\r\n" - "\tserver_ip\r\n" - "\tm\r\n" - "\ttftp\r\n" - "\ts\r\n" + "\tc\r\n" + "\td\r\n" + "\te\r\n" + "\tip\r\n" + "\tserver_ip\r\n" + "\tm\r\n" + "\ttftp\r\n" + "\ts\r\n" #ifdef SUPPORT_TAG_LIST - "\tt\r\n" + "\tt\r\n" #endif - "\tw\r\n" - "\tx\r\n"); + "\tw\r\n" + "\tx\r\n" + "\tI\r\n" + "\tR\r\n" + "\tF\r\n"); break; case COMMAND_LOCAL_IP: @@ -310,14 +344,26 @@ break; case COMMAND_XMODEM: - { // "x
" // download X-modem record at address if (argc > 1) xmodem_rx((char *)p_ASCIIToHex(argv[1])); break; - } + + case COMMAND_RESET: + printf("Reset\r\n"); + reset(); + while (1) continue; + break; + case COMMAND_REPLACE_FPGA_VIA_XMODEM: + printf("Updating FPGA image\r\n"); + UpdateFlash(15); + break; + case COMMAND_REPLACE_FLASH_VIA_XMODEM: + printf("Updating FLASH image\r\n"); + UpdateFlash(0); + break; default: break; } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#3 (text+ko) ==== @@ -40,6 +40,9 @@ COMMAND_TFTP, COMMAND_WRITE, COMMAND_XMODEM, + COMMAND_RESET, + COMMAND_REPLACE_FLASH_VIA_XMODEM, + COMMAND_REPLACE_FPGA_VIA_XMODEM, COMMAND_FINAL_FLAG } e_cmd_t; From owner-p4-projects@FreeBSD.ORG Wed May 3 22:15:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8AA16A403; Wed, 3 May 2006 22:15:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4359816A400 for ; Wed, 3 May 2006 22:15:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EC5C43D53 for ; Wed, 3 May 2006 22:15:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43MFOUe092412 for ; Wed, 3 May 2006 22:15:24 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43MFOSG092406 for perforce@freebsd.org; Wed, 3 May 2006 22:15:24 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 22:15:24 GMT Message-Id: <200605032215.k43MFOSG092406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:15:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=96622 Change 96622 by imp@imp_hammer on 2006/05/03 22:15:14 const poison... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include "lib.h" void -fpga_init(struct fpga *fpga) +fpga_init(const struct fpga *fpga) { fpga->fpga_prog_n_pio->PIO_PER = fpga->fpga_prog_n_mask; fpga->fpga_prog_n_pio->PIO_OER = fpga->fpga_prog_n_mask; @@ -45,18 +45,18 @@ } void -fpga_clear(struct fpga *fpga) +fpga_clear(const struct fpga *fpga) { fpga->fpga_prog_n_pio->PIO_SODR = fpga->fpga_prog_n_mask; Delay(1000); fpga->fpga_prog_n_pio->PIO_CODR = fpga->fpga_prog_n_mask; Delay(1); fpga->fpga_prog_n_pio->PIO_SODR = fpga->fpga_prog_n_mask; - Delay(3000); + Delay(2000); } void -fpga_write_bytes(struct fpga *fpga, const unsigned char *buf, int len) +fpga_write_bytes(const struct fpga *fpga, const unsigned char *buf, int len) { int i, j; unsigned byte; @@ -76,7 +76,7 @@ } void -fpga_done(struct fpga *fpga) +fpga_done(const struct fpga *fpga) { while (!(fpga->fpga_done_pio->PIO_PSR & fpga->fpga_done_mask)) continue; ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.h#2 (text+ko) ==== @@ -39,9 +39,9 @@ unsigned fpga_done_mask; }; -void fpga_init(struct fpga *); -void fpga_clear(struct fpga *); -void fpga_write_bytes(struct fpga *, const unsigned char *, int); -void fpga_done(struct fpga *); +void fpga_init(const struct fpga *); +void fpga_clear(const struct fpga *); +void fpga_write_bytes(const struct fpga *, const unsigned char *, int); +void fpga_done(const struct fpga *); #endif From owner-p4-projects@FreeBSD.ORG Wed May 3 22:17:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5831A16A422; Wed, 3 May 2006 22:17:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 36F1F16A420 for ; Wed, 3 May 2006 22:17:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03DA243D45 for ; Wed, 3 May 2006 22:17:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43MHRrS094019 for ; Wed, 3 May 2006 22:17:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43MHRTo094012 for perforce@freebsd.org; Wed, 3 May 2006 22:17:27 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 22:17:27 GMT Message-Id: <200605032217.k43MHRTo094012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:17:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=96623 Change 96623 by imp@imp_hammer on 2006/05/03 22:16:31 Always init spi flash move autoboot message to where we do the automatic boot... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#6 (text+ko) ==== @@ -40,11 +40,11 @@ #include "loader_prompt.h" #include "emac.h" #include "lib.h" +#include "spi_flash.h" #ifdef TSC_FPGA -#include "spi_flash.h" #include "fpga.h" -struct fpga main_fpga = +const struct fpga main_fpga = { AT91C_BASE_PIOB, AT91C_PIO_PB0, AT91C_BASE_PIOC, AT91C_PIO_PC11, @@ -58,7 +58,6 @@ int len; char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ - SPI_InitFlash(); len = 212482; SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len); printf("Loading %u bytes into the FPGA...\r\n", len); @@ -72,12 +71,13 @@ int main(void) { + SPI_InitFlash(); #ifdef TSC_FPGA fpga_load(); #endif EMAC_Init(); LoadBootCommands(); - printf("\r\nSPI Boot loader.\r\nAutoboot...\r\n"); + printf("\r\nSPI Boot loader.\r\n"); if (getc(1) == -1) ExecuteEnvironmentFunctions(); Bootloader(0); From owner-p4-projects@FreeBSD.ORG Wed May 3 22:33:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E89D16A405; Wed, 3 May 2006 22:33:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6941716A403 for ; Wed, 3 May 2006 22:33:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 342A143D46 for ; Wed, 3 May 2006 22:33:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43MXmwF003044 for ; Wed, 3 May 2006 22:33:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43MXlet003038 for perforce@freebsd.org; Wed, 3 May 2006 22:33:47 GMT (envelope-from jb@freebsd.org) Date: Wed, 3 May 2006 22:33:47 GMT Message-Id: <200605032233.k43MXlet003038@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:33:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=96624 Change 96624 by jb@jb_freebsd2 on 2006/05/03 22:33:42 Don't hard code paths to executables. Let the user's PATH determine which ones are executed. On FreeBSD cpp has definitions built into it. We don't need to add any more. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#10 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#10 (text) ==== @@ -611,11 +611,20 @@ { DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_COMMON }, }; +#if defined(sun) const char *_dtrace_defcpp = "/usr/ccs/lib/cpp"; /* default cpp(1) to invoke */ const char *_dtrace_defld = "/usr/ccs/bin/ld"; /* default ld(1) to invoke */ +#else +const char *_dtrace_defcpp = "cpp"; /* default cpp(1) to invoke */ +const char *_dtrace_defld = "ld"; /* default ld(1) to invoke */ +#endif const char *_dtrace_libdir = "/usr/lib/dtrace"; /* default library directory */ +#if defined(sun) const char *_dtrace_provdir = "/dev/dtrace/provider"; /* provider directory */ +#else +const char *_dtrace_provdir = "/dev/dtrace"; /* provider directory */ +#endif int _dtrace_strbuckets = 211; /* default number of hash buckets (prime) */ int _dtrace_intbuckets = 256; /* default number of integer buckets (Pof2) */ @@ -1003,10 +1012,10 @@ dtp->dt_cpp_argv[0] = (char *)strbasename(dtp->dt_cpp_path); +#if defined(sun) (void) snprintf(isadef, sizeof (isadef), "-D__SUNW_D_%u", (uint_t)(sizeof (void *) * NBBY)); -#if defined(sun) (void) snprintf(utsdef, sizeof (utsdef), "-D__%s_%s", dt_get_sysinfo(SI_SYSNAME, s1, sizeof (s1)), dt_get_sysinfo(SI_RELEASE, s2, sizeof (s2))); @@ -1018,8 +1027,6 @@ dt_cpp_add_arg(dtp, isadef) == NULL || dt_cpp_add_arg(dtp, utsdef) == NULL) return (set_open_errno(dtp, errp, EDT_NOMEM)); -#else -printf("%s:%s(%d): need to set FreeBSD specific CPP defines\n",__FUNCTION__,__FILE__,__LINE__); #endif if (flags & DTRACE_O_NODEV) From owner-p4-projects@FreeBSD.ORG Wed May 3 22:36:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D486816A405; Wed, 3 May 2006 22:36:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AC42B16A402 for ; Wed, 3 May 2006 22:36:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6235943D46 for ; Wed, 3 May 2006 22:36:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43Maq1m005596 for ; Wed, 3 May 2006 22:36:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Maq6p005589 for perforce@freebsd.org; Wed, 3 May 2006 22:36:52 GMT (envelope-from jb@freebsd.org) Date: Wed, 3 May 2006 22:36:52 GMT Message-Id: <200605032236.k43Maq6p005589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:36:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=96625 Change 96625 by jb@jb_freebsd2 on 2006/05/03 22:36:17 Don't use the Solaris file descriptor inheritance. That's not exactly portable Unix code. Do it in a POSIX compatible way instead. This lets us run the pre-processor which is needed to run Sun's DTrace test suite. We actually pass some of the tests! 8-) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#3 (text) ==== @@ -1579,7 +1579,9 @@ char **argv = malloc(sizeof (char *) * (argc + 5)); FILE *ofp = tmpfile(); +#if defined(sun) char ipath[20], opath[20]; /* big enough for /dev/fd/ + INT_MAX + \0 */ +#endif char verdef[32]; /* big enough for -D__SUNW_D_VERSION=0x%08x + \0 */ struct sigaction act, oact; @@ -1587,7 +1589,11 @@ int wstat, estat; pid_t pid; +#if defined(sun) off64_t off; +#else + off_t off = 0; +#endif int c; if (argv == NULL || ofp == NULL) { @@ -1614,8 +1620,10 @@ (void) fseeko64(ifp, off, SEEK_SET); } +#if defined(sun) (void) snprintf(ipath, sizeof (ipath), "/dev/fd/%d", fileno(ifp)); (void) snprintf(opath, sizeof (opath), "/dev/fd/%d", fileno(ofp)); +#endif bcopy(dtp->dt_cpp_argv, argv, sizeof (char *) * argc); @@ -1623,6 +1631,7 @@ "-D__SUNW_D_VERSION=0x%08x", dtp->dt_vmax); argv[argc++] = verdef; +#if defined(sun) switch (dtp->dt_stdcmode) { case DT_STDC_XA: case DT_STDC_XT: @@ -1635,6 +1644,9 @@ argv[argc++] = ipath; argv[argc++] = opath; +#else + argv[argc++] = "-P"; +#endif argv[argc] = NULL; /* @@ -1661,6 +1673,12 @@ } if (pid == 0) { +#if !defined(sun) + if (isatty(fileno(ifp)) == 0) + lseek(fileno(ifp), off, SEEK_SET); + dup2(fileno(ifp), 0); + dup2(fileno(ofp), 1); +#endif (void) execvp(dtp->dt_cpp_path, argv); _exit(errno == ENOENT ? 127 : 126); } From owner-p4-projects@FreeBSD.ORG Wed May 3 22:38:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB92816A405; Wed, 3 May 2006 22:38:55 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A333116A400 for ; Wed, 3 May 2006 22:38:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B13743D4C for ; Wed, 3 May 2006 22:38:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43MctPb007089 for ; Wed, 3 May 2006 22:38:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Mctfa007086 for perforce@freebsd.org; Wed, 3 May 2006 22:38:55 GMT (envelope-from jb@freebsd.org) Date: Wed, 3 May 2006 22:38:55 GMT Message-Id: <200605032238.k43Mctfa007086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=96626 Change 96626 by jb@jb_freebsd2 on 2006/05/03 22:38:24 Add the 'profile' provider module to the load/unload developer convenience targets. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#12 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#12 (text+ko) ==== @@ -8,11 +8,13 @@ load : -kldload dtrace + -kldload profile -kldload systrace kldstat unload : -kldunload systrace + -kldunload profile -kldunload dtrace kldstat From owner-p4-projects@FreeBSD.ORG Wed May 3 22:42:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 169B416A41A; Wed, 3 May 2006 22:42:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9338C16A407 for ; Wed, 3 May 2006 22:42:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1612C43D46 for ; Wed, 3 May 2006 22:42:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43Mfx9a009474 for ; Wed, 3 May 2006 22:41:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Mfxdj009466 for perforce@freebsd.org; Wed, 3 May 2006 22:41:59 GMT (envelope-from jb@freebsd.org) Date: Wed, 3 May 2006 22:41:59 GMT Message-Id: <200605032241.k43Mfxdj009466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:42:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=96628 Change 96628 by jb@jb_freebsd2 on 2006/05/03 22:41:39 More 'const' grief. It only takes one attempt to cast a char pointer to drop the 'const' to ruin an entire 'const' day. Declaring things 'const' is only worthwhile if you're going to obey them. In FreeBSD, the default kernel module compiler options detect the inconsistency in Sun's code. Sigh. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#19 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#5 edit .. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#4 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#14 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#19 (text+ko) ==== @@ -246,7 +246,7 @@ static dtrace_pops_t dtrace_provider_ops = { /* dtps_provide */ - (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop, + (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop, /* dtps_provide_module */ (void (*)(void *, modctl_t *))dtrace_nullop, /* dtps_enable */ ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#5 (text+ko) ==== @@ -78,7 +78,7 @@ if (pops->dtps_provide == NULL) { ASSERT(pops->dtps_provide_module != NULL); provider->dtpv_pops.dtps_provide = - (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop; + (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop; } if (pops->dtps_provide_module == NULL) { ==== //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#4 (text+ko) ==== @@ -78,7 +78,7 @@ static int systrace_unload(void); static void systrace_args(int, void *, u_int64_t *, int *); static void systrace_probe(u_int32_t, int, struct sysent *, void *); -static void systrace_provide(void *, const dtrace_probedesc_t *); +static void systrace_provide(void *, dtrace_probedesc_t *); static void systrace_destroy(void *, dtrace_id_t, void *); static void systrace_enable(void *, dtrace_id_t, void *); static void systrace_disable(void *, dtrace_id_t, void *); @@ -166,7 +166,7 @@ /*ARGSUSED*/ static void -systrace_provide(void *arg, const dtrace_probedesc_t *desc) +systrace_provide(void *arg, dtrace_probedesc_t *desc) { int i; ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#14 (text) ==== @@ -1995,7 +1995,7 @@ * routines. */ typedef struct dtrace_pops { - void (*dtps_provide)(void *arg, const dtrace_probedesc_t *spec); + void (*dtps_provide)(void *arg, dtrace_probedesc_t *spec); void (*dtps_provide_module)(void *arg, modctl_t *mp); void (*dtps_enable)(void *arg, dtrace_id_t id, void *parg); void (*dtps_disable)(void *arg, dtrace_id_t id, void *parg); From owner-p4-projects@FreeBSD.ORG Wed May 3 22:44:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B8FF16A40B; Wed, 3 May 2006 22:44:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 60D5716A405 for ; Wed, 3 May 2006 22:44:03 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2500043D45 for ; Wed, 3 May 2006 22:44:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43Mi3CS010414 for ; Wed, 3 May 2006 22:44:03 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Mi2Js010411 for perforce@freebsd.org; Wed, 3 May 2006 22:44:02 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 22:44:02 GMT Message-Id: <200605032244.k43Mi2Js010411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:44:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=96629 Change 96629 by imp@imp_hammer on 2006/05/03 22:43:41 Load a few more bytes into the FPGA... They seem to be needed, even though they are effectively random... Allow loading fpga via Xmodem for testing. # We still have 1.7k left, but I suspect that will fill soon... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#4 (text+ko) ==== @@ -23,6 +23,7 @@ *****************************************************************************/ #include "at91rm9200_lowlevel.h" +#include "at91rm9200.h" #include "p_string.h" #include "eeprom.h" #ifdef SUPPORT_TAG_LIST @@ -33,6 +34,7 @@ #include "env_vars.h" #include "lib.h" #include "spi_flash.h" +#include "fpga.h" /******************************* GLOBALS *************************************/ @@ -65,11 +67,39 @@ {COMMAND_RESET, "R"}, {COMMAND_REPLACE_FLASH_VIA_XMODEM, "I"}, {COMMAND_REPLACE_FPGA_VIA_XMODEM, "F"}, + {COMMAND_PROGRAM_FPGA_VIA_XMODEM, "f"}, {COMMAND_FINAL_FLAG, 0} }; static unsigned tagAddress; +#ifdef TSC_FPGA +#include "fpga.h" + +const struct fpga main_fpga = +{ + AT91C_BASE_PIOB, AT91C_PIO_PB0, + AT91C_BASE_PIOC, AT91C_PIO_PC11, + AT91C_BASE_PIOB, AT91C_PIO_PB2, + AT91C_BASE_PIOC, AT91C_PIO_PC12 +}; + +void +fpga_load(void) +{ + int len; + char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + + len = 212608; + SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len); + printf("Loading %u bytes into the FPGA...\r\n", len); + fpga_init(&main_fpga); + fpga_clear(&main_fpga); + fpga_write_bytes(&main_fpga, addr, len); + fpga_done(&main_fpga); +} +#endif + /* * .KB_C_FN_DEFINITION_START * unsigned BuildIP(void) @@ -195,6 +225,21 @@ } } +static void +ProgramFpga(void) +{ + char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + int len; + + while ((len = xmodem_rx(addr)) == -1) + continue; + printf("Loading %u bytes into the FPGA...\r\n", len); + fpga_init(&main_fpga); + fpga_clear(&main_fpga); + fpga_write_bytes(&main_fpga, addr, len); + fpga_done(&main_fpga); +} + /* * .KB_C_FN_DEFINITION_START * void ParseCommand(char *) @@ -364,6 +409,8 @@ printf("Updating FLASH image\r\n"); UpdateFlash(0); break; + case COMMAND_PROGRAM_FPGA_VIA_XMODEM: + ProgramFpga(); default: break; } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#4 (text+ko) ==== @@ -43,6 +43,7 @@ COMMAND_RESET, COMMAND_REPLACE_FLASH_VIA_XMODEM, COMMAND_REPLACE_FPGA_VIA_XMODEM, + COMMAND_PROGRAM_FPGA_VIA_XMODEM, COMMAND_FINAL_FLAG } e_cmd_t; @@ -54,5 +55,6 @@ void EnterInteractiveBootloader(int(*inputFunction)(int)); void Bootloader(int(*inputFunction)(int)); +void fpga_load(void); #endif /* _LOADER_PROMPT_H_ */ ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#7 (text+ko) ==== @@ -41,32 +41,6 @@ #include "emac.h" #include "lib.h" #include "spi_flash.h" -#ifdef TSC_FPGA -#include "fpga.h" - -const struct fpga main_fpga = -{ - AT91C_BASE_PIOB, AT91C_PIO_PB0, - AT91C_BASE_PIOC, AT91C_PIO_PC11, - AT91C_BASE_PIOB, AT91C_PIO_PB2, - AT91C_BASE_PIOC, AT91C_PIO_PC12 -}; - -static void -fpga_load(void) -{ - int len; - char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ - - len = 212482; - SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len); - printf("Loading %u bytes into the FPGA...\r\n", len); - fpga_init(&main_fpga); - fpga_clear(&main_fpga); - fpga_write_bytes(&main_fpga, addr, len); - fpga_done(&main_fpga); -} -#endif int main(void) From owner-p4-projects@FreeBSD.ORG Wed May 3 22:56:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C47A716A44F; Wed, 3 May 2006 22:56:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7FE7716A446 for ; Wed, 3 May 2006 22:56:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B76143D68 for ; Wed, 3 May 2006 22:56:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43MuKNI015612 for ; Wed, 3 May 2006 22:56:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43MuKWR015600 for perforce@freebsd.org; Wed, 3 May 2006 22:56:20 GMT (envelope-from jb@freebsd.org) Date: Wed, 3 May 2006 22:56:20 GMT Message-Id: <200605032256.k43MuKWR015600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 22:56:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=96631 Change 96631 by jb@jb_freebsd2 on 2006/05/03 22:55:19 Merge from current. Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/lbr.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#3 integrate .. //depot/projects/dtrace/src/etc/Makefile#3 integrate .. //depot/projects/dtrace/src/etc/nsswitch.conf#1 branch .. //depot/projects/dtrace/src/etc/rc.d/nsswitch#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/i386/sys/i386_set_watch.3#2 integrate .. //depot/projects/dtrace/src/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/net/nsparser.y#2 integrate .. //depot/projects/dtrace/src/lib/libcam/camlib.c#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/dtrace/src/share/man/man4/acpi.4#2 integrate .. //depot/projects/dtrace/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x14.fnt#3 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x16.fnt#3 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x8.fnt#3 integrate .. //depot/projects/dtrace/src/share/syscons/fonts/iso15-thin-8x16.fnt#3 integrate .. //depot/projects/dtrace/src/share/termcap/termcap.src#3 integrate .. //depot/projects/dtrace/src/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/dtrace/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/dtrace/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/rr232x/os_bsd.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/dtrace/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/dtrace/src/tools/regression/geom_eli/nokey.t#2 integrate .. //depot/projects/dtrace/src/tools/tools/ministat/ministat.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/cmdtab.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/icmp.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/icmp6.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/ip.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/ip6.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/main.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/netstat.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/swap.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/systat.1#3 integrate .. //depot/projects/dtrace/src/usr.bin/systat/systat.h#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/tcp.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/dtrace/src/usr.sbin/cached/cached.8#2 integrate .. //depot/projects/dtrace/src/usr.sbin/cached/cached.conf.5#2 integrate .. //depot/projects/dtrace/src/usr.sbin/cached/query.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/dtrace/src/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/dtrace/src/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/dtrace/www/de/includes.sgml#3 integrate .. //depot/projects/dtrace/www/de/includes.xsl#3 integrate .. //depot/projects/dtrace/www/de/index.xsl#2 integrate .. //depot/projects/dtrace/www/de/news/news.xml#4 integrate .. //depot/projects/dtrace/www/de/where.sgml#2 integrate .. //depot/projects/dtrace/www/en/developers.sgml#4 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#4 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/Makefile#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/Makefile#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/example-Makefile.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#3 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq214.sgml#1 branch .. //depot/projects/dtrace/www/en/gnome/docs/gnome2_porting.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome_porting.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/volunteer.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/gnome_upgrade.sh#2 delete .. //depot/projects/dtrace/www/en/gnome/images/Makefile#2 integrate .. //depot/projects/dtrace/www/en/gnome/images/ss211-1-tn.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss211-1.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss211-2-tn.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss211-2.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss211-3-tn.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss211-3.png#2 delete .. //depot/projects/dtrace/www/en/gnome/includes.navgnome.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/includes.navgnome.xsl#2 integrate .. //depot/projects/dtrace/www/en/gnome/includes.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/includes.xsl#2 integrate .. //depot/projects/dtrace/www/en/gnome/index.xsl#2 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#3 integrate .. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#2 integrate .. //depot/projects/dtrace/www/en/news/news.xml#5 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#6 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/todo.sgml#4 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#2 integrate .. //depot/projects/dtrace/www/fr/gnome/docs/gnome2_porting.sgml#2 integrate .. //depot/projects/dtrace/www/fr/gnome/docs/volunteer.sgml#2 integrate .. //depot/projects/dtrace/www/fr/gnome/includes.navgnome.xsl#2 integrate .. //depot/projects/dtrace/www/fr/gnome/includes.sgml#2 integrate .. //depot/projects/dtrace/www/fr/gnome/includes.xsl#2 integrate .. //depot/projects/dtrace/www/fr/gnome/index.xsl#2 integrate .. //depot/projects/dtrace/www/fr/gnome/screenshots.sgml#2 integrate .. //depot/projects/dtrace/www/fr/index.xsl#2 integrate .. //depot/projects/dtrace/www/fr/internal/homepage.sgml#2 integrate .. //depot/projects/dtrace/www/fr/projects/busdma/index.sgml#2 integrate .. //depot/projects/dtrace/www/fr/projects/cvsweb.sgml#2 integrate .. //depot/projects/dtrace/www/share/sgml/includes.release.sgml#3 integrate .. //depot/projects/dtrace/www/share/sgml/includes.release.xsl#3 integrate Differences ... ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.64 2006/04/10 18:42:41 jkois Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.579 2006/04/09 13:01:44 jkois Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.65 2006/05/02 19:30:08 jkois Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.580 2006/05/02 17:46:48 jkois Exp $ - basiert auf: 1.779 + basiert auf: 1.780 --> @@ -33,7 +33,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.579 2006/04/09 13:01:44 jkois Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.580 2006/05/02 17:46:48 jkois Exp $ 1995 ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 (text+ko) ==== @@ -27,10 +27,10 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.6 2005/09/16 19:53:11 jkois Exp $ - $FreeBSDde: de-docproj/books/fdp-primer/sgml-markup/chapter.sgml,v 1.19 2005/09/12 18:43:12 jkois Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.7 2006/05/02 19:30:09 jkois Exp $ + $FreeBSDde: de-docproj/books/fdp-primer/sgml-markup/chapter.sgml,v 1.20 2006/04/28 18:39:16 jkois Exp $ - basiert auf: 1.73 + basiert auf: 1.74 --> @@ -2009,13 +2009,16 @@ Das Element <sgmltag>filename</sgmltag> - Die SGML-Quellen des englischen Handbuches befinden - sich im Verzeichnis /usr/doc/en/handbook/. In - diesem Verzeichnis befindet sich eine Datei - handbook.sgml. Desweiteren sollte sich eine - Datei mit dem Namen Makefile zusammen mit - mehreren Dateien mit der Endung .ent - in diesem Verzeichnis befinden.]]> + Die SGML-Quellen des + englischen Handbuches befinden sich im Verzeichnis + /usr/doc/en/handbook/. In + diesem Verzeichnis befindet sich eine Datei + handbook.sgml. Desweiteren sollte + sich eine Datei mit dem Namen + Makefile zusammen mit mehreren + Dateien mit der Endung .ent in diesem + Verzeichnis befinden.]]> Darstellung: ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.34 2006/04/17 17:49:22 hrs Exp $ -# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.48 2006/03/13 20:57:05 jkois Exp $ -# basiert auf: 1.97 +# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.35 2006/05/02 19:30:09 jkois Exp $ +# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.49 2006/04/22 13:23:23 jkois Exp $ +# basiert auf: 1.98 # # Build the FreeBSD Handbook in its German translation. # @@ -15,7 +15,7 @@ FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes +USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.47 2006/04/06 16:44:07 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.138 2006/04/05 17:48:32 jkois Exp $ - basiert auf: 1.256 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.48 2006/05/02 19:30:09 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.140 2006/04/22 13:00:27 jkois Exp $ + basiert auf: 1.257 --> @@ -1066,33 +1066,17 @@ Mit ATAPI-CD-Brennern wird burncd benutzt, das Teil des Basissystems ist. SCSI- und USB-CD-Brenner werden mit - cdrecord aus - sysutils/cdrtools - benutzt. + cdrecord aus sysutils/cdrtools benutzt. + Zusätzlich ist es möglich, über das Modul + ATAPI/CAM SCSI-Werkzeuge wie + cdrecord + auch für ATAPI-Geräte einzusetzen. - Von burncd wird nur eine beschränkte - Anzahl von Laufwerken unterstützt. Um herauszufinden, ob - ein Laufwerk unterstützt wird, sehen Sie bitte unter - CD-R/RW supported drives - nach. - - - - CD-Brenner - ATAPI/CAM-Treiber - - Wenn Sie &os; 5.X oder &os; 4.8-RELEASE - und spätere Versionen benutzen, können Sie - mithilfe des ATAPI/CAM Treibers - die Werkzeuge für SCSI-Laufwerke, wie - cdrecord, - benutzen. - - - Wenn Sie eine Brennsoftware mit graphischer - Benutzeroberfläche benötigen, sehen - Sie sich die Werkzeuge X-CD-Roast - oder K3b an. Die + Wenn Sie eine Brennsoftware mit grafischer + Benutzeroberfläche benötigen, sollten Sie sich + X-CD-Roast oder + K3b näher ansehen. Diese Werkzeuge können als Paket oder aus den Ports (sysutils/xcdroast und sysutils/k3b) @@ -1685,7 +1669,7 @@ hardware compatibility notes. - Wenn Sie eine graphische Oberfläche bevorzugen, + Wenn Sie eine grafische Oberfläche bevorzugen, schauen Sie sich bitte den Port sysutils/k3b an. Der Port bietet eine leicht zu bedienende @@ -4349,7 +4333,7 @@ - Kryptographische Methoden von gbde + Kryptografische Methoden von gbde &man.gbde.8; benutzt den 128-Bit AES im CBC-Modus, um die Daten eines Sektors zu verschlüsseln. Jeder ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#3 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.19 2006/04/10 18:42:42 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.45 2006/04/10 18:27:16 jkois Exp $ - basiert auf: 1.113 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.20 2006/05/02 19:30:09 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.46 2006/04/22 12:01:56 jkois Exp $ + basiert auf: 1.114 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.28 2006/03/13 21:13:26 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/linuxemu/chapter.sgml,v 1.79 2006/02/21 17:21:50 jkois Exp $ - basiert auf: 1.129 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.29 2006/05/02 19:30:09 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/linuxemu/chapter.sgml,v 1.80 2006/04/22 12:07:07 jkois Exp $ + basiert auf: 1.130 --> @@ -154,7 +154,7 @@ 7 1 0xc24db000 d000 linux.ko Kerneloptionen - LINUX + COMPAT_LINUX Wenn Sie das KLD nicht laden können oder wollen, besteht ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.43 2006/04/10 18:42:42 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.112 2006/04/09 13:14:30 jkois Exp $ - basiert auf: 1.412 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.44 2006/05/02 19:30:09 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.113 2006/04/22 12:31:26 jkois Exp $ + basiert auf: 1.416 --> @@ -2481,8 +2481,13 @@ Bei einer &os;-Standardinstallation wird das Verzeichnis /usr/ports nicht - angelegt. Dies sollten Sie vor der ersten Ausführung - von portsnap nachholen. + angelegt. Verwenden Sie &os; 6.0-RELEASE, sollten Sie + dies vor der ersten Ausführung von + portsnap nachholen. Verwenden Sie hingegen + eine aktuellere &os;-Version oder eine aktuellere Version + von Portsnap, wird dies + beim ersten Aufruf von portsnap automatisch + erledigt. @@ -2528,10 +2533,10 @@ nicht als cron-Job ausgeführt werden, da es zu massiven Problemen kann, wenn parallel zur Aktualisierung ein Port gebaut oder installiert wird. Die - Aktualisierung des Ports-INDEX stellt hingegen kein Problem - dar. Um die INDEX-Datei zu aktualisieren, übergeben - Sie zusätzlich die Option an - portsnap. (Wenn Sie + Aktualisierung des Portsindex stellt hingegen kein Problem + dar. Um die INDEX-Datei zu aktualisieren, + übergeben Sie zusätzlich die Option + an portsnap. (Wenn Sie portsnap -I update als cron-Job definiert haben, müssen Sie portsnap update ohne die Option @@ -2541,7 +2546,7 @@ Wenn Sie die folgende Zeile in /etc/crontab aufnehmen, aktualisiert portsnap den komprimierten - Snapshot sowie die INDEX-Dateien unter + Snapshot sowie die INDEX-Dateien unter /usr/ports/ und verschickt eine E-Mail, wenn Ihre installierten Ports veraltet sind: ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.35 2006/03/13 21:13:27 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/ports/chapter.sgml,v 1.83 2006/03/03 21:00:02 jkois Exp $ - basiert auf: 1.253 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.36 2006/05/02 19:30:10 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/ports/chapter.sgml,v 1.84 2006/04/22 13:17:34 jkois Exp $ + basiert auf: 1.256 --> @@ -689,12 +689,12 @@ Installieren mit Portsnap - Bei &man.portsnap.8; handelt es sich um alternatives System - zur Distribution der Ports-Sammlung, die seit &os; 6.0 im - Basissystem enthalten ist. Verwenden Sie eine ältere - &os;-Version, können Sie zur Installation den Port - sysutils/portsnap - verwenden: + Bei Portsnap handelt es sich + um ein alternatives System zur Distribution der Ports-Sammlung, + das seit &os; 6.0 im Basissystem enthalten ist. Verwenden + Sie eine ältere &os;-Version, können Sie zur + Installation das Paket sysutils/portsnap verwenden: &prompt.root; pkg_add -r portsnap @@ -704,9 +704,16 @@ Handbuchs. - Legen Sie das Verzeichnis /usr/ports an, falls dieses auf - Ihrem System noch nicht existiert. + Ab &os; 6.1-RELEASE oder bei einem aktuellen + Portsnap-Paket oder -Port ist + dieser Schritt nicht nötig, da in diesen Fällen + das Verzeichnis /usr/ports automatisch beim + ersten Aufruf von &man.portsnap.8; angelegt wird. Verwenden + Sie hingegen eine ältere Version von + Portsnap, müssen Sie dieses + Verzeichnis manuell anlegen, falls dieses auf Ihrem System + noch nicht existiert: &prompt.root; mkdir /usr/ports @@ -980,7 +987,7 @@ &prompt.root; - Sie können einen Schritt sparen, wenn Sie gleich + Sie können zwei Schritte sparen, wenn Sie gleich make install clean anstelle von make, make install, und make clean eingeben. ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.44 2006/03/13 21:13:28 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.140 2006/03/10 14:55:05 jkois Exp $ - basiert auf: 1.292 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.45 2006/05/02 19:30:10 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.142 2006/04/28 18:25:52 jkois Exp $ + basiert auf: 1.293 --> @@ -5178,7 +5178,7 @@ You are advised to update or deinstall the affected package(s) immediately. Wenn Sie die angegebene URL über einen - Internetbroswer aufrufen, erhalten Sie weitere Informationen + Internetbrowser aufrufen, erhalten Sie weitere Informationen über die bestehende Sicherheitslücke, wie die betroffenen Versionen, die Version des &os;-Ports sowie Hinweise auf weitere Seiten, die ebenfalls Sicherheitshinweise zu diesem Problem @@ -5239,7 +5239,7 @@ 2003-09-23 16:51:24 UTC (RELENG_4_5, 4.5-RELEASE-p33) 2003-09-23 16:52:45 UTC (RELENG_4_4, 4.4-RELEASE-p43) 2003-09-23 16:54:39 UTC (RELENG_4_3, 4.3-RELEASE-p39) -&os; only: NO +CVE Name: CVE-XXXX-XXXX For general information regarding FreeBSD Security Advisories, including descriptions of the fields above, security branches, and the @@ -5327,10 +5327,10 @@ steht im Feld Corrected. - - Im Feld &os; only wird angegeben, - ob das Sicherheitsproblem nur &os; oder auch andere - Betriebssysteme betrifft. + + Reserviert für Informationen, über die + in der Common Vulnerabilities Database + nach Sicherheitslücken gesucht werden kann. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#5 (text+ko) ==== @@ -1,4 +1,4 @@ - + + aaron@FreeBSD.org"> @@ -524,6 +524,8 @@ lawrance@FreeBSD.org"> +lbr@FreeBSD.org"> + le@FreeBSD.org"> leeym@FreeBSD.org"> ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -724,6 +724,11 @@ &pgpkey.dfr; + + &a.lbr; + &pgpkey.lbr; + + &a.rees; &pgpkey.rees; ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#3 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -115,6 +115,7 @@ + ==== //depot/projects/dtrace/src/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.355 2006/04/28 12:03:33 ume Exp $ +# $FreeBSD: src/etc/Makefile,v 1.356 2006/05/03 15:14:46 ume Exp $ .include @@ -11,8 +11,8 @@ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ - inetd.conf login.access login.conf \ - mac.conf motd netconfig network.subr networks newsyslog.conf \ + inetd.conf login.access login.conf mac.conf motd \ + netconfig network.subr networks newsyslog.conf nsswitch.conf \ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ ==== //depot/projects/dtrace/src/etc/rc.d/nsswitch#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/nsswitch,v 1.9 2006/04/29 06:39:07 ume Exp $ +# $FreeBSD: src/etc/rc.d/nsswitch,v 1.11 2006/05/03 15:14:47 ume Exp $ # # PROVIDE: nsswitch @@ -36,54 +36,6 @@ start_cmd="nsswitch_start" stop_cmd=":" -convert_host_conf() -{ - host_conf=$1; shift; - nsswitch_conf=$1; shift; - - while read line; do - line=${line##[ ]} - case $line in - hosts|local|file) - _nsswitch="${_nsswitch}${_nsswitch+ }files" - ;; - dns|bind) - _nsswitch="${_nsswitch}${_nsswitch+ }dns" - ;; - nis) - _nsswitch="${_nsswitch}${_nsswitch+ }nis" - ;; - '#'*) - ;; - *) - printf "Warning: unrecognized line [%s]", $line > "/dev/stderr" - ;; - - esac - done < $host_conf - - echo "hosts: $_nsswitch" > $nsswitch_conf -} - -generate_nsswitch_conf() -{ - nsswitch_conf=$1; shift; - - cat >$nsswitch_conf < #include @@ -1431,8 +1431,8 @@ const char **name, const void **value, size_t *size) { if (entry->xattr_p) { - *name = entry->xattr_p->name; - *value = entry->xattr_p->value; + *name = entry->xattr_p->name; + *value = entry->xattr_p->value; *size = entry->xattr_p->size; entry->xattr_p = entry->xattr_p->next; ==== //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.45 2006/03/22 02:42:17 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.46 2006/05/01 01:02:19 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -1453,16 +1453,16 @@ name, value, size, 0); } if (e == -1) { - if (err == ENOTSUP) { + if (errno == ENOTSUP) { if (!warning_done) { warning_done = 1; - archive_set_error(a, err, + archive_set_error(a, errno, "Cannot restore extended " "attributes on this file " "system"); } } else - archive_set_error(a, err, + archive_set_error(a, errno, "Failed to set extended attribute"); ret = ARCHIVE_WARN; } ==== //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.40 2006/03/21 16:55:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.41 2006/05/01 01:02:19 kientzle Exp $"); #include #ifdef MAJOR_IN_MKDEV @@ -46,6 +46,7 @@ #ifdef HAVE_WCHAR_H #include #else +/* Good enough for equality testing, which is all we need. */ static int wcscmp(const wchar_t *s1, const wchar_t *s2) { int diff = *s1 - *s2; @@ -53,6 +54,14 @@ diff = (int)*++s1 - (int)*++s2; return diff; } +/* Good enough for equality testing, which is all we need. */ +static int wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n) +{ + int diff = *s1 - *s2; + while (*s1 && diff == 0 && n-- > 0) + diff = (int)*++s1 - (int)*++s2; + return diff; +} static size_t wcslen(const wchar_t *s) { const wchar_t *p = s; @@ -1644,12 +1653,6 @@ n = UTF8_mbrtowc(dest, src, length); if (n == 0) break; - if (n > 8) { - /* Invalid byte encountered; try to keep going. */ - *dest = L'?'; - n = 1; - err = 1; - } dest++; src += n; length -= n; @@ -1659,68 +1662,52 @@ } /* - * Copied from FreeBSD libc/locale. + * Copied and simplified from FreeBSD libc/locale. */ static size_t UTF8_mbrtowc(wchar_t *pwc, const char *s, size_t n) { int ch, i, len, mask; - unsigned long lbound, wch; + unsigned long wch; - if (s == NULL) - /* Reset to initial shift state (no-op) */ + if (s == NULL || n == 0 || pwc == NULL) return (0); - if (n == 0) - /* Incomplete multibyte sequence */ - return ((size_t)-2); /* * Determine the number of octets that make up this character from * the first octet, and a mask that extracts the interesting bits of * the first octet. - * - * We also specify a lower bound for the character code to detect - * redundant, non-"shortest form" encodings. For example, the - * sequence C0 80 is _not_ a legal representation of the null - * character. This enforces a 1-to-1 mapping between character - * codes and their multibyte representations. */ ch = (unsigned char)*s; if ((ch & 0x80) == 0) { mask = 0x7f; len = 1; - lbound = 0; } else if ((ch & 0xe0) == 0xc0) { mask = 0x1f; len = 2; - lbound = 0x80; } else if ((ch & 0xf0) == 0xe0) { mask = 0x0f; len = 3; - lbound = 0x800; } else if ((ch & 0xf8) == 0xf0) { mask = 0x07; len = 4; - lbound = 0x10000; } else if ((ch & 0xfc) == 0xf8) { mask = 0x03; len = 5; - lbound = 0x200000; - } else if ((ch & 0xfc) == 0xfc) { + } else if ((ch & 0xfe) == 0xfc) { mask = 0x01; len = 6; - lbound = 0x4000000; } else { - /* - * Malformed input; input is not UTF-8. - */ - errno = EILSEQ; - return ((size_t)-1); + /* Invalid first byte; convert to '?' */ + *pwc = '?'; + return (1); } - if (n < (size_t)len) - /* Incomplete multibyte sequence */ - return ((size_t)-2); + if (n < (size_t)len) { + /* Invalid first byte; convert to '?' */ + *pwc = '?'; + return (1); + } /* * Decode the octet sequence representing the character in chunks @@ -1730,36 +1717,27 @@ i = len; while (--i != 0) { if ((*s & 0xc0) != 0x80) { - /* - * Malformed input; bad characters in the middle - * of a character. - */ - errno = EILSEQ; - return ((size_t)-1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 3 23:16:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4C0516A405; Wed, 3 May 2006 23:16:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7EDCE16A401 for ; Wed, 3 May 2006 23:16:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31AF143D45 for ; Wed, 3 May 2006 23:16:46 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43NGkUW027643 for ; Wed, 3 May 2006 23:16:46 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43NGjNK027637 for perforce@freebsd.org; Wed, 3 May 2006 23:16:45 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 23:16:45 GMT Message-Id: <200605032316.k43NGjNK027637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 23:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=96632 Change 96632 by imp@imp_hammer on 2006/05/03 23:16:16 We need to read the pages from the flash one page at a time. Now FPGA loads on reset *AND* power cycles Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.c#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#5 (text+ko) ==== @@ -87,11 +87,15 @@ void fpga_load(void) { - int len; + int len, off, i, offset; char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ len = 212608; - SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len); + offset = 15 * FLASH_PAGE_SIZE; + for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { + off = i + offset; + SPI_ReadFlash(off, addr + i, FLASH_PAGE_SIZE); + } printf("Loading %u bytes into the FPGA...\r\n", len); fpga_init(&main_fpga); fpga_clear(&main_fpga); @@ -210,11 +214,9 @@ printf("\r\nDownloaded %u bytes.\r\n", len); p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); - printf("Writing %u bytes to flash at %u\r\n", len, offset); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { for (j = 0; j < 10; j++) { - off = i + offset * FLASH_PAGE_SIZE; - printf("%u/%u\r", off, len + offset); + off = i + offset; SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE); if (p_memcmp(addr3 + i, addr2 + i, FLASH_PAGE_SIZE) == 0) @@ -403,7 +405,7 @@ case COMMAND_REPLACE_FPGA_VIA_XMODEM: printf("Updating FPGA image\r\n"); - UpdateFlash(15); + UpdateFlash(15 * FLASH_PAGE_SIZE); break; case COMMAND_REPLACE_FLASH_VIA_XMODEM: printf("Updating FLASH image\r\n"); ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ fpga->fpga_prog_n_pio->PIO_CODR = fpga->fpga_prog_n_mask; Delay(1); fpga->fpga_prog_n_pio->PIO_SODR = fpga->fpga_prog_n_mask; - Delay(2000); + Delay(4000); } void ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/fpga.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed May 3 23:18:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FEB616A403; Wed, 3 May 2006 23:18:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 66A9916A401 for ; Wed, 3 May 2006 23:18:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2447143D49 for ; Wed, 3 May 2006 23:18:49 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43NInq9029134 for ; Wed, 3 May 2006 23:18:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43NImZ0029128 for perforce@freebsd.org; Wed, 3 May 2006 23:18:48 GMT (envelope-from imp@freebsd.org) Date: Wed, 3 May 2006 23:18:48 GMT Message-Id: <200605032318.k43NImZ0029128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 23:18:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=96633 Change 96633 by imp@imp_hammer on 2006/05/03 23:18:06 xmodem download code was just debug Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#6 (text+ko) ==== @@ -67,7 +67,6 @@ {COMMAND_RESET, "R"}, {COMMAND_REPLACE_FLASH_VIA_XMODEM, "I"}, {COMMAND_REPLACE_FPGA_VIA_XMODEM, "F"}, - {COMMAND_PROGRAM_FPGA_VIA_XMODEM, "f"}, {COMMAND_FINAL_FLAG, 0} }; @@ -227,21 +226,6 @@ } } -static void -ProgramFpga(void) -{ - char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ - int len; - - while ((len = xmodem_rx(addr)) == -1) - continue; - printf("Loading %u bytes into the FPGA...\r\n", len); - fpga_init(&main_fpga); - fpga_clear(&main_fpga); - fpga_write_bytes(&main_fpga, addr, len); - fpga_done(&main_fpga); -} - /* * .KB_C_FN_DEFINITION_START * void ParseCommand(char *) @@ -411,8 +395,6 @@ printf("Updating FLASH image\r\n"); UpdateFlash(0); break; - case COMMAND_PROGRAM_FPGA_VIA_XMODEM: - ProgramFpga(); default: break; } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#5 (text+ko) ==== @@ -43,7 +43,6 @@ COMMAND_RESET, COMMAND_REPLACE_FLASH_VIA_XMODEM, COMMAND_REPLACE_FPGA_VIA_XMODEM, - COMMAND_PROGRAM_FPGA_VIA_XMODEM, COMMAND_FINAL_FLAG } e_cmd_t; From owner-p4-projects@FreeBSD.ORG Thu May 4 00:11:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7875316A464; Thu, 4 May 2006 00:11:55 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3509116A46B for ; Thu, 4 May 2006 00:11:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E40BD43D60 for ; Thu, 4 May 2006 00:11:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k440BsFn058841 for ; Thu, 4 May 2006 00:11:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k440BsSM058823 for perforce@freebsd.org; Thu, 4 May 2006 00:11:54 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 00:11:54 GMT Message-Id: <200605040011.k440BsSM058823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 00:11:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=96636 Change 96636 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 00:11:42 fix savefpctx (BLK ASI with fp doesn't appear to work on sun4v) Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#19 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#19 (text+ko) ==== @@ -242,12 +242,10 @@ */ ENTRY(savefpctx) wr %g0, FPRS_FEF, %fprs - wr %g0, ASI_BLK_S, %asi - stda %f0, [%o0 + (0 * 64)] %asi - stda %f16, [%o0 + (1 * 64)] %asi - stda %f32, [%o0 + (2 * 64)] %asi - stda %f48, [%o0 + (3 * 64)] %asi - membar #Sync + std %f0, [%o0 + (0 * 64)] + std %f16, [%o0 + (1 * 64)] + std %f32, [%o0 + (2 * 64)] + std %f48, [%o0 + (3 * 64)] retl wr %g0, 0, %fprs END(savefpctx) From owner-p4-projects@FreeBSD.ORG Thu May 4 00:28:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4762F16A405; Thu, 4 May 2006 00:28:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 70D8716A404 for ; Thu, 4 May 2006 00:28:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1321B43D45 for ; Thu, 4 May 2006 00:28:17 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k440SGwU067982 for ; Thu, 4 May 2006 00:28:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k440SFCc067967 for perforce@freebsd.org; Thu, 4 May 2006 00:28:15 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 00:28:15 GMT Message-Id: <200605040028.k440SFCc067967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 00:28:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=96637 Change 96637 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 00:27:19 some basic cleanup fix pmap_ipi to send shootdowns to all other cpus pre-zero pages allocated by pmap_bootstrap Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#42 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#42 (text+ko) ==== @@ -377,6 +377,7 @@ continue; pa = phys_avail[i]; phys_avail[i] += size; + pmap_scrub_pages(pa, size); return (pa); } panic("pmap_bootstrap_alloc"); @@ -824,6 +825,7 @@ pv_entry_count > pv_entry_high_water) return; + vm_page_lock_queues(); if (dst_pmap < src_pmap) { PMAP_LOCK(dst_pmap); @@ -842,6 +844,7 @@ if ((tte_data & VTD_MANAGED) != 0) { if (tte_hash_lookup_nolock(dst_pmap->pm_hash, addr) == 0) { m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); + tte_hash_insert(dst_pmap->pm_hash, addr, tte_data & ~(VTD_W|VTD_REF)); dst_pmap->pm_stats.resident_count++; pmap_insert_entry(dst_pmap, addr, m); @@ -1012,18 +1015,20 @@ VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); + + tte_data = VM_PAGE_TO_PHYS(m); /* * Enter on the PV list if part of our managed memory. Note that we * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) + if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, m); + tte_data |= VTD_MANAGED; + } pmap->pm_stats.resident_count++; - tte_data = VM_PAGE_TO_PHYS(m); - if ((prot & VM_PROT_EXECUTE) != 0) tte_data |= VTD_X; @@ -1032,9 +1037,6 @@ else tte_data |= TTE_MINFLAGS; - if (!(m->flags & (PG_FICTITIOUS|PG_UNMANAGED))) - tte_data |= VTD_MANAGED; - tte_hash_insert(pmap->pm_hash, va, tte_data | TTE_MINFLAGS); PMAP_UNLOCK(pmap); @@ -1194,11 +1196,14 @@ ackexpect |= (1 << i); #if 0 inext = ((i & ~0x3) + 4); + cpus = (cpus >> (inext - i)); + i = inext; #else inext = i++; + cpus = cpus >> 1; #endif - cpus = (cpus >> (inext - i)); - i = inext; + + } #else inext = i = cpus = 0; @@ -1265,7 +1270,6 @@ /* XXX */ invltlb(); - if ((((eva - sva) >> PAGE_SHIFT) < MAX_INVALIDATES)) { for (tva = sva; tva < eva; tva += PAGE_SIZE_8K) invlpg(tva, pmap->pm_context); @@ -1280,7 +1284,6 @@ else func = tl_invlctx; - pmap_ipi(pmap, (void *)func, pmap->pm_context, 0); if (pmap != kernel_pmap) pmap->pm_tlbactive = pmap->pm_active; @@ -1543,12 +1546,11 @@ uint64_t otte_data, tte_data; vm_page_t m; - if ((otte_data = tte_hash_lookup(pmap->pm_hash, tva)) == 0) + if ((tte_data = tte_hash_lookup(pmap->pm_hash, tva)) == 0) continue; - tte_data = otte_data; - tte_data &= ~(VTD_SW_W | VTD_W | VTD_REF); + otte_data = tte_hash_update(pmap->pm_hash, tva, tte_data); if (tte_data != otte_data) @@ -1556,7 +1558,7 @@ if (otte_data & VTD_MANAGED) { m = NULL; - + if (otte_data & VTD_REF) { m = PHYS_TO_VM_PAGE(TTE_GET_PA(otte_data)); vm_page_flag_set(m, PG_REFERENCED); @@ -1565,8 +1567,7 @@ m = PHYS_TO_VM_PAGE(TTE_GET_PA(otte_data)); vm_page_dirty(m); } - - } + } } sched_unpin(); From owner-p4-projects@FreeBSD.ORG Thu May 4 03:14:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83FA416A403; Thu, 4 May 2006 03:14:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 213B316A401 for ; Thu, 4 May 2006 03:14:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D56A143D46 for ; Thu, 4 May 2006 03:14:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k443E4ES072671 for ; Thu, 4 May 2006 03:14:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k443E4D1072665 for perforce@freebsd.org; Thu, 4 May 2006 03:14:04 GMT (envelope-from jb@freebsd.org) Date: Thu, 4 May 2006 03:14:04 GMT Message-Id: <200605040314.k443E4D1072665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 03:14:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=96641 Change 96641 by jb@jb_freebsd2 on 2006/05/04 03:13:04 Suck in libproc. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/P32ton.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/P32ton.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pcontrol.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pcontrol.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pcore.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pexecname.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pgcore.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pidle.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pisadep.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pisprocdir.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Plwpregs.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pscantext.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pservice.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pstack.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pstack.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Psymtab.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Psyscall.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Putil.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Putil.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_door.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_exit.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_fcntl.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getitimer.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getrctl.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getrlimit.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getsockname.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_ioctl.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_lseek.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_memcntl.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_meminfo.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_mmap.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_open.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_pbind.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_rename.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_sigaction.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_stat.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_statvfs.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_tasksys.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_waitid.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_arg.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_get_info.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_names.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_set.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_stdio.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 4 03:27:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D102716A404; Thu, 4 May 2006 03:27:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A876716A401 for ; Thu, 4 May 2006 03:27:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 608AF43D48 for ; Thu, 4 May 2006 03:27:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k443RLfx080165 for ; Thu, 4 May 2006 03:27:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k443RL3I080162 for perforce@freebsd.org; Thu, 4 May 2006 03:27:21 GMT (envelope-from jb@freebsd.org) Date: Thu, 4 May 2006 03:27:21 GMT Message-Id: <200605040327.k443RL3I080162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 03:27:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=96642 Change 96642 by jb@jb_freebsd2 on 2006/05/04 03:26:51 Why won't P4 suck this file? Grumble. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/libproc.h#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/xx/libproc.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 4 05:56:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5CE316A415; Thu, 4 May 2006 05:56:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 26E0C16A41B for ; Thu, 4 May 2006 05:56:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F09743D6E for ; Thu, 4 May 2006 05:56:22 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k445uL2Q069259 for ; Thu, 4 May 2006 05:56:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k445uLoV069253 for perforce@freebsd.org; Thu, 4 May 2006 05:56:21 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 05:56:21 GMT Message-Id: <200605040556.k445uLoV069253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 05:56:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=96644 Change 96644 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 05:56:06 factor out hash bucket locking into macros Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#46 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#46 (text+ko) ==== @@ -1331,6 +1331,33 @@ END(tl0_intr) +/* + * workaround for CPP brokenness + */ +#define LOADLOAD #LoadLoad +#define LOADSTORE #LoadStore +#define STORESTORE #StoreStore + +#define THE_LOCK_ENTER(addr, lock_bit, oldval, newval, label1) \ + mov 1, lock_bit ; \ + add addr, 8, addr ; \ + sllx lock_bit, 56, lock_bit ; \ +label1: ; \ + ldxa [addr]%asi, oldval; \ + andcc %l7, lock_bit, %g0 ; \ + bnz,pn %xcc, label1 ## b ; \ + or oldval, lock_bit, newval; \ + casxa [addr]%asi, oldval, newval; \ + cmp oldval, newval ; \ + bne,pn %icc, label1 ## b ; \ + membar LOADLOAD ; \ + sub addr, 8, addr ; + +#define THE_LOCK_EXIT(addr, lock_bit, tmp)\ + membar LOADSTORE | STORESTORE ; \ + ldxa [addr + 8]%asi, tmp ; \ + andn tmp, lock_bit, tmp ; \ + stxa tmp, [addr + 8]%asi ; #define HASH_LOOKUP(addr, tag, searchtag, endlabel, matchlabel) \ ldda [addr]%asi, tag ; \ @@ -1341,12 +1368,9 @@ be,pn %xcc, endlabel ; \ nop - #define RESTORE_TRAPWIN(pcpu, cansave, label1, label2) \ brz cansave, label1 ## f; \ nop ; \ - mov -1, %l0 ; \ - mov -1, %l7 ; \ restore ; \ ba,a,pt %xcc, label2 ## f ; \ label1: ; \ @@ -1468,21 +1492,9 @@ ! %g2==entry base add %g2, %l5, %g2 ! base + offset == entry base - mov 1, %l0 - add %g2, 8, %g2 ! point g2 at data - sllx %l0, 56, %l0 ! %l0 == VTD_LOCK -6: - ldxa [%g2]%asi, %l7 ! don't lock bus if bucket is locked - andcc %l7, %l0, %g0 - bnz,pn %xcc, 6b - or %l7, %l0, %l6 - casxa [%g2]%asi, %l7, %l6 - cmp %l6, %l7 - bne,pn %icc, 6b - nop - sub %g2, 8, %g2 ! point g2 back at tag - + THE_LOCK_ENTER(%g2, %l0, %l7, %l6, 6) + ! %g1 == cansave ! %g2 == THE ! %g3 == TWDW ASI @@ -1521,11 +1533,8 @@ ! we need to jump to tl0_trap to drop us back down to tl0 ! and take us to trap(...) to service the fault wr %g0, %l3, %asi + THE_LOCK_EXIT(%l5, %l0, %g2) - ldxa [%l5 + 8]%asi, %g2 - andn %g2, %l0, %g2 - stxa %g2, [%l5 + 8]%asi ! unlock head of bucket - andn %g5, %l1, %g5 ! fault page PA RESTORE_TRAPWIN(PCPU_REG, %g1, 14, 15) @@ -1555,7 +1564,6 @@ or %l7, VTD_W, %l7 ! add modifed bit 9: - andn %l7, %l0, %l7 ! remove lock bit and %g4, %l1, %g3 ! size of TSB in pages @@ -1588,18 +1596,14 @@ 12: #endif stxa %g0, [%g3 + %l4]ASI_REAL ! invalidate data + membar #StoreStore stxa %l6, [%g3]ASI_REAL ! store tag + membar #StoreStore stxa %l7, [%g3 + %l4]ASI_REAL ! store data - stxa %l7, [%g2 + 8]%asi ! update TTE - - cmp %g2, %l5 - beq,a,pt %xcc, 17f - nop - ldxa [%l5 + 8]%asi, %l7 - andn %l7, %l0, %l7 ! remove lock bit - stxa %l7, [%l5 + 8]%asi ! unlock bucket -17: - membar #Sync + stxa %l7, [%g2 + 8]%asi ! update TTE with ref bit + membar #StoreLoad + + THE_LOCK_EXIT(%l5, %l0, %l7) RESTORE_TRAPWIN(PCPU_REG, %g1, 13, 16) upgrade_demap: rdpr %tt, %g3 @@ -1635,9 +1639,7 @@ ! %l5 == head of bucket ENTRY(prot_fault_trap) - ldxa [%l5 + 8]%asi, %g2 - andn %g2, %l0, %g2 ! remove lock bit - stxa %g2, [%l5 + 8]%asi ! unlock head of bucket + THE_LOCK_EXIT(%l5, %l0, %g2) RESTORE_TRAPWIN(PCPU_REG, %g1, 14, 15) sethi %hi(trap), %g1 mov T_DATA_PROTECTION, %g2 From owner-p4-projects@FreeBSD.ORG Thu May 4 05:58:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58B4F16A405; Thu, 4 May 2006 05:58:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 370A316A402 for ; Thu, 4 May 2006 05:58:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 029A143D5E for ; Thu, 4 May 2006 05:58:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k445wOhq070732 for ; Thu, 4 May 2006 05:58:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k445wO8x070729 for perforce@freebsd.org; Thu, 4 May 2006 05:58:24 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 05:58:24 GMT Message-Id: <200605040558.k445wO8x070729@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 05:58:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96645 Change 96645 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 05:58:23 fix call to vm_page_alloc_contig so that we can now spawn an arbitrary number of processes Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#17 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#17 (text+ko) ==== @@ -196,14 +196,14 @@ goto done; } - printf("calling vm_page_alloc_contig\n"); while (m == NULL) { m = vm_page_alloc_contig(HASH_SIZE, 2*PAGE_SIZE_4M, - (1UL<<28), 0, 0); - if (m == NULL) + (1UL<<34), PAGE_SIZE, (1UL<<34)); + if (m == NULL) { + printf("vm_page_alloc_contig failed - waiting to retry\n"); VM_WAIT; + } } - printf("PHYS(m)=0x%010lx ", VM_PAGE_TO_PHYS(m)); for (i = 0, tm = m; i < HASH_SIZE; i++, tm++) { if (tm->flags & PG_ZERO) pmap_zero_page(tm); @@ -212,8 +212,7 @@ th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); done: *scratchval = (uint64_t)((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size); - if (proc0_mem_allocated > 390) - printf("hash_create done\n"); + return (th); } From owner-p4-projects@FreeBSD.ORG Thu May 4 05:59:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4539216A421; Thu, 4 May 2006 05:59:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E736216A41F for ; Thu, 4 May 2006 05:59:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6C4343D48 for ; Thu, 4 May 2006 05:59:26 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k445xQVU071453 for ; Thu, 4 May 2006 05:59:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k445xQD8071447 for perforce@freebsd.org; Thu, 4 May 2006 05:59:26 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 05:59:26 GMT Message-Id: <200605040559.k445xQD8071447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 05:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=96646 Change 96646 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 05:59:03 remove invalid sanity check Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#43 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#43 (text+ko) ==== @@ -797,14 +797,14 @@ void pmap_clear_modify(vm_page_t m) { - DPRINTF("pmap_clear_modify(0x%lx)\n", VM_PAGE_TO_PHYS(m)); + KDPRINTF("pmap_clear_modify(0x%lx)\n", VM_PAGE_TO_PHYS(m)); tte_clear_phys_bit(m, VTD_W); } void pmap_clear_reference(vm_page_t m) { - DPRINTF("pmap_clear_reference(0x%lx)\n", VM_PAGE_TO_PHYS(m)); + KDPRINTF("pmap_clear_reference(0x%lx)\n", VM_PAGE_TO_PHYS(m)); tte_clear_phys_bit(m, VTD_REF); } From owner-p4-projects@FreeBSD.ORG Thu May 4 07:05:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3900016A40A; Thu, 4 May 2006 07:05:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EC4C116A400 for ; Thu, 4 May 2006 07:05:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5AD243D45 for ; Thu, 4 May 2006 07:05:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4475klL008777 for ; Thu, 4 May 2006 07:05:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4475kdW008774 for perforce@freebsd.org; Thu, 4 May 2006 07:05:46 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 07:05:46 GMT Message-Id: <200605040705.k4475kdW008774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 07:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=96647 Change 96647 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 07:04:46 don't need to throttle to less than MAXCPU any more Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_machdep.c#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/mp_machdep.c#7 (text+ko) ==== @@ -316,12 +316,8 @@ pc->pc_node = child; all_cpus |= 1 << cpuid; -#if 0 + if (mp_ncpus == MAXCPU) -#else - if (mp_ncpus == 4) -#endif - break; } PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid))); From owner-p4-projects@FreeBSD.ORG Thu May 4 12:16:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9774716A403; Thu, 4 May 2006 12:16:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5E3AB16A401 for ; Thu, 4 May 2006 12:16:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27FC643D53 for ; Thu, 4 May 2006 12:16:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44CGYhh090594 for ; Thu, 4 May 2006 12:16:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44CGY9g090588 for perforce@freebsd.org; Thu, 4 May 2006 12:16:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 May 2006 12:16:34 GMT Message-Id: <200605041216.k44CGY9g090588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 12:16:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=96652 Change 96652 by rwatson@rwatson_zoo on 2006/05/04 12:16:22 Consistently use audit_free() to free records, rather than directly invoking uma_zfree(). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#26 (text+ko) ==== @@ -390,7 +390,7 @@ mtx_lock(&audit_mtx); audit_pre_q_len--; mtx_unlock(&audit_mtx); - uma_zfree(audit_record_zone, ar); + audit_free(ar); return; } @@ -416,7 +416,7 @@ if (audit_suspended || !audit_enabled) { audit_pre_q_len--; mtx_unlock(&audit_mtx); - uma_zfree(audit_record_zone, ar); + audit_free(ar); return; } From owner-p4-projects@FreeBSD.ORG Thu May 4 13:58:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3066E16A433; Thu, 4 May 2006 13:58:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E7F8216A42C for ; Thu, 4 May 2006 13:58:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2678C43D5C for ; Thu, 4 May 2006 13:58:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44Dwtbb056428 for ; Thu, 4 May 2006 13:58:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44DwtGf056422 for perforce@freebsd.org; Thu, 4 May 2006 13:58:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 May 2006 13:58:55 GMT Message-Id: <200605041358.k44DwtGf056422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 13:58:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=96655 Change 96655 by rwatson@rwatson_zoo on 2006/05/04 13:57:56 A variety of changes in support of preselection for audit pipes: - Add two new preselection flags for queued audit records: AR_PRESELECT_TRAIL and AR_PRESELECT_PIPE, which are used to track whether a particular queued record was requested by the global trail configuration, or if some or another pipe has requested it. This flag is now set during record commit preselection to be used by the audit worker in deciding where to send the record. - au_preselect() now accepts a class argument so that the caller can look up the class once for all trail/pipe preselection and avoid repeated class lookups for an event type. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#27 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#6 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#18 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#26 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#13 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#27 (text+ko) ==== @@ -334,6 +334,9 @@ void audit_commit(struct kaudit_record *ar, int error, int retval) { + au_event_t event; + au_class_t class; + au_id_t auid; int sorf; struct au_mask *aumask; @@ -379,14 +382,17 @@ break; } - if (au_preselect(ar->k_ar.ar_event, aumask, sorf) != 0) - ar->k_ar_commit |= AR_COMMIT_KERNEL; + auid = ar->k_ar.ar_subj_auid; + event = ar->k_ar.ar_event; + class = au_event_class(event); - /* - * XXXRW: Why is this necessary? Should we ever accept a record that - * we're not willing to commit? - */ - if ((ar->k_ar_commit & (AR_COMMIT_USER | AR_COMMIT_KERNEL)) == 0) { + ar->k_ar_commit |= AR_COMMIT_KERNEL; + if (au_preselect(event, class, aumask, sorf) != 0) + ar->k_ar_commit |= AR_PRESELECT_TRAIL; + if (audit_pipe_preselect(auid, event, class, sorf) != 0) + ar->k_ar_commit |= AR_PRESELECT_PIPE; + if ((ar->k_ar_commit & (AR_PRESELECT_TRAIL | AR_PRESELECT_PIPE)) == + 0) { mtx_lock(&audit_mtx); audit_pre_q_len--; mtx_unlock(&audit_mtx); @@ -448,8 +454,10 @@ void audit_syscall_enter(unsigned short code, struct thread *td) { - int audit_event; struct au_mask *aumask; + au_class_t class; + au_event_t event; + au_id_t auid; KASSERT(td->td_ar == NULL, ("audit_syscall_enter: td->td_ar != NULL")); @@ -466,15 +474,16 @@ if (code >= td->td_proc->p_sysent->sv_size) return; - audit_event = td->td_proc->p_sysent->sv_table[code].sy_auevent; - if (audit_event == AUE_NULL) + event = td->td_proc->p_sysent->sv_table[code].sy_auevent; + if (event == AUE_NULL) return; /* * Check which audit mask to use; either the kernel non-attributable * event mask or the process audit mask. */ - if (td->td_proc->p_au->ai_auid == AU_DEFAUDITID) + auid = td->td_proc->p_au->ai_auid; + if (auid == AU_DEFAUDITID) aumask = &audit_nae_mask; else aumask = &td->td_proc->p_au->ai_mask; @@ -483,8 +492,8 @@ * Allocate an audit record, if preselection allows it, and store * in the thread for later use. */ - if (au_preselect(audit_event, aumask, - AU_PRS_FAILURE | AU_PRS_SUCCESS)) { + class = au_event_class(event); + if (au_preselect(event, class, aumask, AU_PRS_BOTH)) { /* * If we're out of space and need to suspend unprivileged * processes, do that here rather than trying to allocate @@ -501,8 +510,10 @@ cv_wait(&audit_fail_cv, &audit_mtx); panic("audit_failing_stop: thread continued"); } - td->td_ar = audit_new(audit_event, td); - } else + td->td_ar = audit_new(event, td); + } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH)) + td->td_ar = audit_new(event, td); + else td->td_ar = NULL; } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#6 (text+ko) ==== @@ -155,24 +155,21 @@ * event is part of against the given mask. */ int -au_preselect(au_event_t event, au_mask_t *mask_p, int sorf) +au_preselect(au_event_t event, au_class_t class, au_mask_t *mask_p, int sorf) { au_class_t effmask = 0; - au_class_t ae_class; if (mask_p == NULL) return (-1); - ae_class = au_event_class(event); - /* * Perform the actual check of the masks against the event. */ if (sorf & AU_PRS_SUCCESS) - effmask |= (mask_p->am_success & ae_class); + effmask |= (mask_p->am_success & class); if (sorf & AU_PRS_FAILURE) - effmask |= (mask_p->am_failure & ae_class); + effmask |= (mask_p->am_failure & class); if (effmask) return (1); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#18 (text+ko) ==== @@ -216,13 +216,13 @@ } if (app == NULL) { if (auid == AU_DEFAUDITID) - return (au_preselect(event, &ap->ap_preselect_naflags, - sorf)); + return (au_preselect(event, class, + &ap->ap_preselect_naflags, sorf)); else - return (au_preselect(event, &ap->ap_preselect_flags, - sorf)); + return (au_preselect(event, class, + &ap->ap_preselect_flags, sorf)); } else - return (au_preselect(event, &app->app_mask, sorf)); + return (au_preselect(event, class, &app->app_mask, sorf)); return (0); } @@ -239,7 +239,7 @@ mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) { - mtx_lock(&audit_pipe_mtx); + mtx_unlock(&audit_pipe_mtx); return (1); } } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#26 (text+ko) ==== @@ -84,11 +84,16 @@ #define BSM_NOAUDIT 2 /* - * Defines for the kernel audit record k_ar_commit field. + * Defines for the kernel audit record k_ar_commit field. Flags are set to + * indicate what sort of record it is, and which preselection mechanism + * selected it. */ #define AR_COMMIT_KERNEL 0x00000001U #define AR_COMMIT_USER 0x00000010U +#define AR_PRESELECT_TRAIL 0x00001000U +#define AR_PRESELECT_PIPE 0x00002000U + /* * Audit data is generated as a stream of struct audit_record structures, * linked by struct kaudit_record, and contain storage for possible audit so @@ -305,7 +310,8 @@ /* * audit_klib prototypes */ -int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf); +int au_preselect(au_event_t event, au_class_t class, + au_mask_t *mask_p, int sorf); au_event_t flags_and_error_to_openevent(int oflags, int error); void au_evclassmap_init(void); void au_evclassmap_insert(au_event_t event, au_class_t class); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#13 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#10 (text+ko) ==== @@ -321,52 +321,60 @@ au_id_t auid; int sorf; - if (ar->k_ar_commit & AR_COMMIT_USER) { + if ((ar->k_ar_commit & AR_COMMIT_USER) && + (ar->k_ar_commit & AR_PRESELECT_TRAIL)) { error = audit_record_write(audit_vp, audit_cred, audit_td, ar->k_udata, ar->k_ulen); if (error && audit_panic_on_write_fail) panic("audit_worker: write error %d\n", error); else if (error) printf("audit_worker: write error %d\n", error); + } + if ((ar->k_ar_commit & AR_COMMIT_USER) && + (ar->k_ar_commit & AR_PRESELECT_PIPE)) audit_pipe_submit_user(ar->k_udata, ar->k_ulen); - } + + if (!(ar->k_ar_commit & AR_COMMIT_KERNEL)) + return; + + auid = ar->k_ar.ar_subj_auid; + event = ar->k_ar.ar_event; + class = au_event_class(event); + if (ar->k_ar.ar_errno == 0) + sorf = AU_PRS_SUCCESS; + else + sorf = AU_PRS_FAILURE; - if (ar->k_ar_commit & AR_COMMIT_KERNEL) { - auid = ar->k_ar.ar_subj_auid; - event = ar->k_ar.ar_event; - class = au_event_class(event); - if (ar->k_ar.ar_errno == 0) - sorf = AU_PRS_SUCCESS; - else - sorf = AU_PRS_FAILURE; + ret = kaudit_to_bsm(ar, &bsm); + switch (ret) { + case BSM_NOAUDIT: + return; - ret = kaudit_to_bsm(ar, &bsm); - switch (ret) { - case BSM_NOAUDIT: - break; + case BSM_FAILURE: + printf("audit_worker_process_record: BSM_FAILURE\n"); + return; - case BSM_FAILURE: - printf("audit_worker_process_record: BSM_FAILURE\n"); - break; + case BSM_SUCCESS: + break; - case BSM_SUCCESS: - error = audit_record_write(audit_vp, audit_cred, - audit_td, bsm->data, bsm->len); - if (error && audit_panic_on_write_fail) - panic("audit_worker: write error %d\n", - error); - else if (error) - printf("audit_worker: write error %d\n", - error); - audit_pipe_submit(auid, event, class, sorf, - bsm->data, bsm->len); - kau_free(bsm); - break; + default: + panic("kaudit_to_bsm returned %d", ret); + } - default: - panic("kaudit_to_bsm returned %d", ret); - } + if (ar->k_ar_commit & AR_PRESELECT_TRAIL) { + error = audit_record_write(audit_vp, audit_cred, + audit_td, bsm->data, bsm->len); + if (error && audit_panic_on_write_fail) + panic("audit_worker: write error %d\n", + error); + else if (error) + printf("audit_worker: write error %d\n", + error); } + if (ar->k_ar_commit & AR_PRESELECT_PIPE) + audit_pipe_submit(auid, event, class, sorf, + bsm->data, bsm->len); + kau_free(bsm); } /* From owner-p4-projects@FreeBSD.ORG Thu May 4 20:01:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7928016A414; Thu, 4 May 2006 20:01:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3DF7416A404 for ; Thu, 4 May 2006 20:01:19 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0852A43D48 for ; Thu, 4 May 2006 20:01:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44K1ItM069925 for ; Thu, 4 May 2006 20:01:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44K1IAV069903 for perforce@freebsd.org; Thu, 4 May 2006 20:01:18 GMT (envelope-from imp@freebsd.org) Date: Thu, 4 May 2006 20:01:18 GMT Message-Id: <200605042001.k44K1IAV069903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 20:01:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=96664 Change 96664 by imp@imp_hammer on 2006/05/04 20:00:28 Slim down by about 160 bytes: a little better code and eliminate the get ID command, since it is unused. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#10 (text+ko) ==== @@ -73,14 +73,10 @@ static char GetFlashStatus(void) { - + p_memset((char *)&spi_command, 0, sizeof(spi_command)); p_memset(tx_commandBuffer, 0, 8); tx_commandBuffer[0] = STATUS_REGISTER_READ; p_memset(rx_commandBuffer, 0, 8); - spi_command.tx_data_size = 0; - spi_command.tx_data = 0; - spi_command.rx_data_size = 0; - spi_command.rx_data = 0; spi_command.tx_cmd = tx_commandBuffer; spi_command.rx_cmd = rx_commandBuffer; spi_command.rx_cmd_size = 2; @@ -89,26 +85,6 @@ return (rx_commandBuffer[1]); } -void -SPI_GetId(unsigned *id) -{ - - p_memset(tx_commandBuffer, 0, 8); - tx_commandBuffer[0] = 0x9f; - p_memset(rx_commandBuffer, 0, 8); - spi_command.tx_data_size = 0; - spi_command.tx_data = 0; - spi_command.rx_data_size = 0; - spi_command.rx_data = 0; - spi_command.tx_cmd = tx_commandBuffer; - spi_command.rx_cmd = rx_commandBuffer; - spi_command.rx_cmd_size = 5; - spi_command.tx_cmd_size = 5; - SendCommand(&spi_command); - *id = rx_commandBuffer[1] | (rx_commandBuffer[2] << 8) | - (rx_commandBuffer[3] << 16); -} - /* * .KB_C_FN_DEFINITION_START * void WaitForDeviceReady(void) From owner-p4-projects@FreeBSD.ORG Thu May 4 20:07:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E3C516A405; Thu, 4 May 2006 20:07:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2BFFD16A402 for ; Thu, 4 May 2006 20:07:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E026B43D4C for ; Thu, 4 May 2006 20:07:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44K7QSJ073075 for ; Thu, 4 May 2006 20:07:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44K7Qfa073072 for perforce@freebsd.org; Thu, 4 May 2006 20:07:26 GMT (envelope-from imp@freebsd.org) Date: Thu, 4 May 2006 20:07:26 GMT Message-Id: <200605042007.k44K7Qfa073072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 20:07:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=96665 Change 96665 by imp@imp_hammer on 2006/05/04 20:06:33 More shaving... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#11 (text+ko) ==== @@ -41,7 +41,6 @@ static void SendCommand(spiCommand_t *pCommand) { - unsigned v; AT91PS_SPI pSPI = AT91C_BASE_SPI; pSPI->SPI_PTCR = AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS; @@ -59,7 +58,7 @@ pSPI->SPI_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN; // wait for completion - while (!((v = pSPI->SPI_SR) & AT91C_SPI_SPENDRX)) + while (!(pSPI->SPI_SR & AT91C_SPI_SPENDRX)) Delay(700); } @@ -227,7 +226,6 @@ AT91PS_PIO pPio; AT91PS_SPI pSPI = AT91C_BASE_SPI; unsigned value; - char initStatus; // enable CS0, CLK, MOSI, MISO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; @@ -267,6 +265,6 @@ // Increment real time counter every SLCK AT91C_BASE_ST->ST_RTMR = 1; - if (((initStatus = GetFlashStatus()) & 0xFC) != 0xBC) - printf(" Unexpected SPI flash status: 0x%x\r\n", initStatus); + if (((value = GetFlashStatus()) & 0xFC) != 0xBC) + printf(" Unexpected SPI flash status: 0x%x\r\n", value); } From owner-p4-projects@FreeBSD.ORG Thu May 4 20:10:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ACAD16A404; Thu, 4 May 2006 20:10:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 488C616A401 for ; Thu, 4 May 2006 20:10:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E89A43D45 for ; Thu, 4 May 2006 20:10:31 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44KAUpj073499 for ; Thu, 4 May 2006 20:10:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44KAUSS073493 for perforce@freebsd.org; Thu, 4 May 2006 20:10:30 GMT (envelope-from imp@freebsd.org) Date: Thu, 4 May 2006 20:10:30 GMT Message-Id: <200605042010.k44KAUSS073493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 20:10:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=96666 Change 96666 by imp@imp_hammer on 2006/05/04 20:09:44 Make spi write flash function simpler. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#12 (text+ko) ==== @@ -96,47 +96,6 @@ while (!(GetFlashStatus() & 0x80)) ; } - -/* - * .KB_C_FN_DEFINITION_START - * void ProgramBuffer(unsigned pageAddress, unsigned byteAddress, - * unsigned src_addr, unsigned size); - * Private function to program Flash through the buffer. Note this - * will corrupt any data on the same page not intended for modification. - * To preserve this data, read it first, modify it in RAM, then write back - * data in FLASH_PAGE_SIZE intervals. This also corrupts the data in RAM. - * .KB_C_FN_DEFINITION_END - */ -static void -ProgramBuffer(unsigned pageAddress, unsigned byteAddress, - char *src_addr, unsigned size) -{ - - p_memset(tx_commandBuffer, 0, 8); - tx_commandBuffer[0] = PROGRAM_THROUGH_BUFFER; -// tx_commandBuffer[0] = 0x84; // write buffer 1 - tx_commandBuffer[1] = ((pageAddress >> 5) & 0xFF); - tx_commandBuffer[2] = ((pageAddress << 3) & 0xF8) | - ((byteAddress >> 8) & 0x7); - tx_commandBuffer[3] = (byteAddress & 0xFF); - - p_memset(rx_commandBuffer, 0, 8); - - spi_command.tx_cmd = tx_commandBuffer; - spi_command.rx_cmd = rx_commandBuffer; - spi_command.rx_cmd_size = 4; - spi_command.tx_cmd_size = 4; - - spi_command.tx_data_size = size; - spi_command.tx_data = src_addr; - spi_command.rx_data_size = size; - spi_command.rx_data = src_addr; - - SendCommand(&spi_command); - - WaitForDeviceReady(); -} - /*************************** GLOBAL FUNCTIONS ********************************/ @@ -190,7 +149,7 @@ void SPI_WriteFlash(unsigned flash_addr, char *src_addr, unsigned size) { - unsigned pageAddress, byteAddress, this_size; + unsigned pageAddress, byteAddress; // determine page address pageAddress = flash_addr / FLASH_PAGE_SIZE; @@ -198,20 +157,28 @@ // determine byte address byteAddress = flash_addr % FLASH_PAGE_SIZE; - while (size) { + p_memset(tx_commandBuffer, 0, 8); + tx_commandBuffer[0] = PROGRAM_THROUGH_BUFFER; + tx_commandBuffer[1] = ((pageAddress >> 5) & 0xFF); + tx_commandBuffer[2] = ((pageAddress << 3) & 0xF8) | + ((byteAddress >> 8) & 0x7); + tx_commandBuffer[3] = (byteAddress & 0xFF); + + p_memset(rx_commandBuffer, 0, 8); + + spi_command.tx_cmd = tx_commandBuffer; + spi_command.rx_cmd = rx_commandBuffer; + spi_command.rx_cmd_size = 4; + spi_command.tx_cmd_size = 4; - this_size = FLASH_PAGE_SIZE - byteAddress; - if (this_size > size) - this_size = size; + spi_command.tx_data_size = size; + spi_command.tx_data = src_addr; + spi_command.rx_data_size = size; + spi_command.rx_data = src_addr; - // write through buffer to flash - ProgramBuffer(pageAddress, byteAddress, src_addr, this_size); + SendCommand(&spi_command); - size -= this_size; - src_addr += this_size; - byteAddress = 0; - ++pageAddress; - } + WaitForDeviceReady(); } /* @@ -266,5 +233,5 @@ AT91C_BASE_ST->ST_RTMR = 1; if (((value = GetFlashStatus()) & 0xFC) != 0xBC) - printf(" Unexpected SPI flash status: 0x%x\r\n", value); + printf(" Bad SPI status: 0x%x\r\n", value); } From owner-p4-projects@FreeBSD.ORG Thu May 4 20:18:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AD6C16A43B; Thu, 4 May 2006 20:18:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C0BF716A412 for ; Thu, 4 May 2006 20:18:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87FF143D46 for ; Thu, 4 May 2006 20:18:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44KIfKS080065 for ; Thu, 4 May 2006 20:18:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44KIfpa080062 for perforce@freebsd.org; Thu, 4 May 2006 20:18:41 GMT (envelope-from imp@freebsd.org) Date: Thu, 4 May 2006 20:18:41 GMT Message-Id: <200605042018.k44KIfpa080062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 20:18:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=96667 Change 96667 by imp@imp_hammer on 2006/05/04 20:18:13 More trimming. We now have 2648 bytes free, up about 700. Room to breathe. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#10 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#7 (text+ko) ==== @@ -50,7 +50,6 @@ static const char *backspaceString = "\010 \010"; static const command_entry_t CommandTable[] = { - {COMMAND_COPY, "c"}, {COMMAND_DUMP, "d"}, {COMMAND_EXEC, "e"}, {COMMAND_HELP, "?"}, @@ -95,7 +94,6 @@ off = i + offset; SPI_ReadFlash(off, addr + i, FLASH_PAGE_SIZE); } - printf("Loading %u bytes into the FPGA...\r\n", len); fpga_init(&main_fpga); fpga_clear(&main_fpga); fpga_write_bytes(&main_fpga, addr, len); @@ -204,25 +202,14 @@ UpdateFlash(int offset) { char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ - char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */ - char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ - int len, i, j, off; + int len, i, off; while ((len = xmodem_rx(addr)) == -1) continue; printf("\r\nDownloaded %u bytes.\r\n", len); - p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / - FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { - for (j = 0; j < 10; j++) { - off = i + offset; - SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); - SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE); - if (p_memcmp(addr3 + i, addr2 + i, FLASH_PAGE_SIZE) == 0) - break; - } - if (j >= 10) - printf("Bad Readback at %u\r\n", i); + off = i + offset; + SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); } } @@ -241,22 +228,6 @@ return; switch (StringToCommand(argv[0])) { - case COMMAND_COPY: - { - // "c " - // copy memory - char *to, *from; - unsigned size; - - if (argc > 3) { - to = (char *)p_ASCIIToHex(argv[1]); - from = (char *)p_ASCIIToHex(argv[2]); - size = p_ASCIIToHex(argv[3]); - p_memcpy(to, from, size); - } - break; - } - case COMMAND_DUMP: // display boot commands DumpBootCommands(); @@ -299,7 +270,6 @@ case COMMAND_HELP: // dump command info printf("Commands:\r\n" - "\tc\r\n" "\td\r\n" "\te\r\n" "\tip\r\n" @@ -457,11 +427,7 @@ int ch = 0; p_memset((void*)inputBuffer, 0, sizeof(inputBuffer)); - buffCount = 0; - if (!inputFunction) { - inputFunction = getc; - } printf("\r\n>"); ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#8 (text+ko) ==== @@ -51,9 +51,8 @@ #endif EMAC_Init(); LoadBootCommands(); - printf("\r\nSPI Boot loader.\r\n"); if (getc(1) == -1) ExecuteEnvironmentFunctions(); - Bootloader(0); + Bootloader(getc); return (1); } From owner-p4-projects@FreeBSD.ORG Thu May 4 20:40:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 583F516A405; Thu, 4 May 2006 20:40:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2F99516A400 for ; Thu, 4 May 2006 20:40:08 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C49D843D45 for ; Thu, 4 May 2006 20:40:07 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44Ke7WI091760 for ; Thu, 4 May 2006 20:40:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44Ke79V091754 for perforce@freebsd.org; Thu, 4 May 2006 20:40:07 GMT (envelope-from imp@freebsd.org) Date: Thu, 4 May 2006 20:40:07 GMT Message-Id: <200605042040.k44Ke79V091754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 20:40:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=96668 Change 96668 by imp@imp_hammer on 2006/05/04 20:39:59 Need some indication of boot... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#9 (text+ko) ==== @@ -45,6 +45,7 @@ int main(void) { + printf("\r\nBoot\r\n"); SPI_InitFlash(); #ifdef TSC_FPGA fpga_load(); From owner-p4-projects@FreeBSD.ORG Thu May 4 20:41:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D4F016A404; Thu, 4 May 2006 20:41:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0D69616A403 for ; Thu, 4 May 2006 20:41:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD8AB43D48 for ; Thu, 4 May 2006 20:41:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44Kf9UG092478 for ; Thu, 4 May 2006 20:41:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44Kf9M7092472 for perforce@freebsd.org; Thu, 4 May 2006 20:41:09 GMT (envelope-from imp@freebsd.org) Date: Thu, 4 May 2006 20:41:09 GMT Message-Id: <200605042041.k44Kf9M7092472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 96670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 20:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=96670 Change 96670 by imp@imp_hammer on 2006/05/04 20:40:52 support RMII, minor optimizations to save 32 bytes Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#12 (text+ko) ==== @@ -406,7 +406,13 @@ pEmac->EMAC_CTL = 0; - if(!(pEmac->EMAC_SR & AT91C_EMAC_LINK)) + pEmac->EMAC_CFG = (pEmac->EMAC_CFG & ~(AT91C_EMAC_CLK)) | + AT91C_EMAC_CLK_HCLK_32 | AT91C_EMAC_CAF +#ifdef BOOT_TSC + | AT91C_EMAC_RMII +#endif + ; + if (!(pEmac->EMAC_SR & AT91C_EMAC_LINK)) MII_GetLinkSpeed(pEmac); // the sequence write EMAC_SA1L and write EMAC_SA1H must be respected @@ -415,10 +421,7 @@ pEmac->EMAC_RBQP = (unsigned) p_rxBD; pEmac->EMAC_RSR |= (AT91C_EMAC_OVR | AT91C_EMAC_REC | AT91C_EMAC_BNA); - pEmac->EMAC_CFG |= AT91C_EMAC_CAF; - pEmac->EMAC_CFG = (pEmac->EMAC_CFG & ~(AT91C_EMAC_CLK)) | - AT91C_EMAC_CLK_HCLK_32; - pEmac->EMAC_CTL |= (AT91C_EMAC_TE | AT91C_EMAC_RE); + pEmac->EMAC_CTL = AT91C_EMAC_TE | AT91C_EMAC_RE; pEmac->EMAC_TAR = (unsigned)transmitBuffer; } @@ -544,6 +547,7 @@ AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | AT91C_PA7_ETXCK_EREFCK; +#ifdef BOOT_MB920X /* Really !RMII */ AT91C_BASE_PIOB->PIO_BSR = AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | @@ -552,6 +556,7 @@ AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | AT91C_PB18_ECOL | AT91C_PB19_ERXCK; +#endif MAC_init = 1; } From owner-p4-projects@FreeBSD.ORG Thu May 4 22:38:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E5C916A403; Thu, 4 May 2006 22:38:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 36D8C16A401 for ; Thu, 4 May 2006 22:38:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02FCD43D45 for ; Thu, 4 May 2006 22:38:31 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44McUDj071731 for ; Thu, 4 May 2006 22:38:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44McU6Z071720 for perforce@freebsd.org; Thu, 4 May 2006 22:38:30 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 22:38:30 GMT Message-Id: <200605042238.k44McU6Z071720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 22:38:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=96671 Change 96671 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 22:38:10 pmap_kenter doesn't guarantee that the mapping isn't already in use so change to tte_hash_update avoid duplicate entry in pmap_enter_quick Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#44 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#44 (text+ko) ==== @@ -962,13 +962,11 @@ tte_data |= VTD_X; if (wired) tte_data |= VTD_WIRED; - if (pmap == kernel_pmap) tte_data |= TTE_KERNEL_MINFLAGS; - else - tte_data |= TTE_MINFLAGS; + - otte_data = tte_hash_update(pmap->pm_hash, va, tte_data); + otte_data = tte_hash_update(pmap->pm_hash, va, tte_data | TTE_MINFLAGS); invlva = FALSE; if ((otte_data & ~(VTD_W|VTD_REF)) != tte_data) { if (otte_data & VTD_V) { @@ -1005,7 +1003,7 @@ vm_page_t mpte) { - uint64_t tte_data; + tte_t tte_data; if (pmap->pm_context) DPRINTF("pmap_enter_quick(ctx=0x%lx va=%lx, pa=0x%lx prot=%x)\n", @@ -1013,9 +1011,12 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + PMAP_LOCK(pmap); - + if (tte_hash_lookup(pmap->pm_hash, va)) + goto done; + tte_data = VM_PAGE_TO_PHYS(m); /* * Enter on the PV list if part of our managed memory. Note that we @@ -1034,10 +1035,9 @@ if (pmap == kernel_pmap) tte_data |= TTE_KERNEL_MINFLAGS; - else - tte_data |= TTE_MINFLAGS; tte_hash_insert(pmap->pm_hash, va, tte_data | TTE_MINFLAGS); +done: PMAP_UNLOCK(pmap); return (0); @@ -1342,7 +1342,7 @@ static void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { - tte_hash_insert(kernel_pmap->pm_hash, va, pa | TTE_KERNEL | VTD_8K); + tte_hash_update(kernel_pmap->pm_hash, va, pa | TTE_KERNEL | VTD_8K); } /* From owner-p4-projects@FreeBSD.ORG Thu May 4 22:40:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7473016A404; Thu, 4 May 2006 22:40:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 53E2716A400 for ; Thu, 4 May 2006 22:40:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9C2143D46 for ; Thu, 4 May 2006 22:40:33 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44MeXbv073269 for ; Thu, 4 May 2006 22:40:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44MeXV7073266 for perforce@freebsd.org; Thu, 4 May 2006 22:40:33 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 May 2006 22:40:33 GMT Message-Id: <200605042240.k44MeXV7073266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 22:40:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=96672 Change 96672 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/04 22:39:41 TTE_KERNEL_MINFLAGS doesn't really need to overlap with TTE_MINFLAGS Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#8 (text+ko) ==== @@ -129,7 +129,7 @@ * default flags for kernel pages */ #define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W | VTD_SW_W | VTD_REF | VTD_WIRED -#define TTE_KERNEL_MINFLAGS VTD_V | VTD_CP | VTD_CV | VTD_P +#define TTE_KERNEL_MINFLAGS VTD_P #define TTE_MINFLAGS VTD_V | VTD_CP | VTD_CV #define VTD_SIZE_BITS (4) From owner-p4-projects@FreeBSD.ORG Fri May 5 03:38:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6938F16A42B; Fri, 5 May 2006 03:38:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4634116A402 for ; Fri, 5 May 2006 03:38:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 363D943D5E for ; Fri, 5 May 2006 03:38:43 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k453chv2043351 for ; Fri, 5 May 2006 03:38:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k453cgPH043348 for perforce@freebsd.org; Fri, 5 May 2006 03:38:42 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 5 May 2006 03:38:42 GMT Message-Id: <200605050338.k453cgPH043348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 03:38:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=96678 Change 96678 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/05 03:38:34 atomically clear and set active bits Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#20 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#20 (text+ko) ==== @@ -40,6 +40,22 @@ #define PCB_REG %g6 +#define ATOMIC_CLEAR_INT_BIT(addr, old, bit, new, label) \ + lduw [addr], old ; \ +label: andn old, bit, new ; \ + cas [addr], old, new ; \ + cmp old, new ; \ + bne,pn %icc, label ## b ; \ + mov new, old + +#define ATOMIC_SET_INT_BIT(addr, old, bit, new, label) \ + lduw [addr], old ; \ +label: or old, bit, new ; \ + cas [addr], old, new ; \ + cmp old, new ; \ + bne,pn %icc, label ## b ; \ + mov new, old + /* * void cpu_throw(struct thread *old, struct thread *new) */ @@ -127,9 +143,7 @@ ldx [PCB_REG + PCB_PC], %i7 sub %fp, CCFSZ, %sp - - - /* + /* * Point to the pmaps of the new process, and of the last non-kernel * process to run. */ @@ -164,30 +178,14 @@ * Mark the old pmap as no longer active on this CPU */ add %l2, PM_ACTIVE, %l2 - lduw [%l2], %l3 -8: andn %l3, %l4, %l6 - cas [%l2], %l3, %l6 - cmp %l3, %l6 - bne,pn %icc, 8b - mov %l3, %l6 + ATOMIC_CLEAR_INT_BIT(%l2, %l3, %l4, %l6, 8) - /* - * Mark the new pmap as active on this CPU - * XXX need to CAS - */ 10: - lduw [%i2 + PM_ACTIVE], %l3 - or %l3, %l4, %l3 - stw %l3, [%i2 + PM_ACTIVE] + add %i2, PM_ACTIVE, %i3 + ATOMIC_SET_INT_BIT(%i3, %l3, %l4, %l6, 11) - /* - * Mark the new pmap as possibly having TLB entries on this CPU - * XXX need to CAS - */ - lduw [%i2 + PM_TLBACTIVE], %l3 - or %l3, %l4, %l3 - stw %l3, [%i2 + PM_TLBACTIVE] - + add %i2, PM_TLBACTIVE, %i3 + ATOMIC_SET_INT_BIT(%i3, %l3, %l4, %l6, 12) mov SCRATCH_REG_HASH_USER, %l6 mov SCRATCH_REG_TSB_USER, %l7 From owner-p4-projects@FreeBSD.ORG Fri May 5 03:40:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCA3516A40B; Fri, 5 May 2006 03:40:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5C71716A409 for ; Fri, 5 May 2006 03:40:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CCBC43D48 for ; Fri, 5 May 2006 03:40:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k453ejID044890 for ; Fri, 5 May 2006 03:40:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k453ejmZ044884 for perforce@freebsd.org; Fri, 5 May 2006 03:40:45 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 5 May 2006 03:40:45 GMT Message-Id: <200605050340.k453ejmZ044884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 03:40:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=96679 Change 96679 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/05 03:40:00 agressively use membars when setting the ipi ackmask and follow the solaris convention of explicitly reloading on a mismatch Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#8 (text+ko) ==== @@ -427,13 +427,14 @@ ENTRY(set_ackmask) GET_PCPU_PHYS_SCRATCH(%g6) wr %g0, ASI_REAL, %asi + membar #LoadStore|#StoreStore lda [%g3]%asi, %g1 lda [PCPU(CPUMASK)]%asi, %g4 1: or %g1, %g4, %g2 casa [%g3]%asi, %g1, %g2 cmp %g1, %g2 - bne,pn %icc, 1b - mov %g2, %g1 + bne,a,pn %icc, 1b + lda [%g3]%asi, %g1 ba,a,pt %xcc, cpu_mondo - membar #StoreLoad + membar #StoreLoad|#StoreStore END(set_ackmask) From owner-p4-projects@FreeBSD.ORG Fri May 5 03:46:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B56016A407; Fri, 5 May 2006 03:46:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2E66216A401 for ; Fri, 5 May 2006 03:46:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE48343D49 for ; Fri, 5 May 2006 03:46:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k453krto047099 for ; Fri, 5 May 2006 03:46:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k453krAI047096 for perforce@freebsd.org; Fri, 5 May 2006 03:46:53 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 5 May 2006 03:46:53 GMT Message-Id: <200605050346.k453krAI047096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 03:46:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=96680 Change 96680 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/05 03:46:27 clean up tte_hash_destroy tighten up insertion sanity checks Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#18 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#18 (text+ko) ==== @@ -219,24 +219,7 @@ void tte_hash_destroy(tte_hash_t th) { - vm_page_t m, hash_pages[MAX_HASH_SIZE]; - int i; - panic("FIXME"); - for (i = 0; i < th->th_size; i++) - hash_pages[i] = PHYS_TO_VM_PAGE(vtophys(((char *)th->th_hashtable) + i*PAGE_SIZE)); - - pmap_qremove((vm_offset_t)th->th_hashtable, th->th_size); - - vm_page_lock_queues(); - for (i = 0; i < th->th_size; i++) { - m = hash_pages[i]; - - m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free_zero(m); - } - vm_page_unlock_queues(); free_tte_hash(th); } @@ -284,8 +267,6 @@ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); - - tte_data = 0; hash_bucket_lock(fields); @@ -294,6 +275,8 @@ if (tte_data == 0) goto done; + th->th_entries--; + for (i = 0; (i < 4) && (fields[i + 1].tte.tag != 0); i++) ; lastindex = i; @@ -338,7 +321,7 @@ fields[cookie].tte.data = tte_data | (fields[cookie].tte.data & VTD_LOCK); fields[cookie].tte.tag = tte_tag; - if (cookie == 4) + if (cookie == 3) panic("collision handling unimplemented - please re-consider"); hash_bucket_unlock_inline(fields); @@ -428,6 +411,9 @@ #ifdef TTE_DEBUG printf("tte_hash_update(va=0x%lx, tte_data=0x%lx, index=%d)\n", va, tte_data, cookie); #endif + if (cookie == 3) + panic("collision handling unimplemented - please re-consider"); + fields[cookie].tte.tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); fields[cookie].tte.data = tte_data | (fields[cookie].tte.data & VTD_LOCK); hash_bucket_unlock_inline(fields); From owner-p4-projects@FreeBSD.ORG Fri May 5 03:47:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24DD216A405; Fri, 5 May 2006 03:47:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E160616A403 for ; Fri, 5 May 2006 03:47:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE39343D45 for ; Fri, 5 May 2006 03:47:55 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k453ltVg047167 for ; Fri, 5 May 2006 03:47:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k453ltN9047164 for perforce@freebsd.org; Fri, 5 May 2006 03:47:55 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 5 May 2006 03:47:55 GMT Message-Id: <200605050347.k453ltN9047164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 03:47:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=96681 Change 96681 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/05 03:47:52 don't set a low MP_TICK_QUALITY on sun4v improve pstate panic message in idle Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#21 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#21 (text+ko) ==== @@ -144,7 +144,16 @@ */ #define UP_TICK_QUALITY 1000 +#ifdef SUN4V +#define MP_TICK_QUALITY 1000 +#else #define MP_TICK_QUALITY -100 +#endif + + + + + static struct timecounter tick_tc; char sparc64_model[32]; @@ -264,6 +273,7 @@ if (td->td_md.md_spinlock_count == 0) { intr_restore(td->td_md.md_saved_pil); } + } unsigned @@ -628,8 +638,8 @@ critical_enter(); if ((tf->tf_fprs & FPRS_FEF) != 0) { savefpctx(pcb->pcb_ufp); + pcb->pcb_flags |= PCB_FEF; tf->tf_fprs &= ~FPRS_FEF; - pcb->pcb_flags |= PCB_FEF; } if ((pcb->pcb_flags & PCB_FEF) != 0) { bcopy(pcb->pcb_ufp, mc->mc_fp, sizeof(mc->mc_fp)); @@ -738,7 +748,7 @@ if (rdpr(pil) != 0) panic("pil in cpu_idle not 0 - %ld", rdpr(pil)); if (rdpr(pstate) != 0x16) - panic("interrupts disabled in cpu_idle %ld", rdpr(pstate)); + panic("interrupts disabled in cpu_idle 0x%lx", rdpr(pstate)); /* XXX heinous hack begin*/ cpu_yield(); @@ -795,6 +805,7 @@ tf->tf_out[0] = stack; tf->tf_out[3] = p->p_sysent->sv_psstrings; tf->tf_out[6] = sp - SPOFF - sizeof(struct frame); + tf->tf_tnpc = entry + 4; tf->tf_tpc = entry; tf->tf_tstate = TSTATE_IE | TSTATE_PEF | TSTATE_MM_TSO; From owner-p4-projects@FreeBSD.ORG Fri May 5 05:22:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 371DC16A402; Fri, 5 May 2006 05:22:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EBECC16A401 for ; Fri, 5 May 2006 05:22:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF9FD43D45 for ; Fri, 5 May 2006 05:22:52 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k455Mq9r009685 for ; Fri, 5 May 2006 05:22:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k455MqpW009676 for perforce@freebsd.org; Fri, 5 May 2006 05:22:52 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 5 May 2006 05:22:52 GMT Message-Id: <200605050522.k455MqpW009676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 05:22:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=96686 Change 96686 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/05 05:22:22 switch over to using hash field reference in preparation for handling an arbitrary number of collisions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#19 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#19 (text+ko) ==== @@ -224,9 +224,15 @@ free_tte_hash(th); } +static __inline void +tte_hash_set_field(tte_hash_field_t field, uint64_t tag, tte_t tte) +{ + field->tte.tag = tag; + field->tte.data = tte | (field->tte.data & VTD_LOCK); +} static __inline tte_t -tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, int *index) +tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, tte_hash_field_t *field) { uint64_t hash_shift, hash_index; tte_hash_field_t fields; @@ -245,8 +251,8 @@ break; } } - if (index) - *index = i; + if (field && i < 4) + *field = &fields[i]; /* * XXX handle the case of collisions > 3 */ @@ -258,8 +264,8 @@ tte_hash_delete(tte_hash_t th, vm_offset_t va) { uint64_t hash_shift, hash_index; - tte_hash_field_t fields; - int i, vaindex, lastindex; + tte_hash_field_t fields, lookup_field, last_field; + int i; tte_t tte_data; /* XXX - only handle 8K pages for now */ @@ -270,7 +276,7 @@ hash_bucket_lock(fields); - tte_data = tte_hash_lookup_inline(th, va, &vaindex); + tte_data = tte_hash_lookup_inline(th, va, &lookup_field); if (tte_data == 0) goto done; @@ -279,16 +285,12 @@ for (i = 0; (i < 4) && (fields[i + 1].tte.tag != 0); i++) ; - lastindex = i; + last_field = &fields[i]; - if (vaindex != lastindex) { - fields[vaindex].tte.tag = fields[lastindex].tte.tag; - fields[vaindex].tte.data = fields[lastindex].tte.data | - (fields[vaindex].tte.data & VTD_LOCK); - } - fields[lastindex].tte.tag = 0; - fields[lastindex].tte.data = 0 | (fields[lastindex].tte.data & VTD_LOCK); - + if (lookup_field != last_field) + tte_hash_set_field(lookup_field, last_field->tte.tag, last_field->tte.data); + + tte_hash_set_field(last_field, 0, 0); done: hash_bucket_unlock_inline(fields); @@ -300,8 +302,7 @@ { uint64_t hash_shift, hash_index, tte_tag; - tte_hash_field_t fields; - int cookie; + tte_hash_field_t fields, lookup_field; tte_t otte_data; @@ -313,17 +314,13 @@ tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); hash_bucket_lock(fields); - otte_data = tte_hash_lookup_inline(th, va, &cookie); + otte_data = tte_hash_lookup_inline(th, va, &lookup_field); #ifdef DEBUG if (otte_data) panic("mapping for va=0x%lx already exists tte_data=0x%lx\n", va, otte_data); #endif - fields[cookie].tte.data = tte_data | (fields[cookie].tte.data & VTD_LOCK); - fields[cookie].tte.tag = tte_tag; - - if (cookie == 3) - panic("collision handling unimplemented - please re-consider"); - + tte_hash_set_field(lookup_field, tte_tag, tte_data); + hash_bucket_unlock_inline(fields); th->th_entries++; } @@ -397,25 +394,25 @@ tte_hash_update(tte_hash_t th, vm_offset_t va, tte_t tte_data) { uint64_t hash_shift, hash_index; - tte_hash_field_t fields; - int cookie; + tte_hash_field_t fields, lookup_field; tte_t otte_data; - + uint64_t tag; + /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); hash_bucket_lock(fields); - otte_data = tte_hash_lookup_inline(th, va, &cookie); + otte_data = tte_hash_lookup_inline(th, va, &lookup_field); #ifdef TTE_DEBUG printf("tte_hash_update(va=0x%lx, tte_data=0x%lx, index=%d)\n", va, tte_data, cookie); #endif - if (cookie == 3) - panic("collision handling unimplemented - please re-consider"); + + tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); + + tte_hash_set_field(lookup_field, tag, tte_data); - fields[cookie].tte.tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); - fields[cookie].tte.data = tte_data | (fields[cookie].tte.data & VTD_LOCK); hash_bucket_unlock_inline(fields); if (otte_data == 0) From owner-p4-projects@FreeBSD.ORG Fri May 5 13:34:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F85616A403; Fri, 5 May 2006 13:34:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D547D16A401 for ; Fri, 5 May 2006 13:34:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8898C43D4C for ; Fri, 5 May 2006 13:34:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k45DYpYg042084 for ; Fri, 5 May 2006 13:34:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k45DYo17042063 for perforce@freebsd.org; Fri, 5 May 2006 13:34:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 13:34:50 GMT Message-Id: <200605051334.k45DYo17042063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 13:34:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=96699 Change 96699 by rwatson@rwatson_zoo on 2006/05/05 13:34:02 Integrate audit.4 to auditpipe.4; audit pipes are now complicated enough that they require their own man page. Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri May 5 13:34:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCE3C16A46A; Fri, 5 May 2006 13:34:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6A99816A468 for ; Fri, 5 May 2006 13:34:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F5B043D4C for ; Fri, 5 May 2006 13:34:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k45DYq0M042103 for ; Fri, 5 May 2006 13:34:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k45DYpog042093 for perforce@freebsd.org; Fri, 5 May 2006 13:34:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 13:34:51 GMT Message-Id: <200605051334.k45DYpog042093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 13:34:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=96700 Change 96700 by rwatson@rwatson_zoo on 2006/05/05 13:34:03 Add three new ioctls to audit pipes: AUDITPIPE_DELETE_AUID, which will delete the preselection state for a particular auid on the pipe, and AUDITPIPE_{GET/SET}_PRESELECT_TRAIL, which set the AUDIT_PIPE_TRAIL flag on the pipe, which indicates that the pipe will follow the trail preselection model, rather than using its own preselection settings. This is now the default, restoring the behavior of praudit(1) on /dev/auditpipe to its default prior to adding preselection magic. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#28 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#8 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#19 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#27 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#28 (text+ko) ==== @@ -389,7 +389,8 @@ ar->k_ar_commit |= AR_COMMIT_KERNEL; if (au_preselect(event, class, aumask, sorf) != 0) ar->k_ar_commit |= AR_PRESELECT_TRAIL; - if (audit_pipe_preselect(auid, event, class, sorf) != 0) + if (audit_pipe_preselect(auid, event, class, sorf, + ar->k_ar_commit & AR_PRESELECT_TRAIL) != 0) ar->k_ar_commit |= AR_PRESELECT_PIPE; if ((ar->k_ar_commit & (AR_PRESELECT_TRAIL | AR_PRESELECT_PIPE)) == 0) { @@ -511,7 +512,7 @@ panic("audit_failing_stop: thread continued"); } td->td_ar = audit_new(event, td); - } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH)) + } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH, 0)) td->td_ar = audit_new(event, td); else td->td_ar = NULL; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#8 (text+ko) ==== @@ -59,8 +59,11 @@ struct auditpipe_preselect) #define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ struct auditpipe_preselect) -#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 12) -#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 13) +#define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) +#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) +#define AUDITPIPE_GET_PRESELECT_TRAIL _IOR(AUDITPIPE_IOBASE, 14, int) +#define AUDITPIPE_SET_PRESELECT_TRAIL _IOW(AUDITPIPE_IOBASE, 14, int) +#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 15) /* * Ioctls to retrieve audit pipe statistics. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#19 (text+ko) ==== @@ -103,6 +103,7 @@ */ #define AUDIT_PIPE_ASYNC 0x00000001 #define AUDIT_PIPE_NBIO 0x00000002 +#define AUDIT_PIPE_TRAIL 0x00000004 /* Use trail preselection. */ struct audit_pipe { int ap_open; /* Device open? */ u_int ap_flags; @@ -200,16 +201,25 @@ /* * Determine whether a specific audit pipe matches a record with these - * properties. + * properties. Algorithm is as follows: + * + * - If the pipe is configured to track the default trail configuration, then + * use that. + * - If not, search for a specifically configured auid entry matching the + * event. If it is found, use that. + * - Otherwise, use the default flags or naflags configured for the pipe. */ static int audit_pipe_preselect_check(struct audit_pipe *ap, au_id_t auid, - au_event_t event, au_class_t class, int sorf) + au_event_t event, au_class_t class, int sorf, int trail_preselect) { struct audit_pipe_preselect *app; mtx_assert(&audit_pipe_mtx, MA_OWNED); + if ((ap->ap_flags & AUDIT_PIPE_TRAIL) && trail_preselect) + return (1); + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { if (app->app_auid == auid) break; @@ -232,13 +242,14 @@ */ int audit_pipe_preselect(au_id_t auid, au_event_t event, au_class_t class, - int sorf) + int sorf, int trail_preselect) { struct audit_pipe *ap; mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { - if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf, + trail_preselect)) { mtx_unlock(&audit_pipe_mtx); return (1); } @@ -301,7 +312,7 @@ */ void audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, int sorf, - void *record, u_int record_len) + int trail_select, void *record, u_int record_len) { struct audit_pipe *ap; @@ -313,7 +324,8 @@ mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { - if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + if (audit_pipe_preselect_check(ap, auid, event, class, sorf, + trail_select)) audit_pipe_append(ap, record, record_len); } audit_pipe_records++; @@ -387,20 +399,15 @@ TAILQ_INIT(&ap->ap_queue); /* - * Initialize pre-selection state to match all events by default, and - * have no particular auid-specific entries. This allows praudit(1) - * to be run directly on an audit pipe without any configuration or - * special handling. However, it also requires that applications - * flush the pipe after specifying preselection prequirements so that - * they don't see events captured before they completed - * configuration. + * Default flags, naflags, and auid-specific preselection settings to + * 0. Initialize the AUDIT_PIPE_TRAIL flag so that if praudit(1) is + * run on /dev/auditpipe, it sees events associated with the default + * trail. Pipe-aware application can clear the flag, set custom + * masks, and flush the pipe as needed. */ bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); - ap->ap_preselect_flags.am_success = 0xffffffff; - ap->ap_preselect_flags.am_failure = 0xffffffff; bzero(&ap->ap_preselect_naflags, sizeof(ap->ap_preselect_naflags)); - ap->ap_preselect_naflags.am_success = 0xffffffff; - ap->ap_preselect_naflags.am_failure = 0xffffffff; + ap->ap_flags |= AUDIT_PIPE_TRAIL; TAILQ_INIT(&ap->ap_preselect_list); TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); @@ -535,6 +542,7 @@ struct auditpipe_preselect *aps; struct audit_pipe *ap; au_mask_t *maskp; + au_id_t auid; int error; ap = dev->si_drv1; @@ -650,10 +658,28 @@ error = EOPNOTSUPP; break; + case AUDITPIPE_DELETE_PRESELECT_AUID: + auid = *(au_id_t *)data; + error = EOPNOTSUPP; + break; + case AUDITPIPE_FLUSH_PRESELECT_AUID: error = EOPNOTSUPP; break; + case AUDITPIPE_GET_PRESELECT_TRAIL: + *(int *)data = (ap->ap_flags & AUDIT_PIPE_TRAIL) ? 1 : 0; + error = 0; + break; + + case AUDITPIPE_SET_PRESELECT_TRAIL: + if (*(int *)data) + ap->ap_flags |= AUDIT_PIPE_TRAIL; + else + ap->ap_flags &= ~AUDIT_PIPE_TRAIL; + error = 0; + break; + case AUDITPIPE_FLUSH: audit_pipe_flush(ap); error = 0; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#27 (text+ko) ==== @@ -344,9 +344,9 @@ * Audit pipe functions. */ int audit_pipe_preselect(au_id_t auid, au_event_t event, - au_class_t class, int sorf); + au_class_t class, int sorf, int trail_select); void audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, - int sorf, void *record, u_int record_len); + int sorf, int trail_select, void *record, u_int record_len); void audit_pipe_submit_user(void *record, u_int record_len); #endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#11 (text+ko) ==== @@ -373,7 +373,8 @@ } if (ar->k_ar_commit & AR_PRESELECT_PIPE) audit_pipe_submit(auid, event, class, sorf, - bsm->data, bsm->len); + ar->k_ar_commit & AR_PRESELECT_TRAIL, bsm->data, + bsm->len); kau_free(bsm); } From owner-p4-projects@FreeBSD.ORG Fri May 5 13:59:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12C3816A419; Fri, 5 May 2006 13:59:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 919D416A400 for ; Fri, 5 May 2006 13:59:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A8F943DA8 for ; Fri, 5 May 2006 13:59:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k45DxQ8M058232 for ; Fri, 5 May 2006 13:59:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k45DxQ6k058220 for perforce@freebsd.org; Fri, 5 May 2006 13:59:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 13:59:26 GMT Message-Id: <200605051359.k45DxQ6k058220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96701 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 13:59:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=96701 Change 96701 by rwatson@rwatson_zoo on 2006/05/05 13:58:05 Create more detailed auditpipe(4) page by removing audit(4) information from auditpipe(4) and vice versa; add a long and possibly accurate section on the auditpipe ioctls used to configure audit pipes. Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#2 edit .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/share/man/man4/audit.4,v 1.6 2006/02/06 20:27:00 rwatson Exp $ .\" -.Dd February 6, 2006 +.Dd May 5, 2006 .Os .Dt AUDIT 4 .Sh NAME @@ -62,37 +62,11 @@ space conditions, and requests to terminate auditing. This device is not intended for use by applications. .Ss Audit Pipe Special Devices -While audit trail files maintained by -.Xr auditd 8 -provide a reliable long-term store for audit log information, current log -files are owned by the audit daemon until terminated making them somewhat -unwieldy for live montoring applications such as host-based intrusion -detection. -For example, the log may be cycled and new records written to a new file -without notice to applications that may be accessing the file. -.Pp -The audit facility provides an audit pipe facility for applications requiring -direct access to live BSM audit data for the purposes of real-time -monitoring. -Audit pipes are available via a clonable special device, -.Pa /dev/auditpipe , -subject to the permissions on the device node, and provide a -.Qq tee -of the audit event stream. -As the device is clonable, more than one instance of the device may be opened -at a time; each device instance will provide access to all records. -.Pp -The audit pipe device provides discreet BSM audit records; if the read buffer -passed by the application is too small to hold the next record in the -sequence, it will be dropped. -Unlike audit data written to the audit trail, the reliability of record -delivery is not guaranteed. -In particular, when an audit pipe queue fills, records will be dropped. -Audit pipe devices are blocking by default, but support non-blocking I/O, -asynchronous I/O using SIGIO, and support for polled operation via -.Xr select 2 -and -.Xr poll 2 . +Audit pipe special devices, discussed in +.Xr auditpipe 4 , +provide a configurable live tracking mechanism to allow applications to +tee the audit trail, as well as to configure custom preselection paramaters +to track users and events in a fine-grained manner. .Sh SEE ALSO .Xr auditreduce 1 , .Xr praudit 1 , @@ -106,6 +80,7 @@ .Xr setaudit 2 , .Xr setauid 2 , .Xr libbsm 3 , +.Xr auditpipe 4 , .Xr audit.log 5 , .Xr audit_class 5 , .Xr audit_control 5 , ==== //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#2 (text+ko) ==== @@ -22,48 +22,22 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/audit.4,v 1.6 2006/02/06 20:27:00 rwatson Exp $ +.\" $FreeBSD$ .\" -.Dd February 6, 2006 +.Dd May 5, 2006 .Os -.Dt AUDIT 4 +.Vt AUDITPIPE 4 .Sh NAME -.Nm audit -.Nd Security Event Audit +.Nm auditpipe +.Nd Pseudo-device for live audit event tracking .Sh SYNOPSIS .Cd "options AUDIT" .Sh DESCRIPTION -Security Event Audit is a facility to provide fine-grained, configurable -logging of security-relevant events, and is intended to meet the requirements -of the Common Criteria (CC) Common Access Protection Profile (CAPP) -evaluation. -The -.Fx -audit facility implements the de facto industry standard BSM API, file -formats, and command line interface, first found in the Solaris operating -system. -Information on the user space implementation can be found in -.Xr libbsm 3 . -.Pp -Audit support is enabled at boot, if present in the kernel, using an -.Xr rc.conf 5 -flag. -The audit daemon, -.Xr auditd 8 , -is responsible for configuring the kernel to perform audit, pushing -configuration data from the various audit configuration files into the -kernel. -.Ss Audit Special Device -The kernel audit facility provides a special device, -.Pa /dev/audit , -which is used by +While audit trail files +generated with +.Xr audit 4 +and maintained by .Xr auditd 8 -to monitor for audit events, such as requests to cycle the log, low disk -space conditions, and requests to terminate auditing. -This device is not intended for use by applications. -.Ss Audit Pipe Special Devices -While audit trail files maintained by -.Xr auditd 8 provide a reliable long-term store for audit log information, current log files are owned by the audit daemon until terminated making them somewhat unwieldy for live montoring applications such as host-based intrusion @@ -93,38 +67,128 @@ .Xr select 2 and .Xr poll 2 . +.Ss Preselection +By default, the audit pipe facility configures pipes to present records +matched by the system-wide audit trail, configured by +.Xr auditd 8 . +However, the preselection mechanism for audit pipes can be configured using +alternative criteria, including pipe-local flags and naflags settings, as +well as auid-specific selection masks. +.Ss Ioctls +These properties are configured using ioctls on the open audit pipe device. +.Bl -tag -width AUDITPIPE_DELETE_PRESELECT_AUID +.It AUDITPIPE_GET_QLEN +Query the current number of records available for reading on the pipe. +.It AUDITPIPE_GET_QLIMIT +Retrieve the current maximum number of records that may be queued for reading +on the pipe. +.It AUDITPIPE_SET_QLIMIT +Set the current maximum number of records that may be queued for reading on +the pipe. +The new limit must fall between the queue limit minimum and queue limit +maximum queryable using the following two ioctls. +.It AUDITPIPE_GET_QLIMIT_MIN +Query the lowest possible maximum number of records that may be queued for +reading on the pipe. +.It AUDITPIPE_GET_QLIMIT_MAX +Query the highest possible maximum number of records that may be queued for +reading on the pipe. +.It AUDITPIPE_GET_PRESELECT_FLAGS +Retrieve the current default preselection flags for attributable events on +the pipe. +These flags correspond to the +.Dv flags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_SET_PRESELECT_FLAGS +Set the current default preselection flags for attributable events on the +pipe. +These flags correspond to the +.Dv flags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_GET_PRESELECT_NAFLAGS +Retrieve the current default preselection flags for non-attributable events +on the pipe. +These flags correspond to the +.Dv naflags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_SET_PRESELECT_NAFLAGS +Set the current default preselection flags for non-attributable events on the +pipe. +These flags correspond to the +.Dv naflags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_GET_PRESELECT_AUID +Query the current preselection masks for a specific auid on the pipe. +The ioctl argument should be of type +.Vt struct auditpipe_preselect . +The auid to query is specified via the +.Va ap_auid +field; the mask will be returned via +.Va ap_mask +of type +.Vt au_mask_t . +.It AUDITPIPE_SET_PRESELECT_AUID +Set the current preselection masks for a specific auid on the pipe. +Arguments are identical to +.Dv AUDITPIPE_GET_PRESELECT_AUID, +except that the caller should properly initialize the +.Va ap_mask +field to hold the desired preselection mask. +.It AUDITPIPE_DELETE_PRESELECT_AUID +Delete the current preselection mask for a specific auid on the pipe. +Once called, events associated with the specified auid will use the default +flags mask. +.It AUDITPIPE_FLUSH_PRESELECT_AUID +Delete all auid specific preselection specifications. +.It AUDITPIPE_GET_PRESELECT_TRAIL +Return the current value of the preselection trail flag on the audit pipe; +this flag indicates that the system audit trail preselection masks are to be +used in selecting which events can be read from the audit pipe. +If the value is 1, the trail masks are used; if the value is 0, then the +pipe preselection masks will be used. +The ioctl argument should be of type +.Vt int . +.It AUDITPIPE_SET_PRESELECT_TRAIL +Set the current value of the preselection trail flag on the audit pipe, with +values as described for +.Dv AUDITPIPE_GET_PRESELECT_TRAIL. +The ioctl argument should be of type +.Vt int . +.It AUDITPIPE_FLUSH +Flush all outstanding records on the audit pipe; useful after setting initial +preselection properties to delete records queued during the configuration +process which may not match the interests of the user process. +.El +.Sh EXAMPLES +.Xr praudit 1 +may be directly executed on +.Pa /dev/auditpipe +to review the default audit trail. .Sh SEE ALSO -.Xr auditreduce 1 , -.Xr praudit 1 , -.Xr audit 2 , -.Xr auditctl 2 , -.Xr auditon 2 , -.Xr getaudit 2 , -.Xr getauid 2 , .Xr poll 2 , .Xr select 2 , -.Xr setaudit 2 , -.Xr setauid 2 , -.Xr libbsm 3 , -.Xr audit.log 5 , -.Xr audit_class 5 , +.Xr audit 4 , .Xr audit_control 5 , -.Xr audit_event 5 , -.Xr audit_user 5 , -.Xr audit_warn 5 , -.Xr rc.conf 5 , .Xr audit 8 , .Xr auditd 8 .Sh AUTHORS -This software was created by McAfee Research, the security research division -of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +The audit pipe facility was created by +.An Robert Watson Aq rwatson@FreeBSD.org . .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Pp -This manual page was written by -.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. @@ -132,23 +196,8 @@ the OpenBSM distribution. .Pp Support for kernel audit first appeared in -.Fx 6.1 . +.Fx 6.2 . .Sh BUGS -The audit facility in -.Fx -is considered experimental, and production deployment should occur only after -careful consideration of the risks of deploying experimental software. -.Pp -The -.Fx -kernel does not fully validate that audit records submitted by user -applications are syntactically valid BSM; as submission of records is limited -to privileged processes, this is not a critical bug. -.Pp -Instrumentation of auditable events in the kernel is not complete, as some -system calls do not generate audit records, or generate audit records with -incomplete argument information. -.Pp -Mandatory Access Control (MAC) labels, as provided by the -.Xr mac 4 -facility, are not audited as part of records involving MAC decisions. +See the +.Xr audit 4 +man page for information on audit-related bugs and limitations. From owner-p4-projects@FreeBSD.ORG Fri May 5 14:00:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C428F16A411; Fri, 5 May 2006 14:00:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9EF2B16A40F for ; Fri, 5 May 2006 14:00:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6316743D67 for ; Fri, 5 May 2006 14:00:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k45E0kji059112 for ; Fri, 5 May 2006 14:00:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k45E0kES059109 for perforce@freebsd.org; Fri, 5 May 2006 14:00:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 14:00:46 GMT Message-Id: <200605051400.k45E0kES059109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96702 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 14:00:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=96702 Change 96702 by rwatson@rwatson_zoo on 2006/05/05 13:59:44 Correct copy/paste-o: use different ioctl numbers for different ioctls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#9 (text+ko) ==== @@ -62,8 +62,8 @@ #define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) #define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) #define AUDITPIPE_GET_PRESELECT_TRAIL _IOR(AUDITPIPE_IOBASE, 14, int) -#define AUDITPIPE_SET_PRESELECT_TRAIL _IOW(AUDITPIPE_IOBASE, 14, int) -#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 15) +#define AUDITPIPE_SET_PRESELECT_TRAIL _IOW(AUDITPIPE_IOBASE, 15, int) +#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 16) /* * Ioctls to retrieve audit pipe statistics. From owner-p4-projects@FreeBSD.ORG Fri May 5 16:11:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B36516A402; Fri, 5 May 2006 16:11:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5075416A400 for ; Fri, 5 May 2006 16:11:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D87E43D55 for ; Fri, 5 May 2006 16:11:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k45GBPfT030766 for ; Fri, 5 May 2006 16:11:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k45GBPFX030758 for perforce@freebsd.org; Fri, 5 May 2006 16:11:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 16:11:25 GMT Message-Id: <200605051611.k45GBPFX030758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 16:11:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=96706 Change 96706 by rwatson@rwatson_zoo on 2006/05/05 16:11:23 First pass implementations of get / set / delete / flush auid preselection rules. Not tested. Rename auditpipe_preselect to auditpipe_ioctl_preselect as an ioctl argument to prevent excessively similar name to audit_pipe_preselect. It's still not a very good structure name, as the string 'auid' should probably appear in it. Add better locking for various ioctls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#10 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#10 (text+ko) ==== @@ -38,9 +38,9 @@ * structures, add new revised ones to be used by new ioctls, and keep the * old structures and ioctls for backwards compatibility. */ -struct auditpipe_preselect { - au_id_t ap_auid; - au_mask_t ap_mask; +struct auditpipe_ioctl_preselect { + au_id_t aip_auid; + au_mask_t aip_mask; }; /* @@ -56,9 +56,9 @@ #define AUDITPIPE_GET_PRESELECT_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) #define AUDITPIPE_SET_PRESELECT_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) #define AUDITPIPE_GET_PRESELECT_AUID _IOR(AUDITPIPE_IOBASE, 10, \ - struct auditpipe_preselect) + struct auditpipe_ioctl_preselect) #define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ - struct auditpipe_preselect) + struct auditpipe_ioctl_preselect) #define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) #define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) #define AUDITPIPE_GET_PRESELECT_TRAIL _IOR(AUDITPIPE_IOBASE, 14, int) ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#20 (text+ko) ==== @@ -200,6 +200,97 @@ } /* + * Find an audit pipe preselection specification for an auid, if any. + */ +static struct audit_pipe_preselect * +audit_pipe_preselect_find(struct audit_pipe *ap, au_id_t auid) +{ + struct audit_pipe_preselect *app; + + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { + if (app->app_auid == auid) + return (app); + } + return (NULL); +} + +static int +audit_pipe_preselect_get(struct audit_pipe *ap, au_id_t auid, + au_mask_t *maskp) +{ + struct audit_pipe_preselect *app; + int error; + + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app != NULL) { + *maskp = app->app_mask; + error = 0; + } else + error = ENOENT; + mtx_unlock(&audit_pipe_mtx); + return (error); +} + +static void +audit_pipe_preselect_set(struct audit_pipe *ap, au_id_t auid, au_mask_t mask) +{ + struct audit_pipe_preselect *app, *app_new; + + /* + * Pessimistically assume that the auid doesn't already have a mask + * set, and allocate. We will free it if it is unneeded. + */ + app_new = malloc(sizeof(*app_new), M_AUDIT_PIPE_PRESELECT, M_WAITOK); + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app == NULL) { + app = app_new; + app_new = NULL; + app->app_auid = auid; + TAILQ_INSERT_TAIL(&ap->ap_preselect_list, app, app_list); + } + app->app_mask = mask; + mtx_unlock(&audit_pipe_mtx); + if (app_new != NULL) + free(app_new, M_AUDIT_PIPE_PRESELECT); +} + +static int +audit_pipe_preselect_delete(struct audit_pipe *ap, au_id_t auid) +{ + struct audit_pipe_preselect *app; + int error; + + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app != NULL) { + TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); + error = 0; + } else + error = ENOENT; + mtx_unlock(&audit_pipe_mtx); + if (app != NULL) + free(app, M_AUDIT_PIPE_PRESELECT); + return (error); +} + +static void +audit_pipe_preselect_flush(struct audit_pipe *ap) +{ + struct audit_pipe_preselect *app; + + mtx_lock(&audit_pipe_mtx); + while ((app = TAILQ_FIRST(&ap->ap_preselect_list)) != NULL) { + TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); + free(app, M_AUDIT_PIPE_PRESELECT); + } + mtx_unlock(&audit_pipe_mtx); +} + +/* * Determine whether a specific audit pipe matches a record with these * properties. Algorithm is as follows: * @@ -220,10 +311,7 @@ if ((ap->ap_flags & AUDIT_PIPE_TRAIL) && trail_preselect) return (1); - TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { - if (app->app_auid == auid) - break; - } + app = audit_pipe_preselect_find(ap, auid); if (app == NULL) { if (auid == AU_DEFAUDITID) return (au_preselect(event, class, @@ -539,7 +627,7 @@ audit_pipe_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { - struct auditpipe_preselect *aps; + struct auditpipe_ioctl_preselect *aip; struct audit_pipe *ap; au_mask_t *maskp; au_id_t auid; @@ -625,63 +713,80 @@ break; case AUDITPIPE_GET_PRESELECT_FLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; *maskp = ap->ap_preselect_flags; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_SET_PRESELECT_FLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; ap->ap_preselect_flags = *maskp; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_GET_PRESELECT_NAFLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; *maskp = ap->ap_preselect_naflags; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_SET_PRESELECT_NAFLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; ap->ap_preselect_naflags = *maskp; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_GET_PRESELECT_AUID: - aps = (struct auditpipe_preselect *)data; - error = EOPNOTSUPP; + aip = (struct auditpipe_ioctl_preselect *)data; + error = audit_pipe_preselect_get(ap, aip->aip_auid, + &aip->aip_mask); break; case AUDITPIPE_SET_PRESELECT_AUID: - aps = (struct auditpipe_preselect *)data; - error = EOPNOTSUPP; + aip = (struct auditpipe_ioctl_preselect *)data; + audit_pipe_preselect_set(ap, aip->aip_auid, aip->aip_mask); + error = 0; break; case AUDITPIPE_DELETE_PRESELECT_AUID: auid = *(au_id_t *)data; - error = EOPNOTSUPP; + error = audit_pipe_preselect_delete(ap, auid); break; case AUDITPIPE_FLUSH_PRESELECT_AUID: - error = EOPNOTSUPP; + audit_pipe_preselect_flush(ap); + error = 0; break; case AUDITPIPE_GET_PRESELECT_TRAIL: + mtx_lock(&audit_pipe_mtx); *(int *)data = (ap->ap_flags & AUDIT_PIPE_TRAIL) ? 1 : 0; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_SET_PRESELECT_TRAIL: + mtx_lock(&audit_pipe_mtx); if (*(int *)data) ap->ap_flags |= AUDIT_PIPE_TRAIL; else ap->ap_flags &= ~AUDIT_PIPE_TRAIL; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_FLUSH: + mtx_lock(&audit_pipe_mtx); audit_pipe_flush(ap); + mtx_unlock(&audit_pipe_mtx); error = 0; break; From owner-p4-projects@FreeBSD.ORG Sat May 6 00:34:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E238516A404; Sat, 6 May 2006 00:34:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A20CE16A400 for ; Sat, 6 May 2006 00:34:25 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57BBE43D48 for ; Sat, 6 May 2006 00:34:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k460YPPK023322 for ; Sat, 6 May 2006 00:34:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k460YOvw023311 for perforce@freebsd.org; Sat, 6 May 2006 00:34:24 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 6 May 2006 00:34:24 GMT Message-Id: <200605060034.k460YOvw023311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 00:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=96722 Change 96722 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/06 00:33:31 remove initial hand memory allocation for hash tables initial cut of arbitrary collision depth handling Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#19 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#12 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#47 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#45 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#20 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#19 (text+ko) ==== @@ -183,8 +183,10 @@ ASSYM(VTD_REF, VTD_REF); ASSYM(VTD_W, VTD_W); ASSYM(VTD_SW_W, VTD_SW_W); +ASSYM(VTD_LOCK, VTD_LOCK); ASSYM(THE_SHIFT, THE_SHIFT); +ASSYM(TH_COLLISION_SHIFT, TH_COLLISION_SHIFT); ASSYM(HVTSB_PA, offsetof(struct hv_tsb_info, hvtsb_pa)); ASSYM(PM_HASHSCRATCH, offsetof(struct pmap, pm_hashscratch)); ASSYM(PM_TSBSCRATCH, offsetof(struct pmap, pm_tsbscratch)); @@ -351,3 +353,4 @@ ASSYM(VM_MIN_DIRECT_ADDRESS, VM_MIN_DIRECT_ADDRESS); ASSYM(VM_MIN_PROM_ADDRESS, VM_MIN_PROM_ADDRESS); ASSYM(VM_MAX_PROM_ADDRESS, VM_MAX_PROM_ADDRESS); + ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#12 (text+ko) ==== @@ -1,12 +1,14 @@ #ifndef _MACHINE_TTE_HASH_H_ #define _MACHINE_TTE_HASH_H_ -#define THE_SHIFT 6 /* size of hash entry is 64-bytes */ +#define THE_SHIFT 6 /* size of hash entry is 64-bytes */ +#define TH_COLLISION_SHIFT 47 /* bit 47 will never be set for a valid tag */ +#define TH_COLLISION (1UL << TH_COLLISION_SHIFT) struct tte_hash; typedef struct tte_hash *tte_hash_t; -void tte_hash_init(vm_paddr_t); +void tte_hash_init(void); void tte_hash_clear(tte_hash_t hash); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#47 (text+ko) ==== @@ -491,7 +491,7 @@ .macro spill_mixed_ktt1_sk btst 1, %sp bz,a,pt %xcc, fault_32bit_sk - srl %sp, 0, %sp + srl %sp, 0, %sp ba,a,pt %xcc, fault_64bit_sk nop .align 128 @@ -1359,13 +1359,13 @@ andn tmp, lock_bit, tmp ; \ stxa tmp, [addr + 8]%asi ; -#define HASH_LOOKUP(addr, tag, searchtag, endlabel, matchlabel) \ +#define HASH_LOOKUP(addr, tag, searchtag, faillabel, matchlabel) \ ldda [addr]%asi, tag ; \ cmp tag, searchtag ; \ be,pn %xcc, matchlabel ; \ nop ; \ cmp tag, %g0 ; \ - be,pn %xcc, endlabel ; \ + be,pn %xcc, faillabel ; \ nop #define RESTORE_TRAPWIN(pcpu, cansave, label1, label2) \ @@ -1518,18 +1518,30 @@ rdpr %tt, %g3 ! reload trap type tsb_miss_lookup_0: - HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) + HASH_LOOKUP(%g2, %l6, %l2, tsb_miss_not_found, 8f) tsb_miss_lookup_1: add %g2, 16, %g2 - HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) + HASH_LOOKUP(%g2, %l6, %l2, tsb_miss_not_found, 8f) tsb_miss_lookup_2: add %g2, 16, %g2 - HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) + HASH_LOOKUP(%g2, %l6, %l2, tsb_miss_not_found, 8f) tsb_miss_lookup_3: add %g2, 16, %g2 - HASH_LOOKUP(%g2, %l6, %l2, 7f, 8f) + HASH_LOOKUP(%g2, %l6, %l2, tsb_miss_not_found, 8f) + mov 1, %g2 + sethi %uhi(VM_MIN_DIRECT_ADDRESS), %g3 + cmp %l3, ASI_LDTD_N + sllx %g2, TH_COLLISION_SHIFT, %g2 + sllx %g3, 32, %g3 + beq,pt %xcc, 7f + nop + andn %l7, %g3, %l7 ! generate real address +7: + andcc %l6, %g2, %g0 + rdpr %tt, %g3 + bnz,a,pt %xcc, tsb_miss_lookup_0 + mov %l7, %g2 tsb_miss_not_found: -7: ! not found ! we need to jump to tl0_trap to drop us back down to tl0 ! and take us to trap(...) to service the fault wr %g0, %l3, %asi @@ -1588,9 +1600,13 @@ MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! die if all we're doing ! is storing same data #else + mov %o0, %g1 + mov %o5, %g7 PUTCHAR(0x5a) PUTCHAR(0x5a) PUTCHAR(0x5a) + mov %g1, %o0 + mov %g7, %o5 MAGIC_TRAP_ON; MAGIC_TRAP_OFF #endif 12: ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#45 (text+ko) ==== @@ -106,7 +106,6 @@ int sparc64_nmemreg; extern vm_paddr_t mmu_fault_status_area; -vm_paddr_t proc0_mem; /* @@ -631,7 +630,6 @@ */ mmu_fault_status_area = pmap_bootstrap_alloc(MMFSA_SIZE*MAXCPU); - proc0_mem = pmap_bootstrap_alloc(PAGE_SIZE*4*400); /* * Allocate and map the message buffer. */ @@ -924,19 +922,18 @@ } goto validate; - } - /* - * Mapping has changed, invalidate old range and fall through to - * handle validating new mapping. - */ - if (opa) { + } else if (opa) { + /* + * Mapping has changed, invalidate old range and fall through to + * handle validating new mapping. + */ if (otte_data & VTD_WIRED) pmap->pm_stats.wired_count--; if (otte_data & VTD_MANAGED) { om = PHYS_TO_VM_PAGE(opa); pmap_remove_entry(pmap, om, va); } - } else + } else pmap->pm_stats.resident_count++; /* @@ -1118,7 +1115,7 @@ pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); - tte_hash_init(proc0_mem); + tte_hash_init(); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#20 (text+ko) ==== @@ -59,20 +59,21 @@ #define HASH_MASK(th) ((th->th_size << (PAGE_SHIFT - THE_SHIFT)) - 1) #define HASH_VALID 0x1 + #define DEBUG struct tte_hash_entry; -typedef union { +#define MAX_FRAGMENT_ENTRIES ((PAGE_SIZE / sizeof(struct tte_hash_entry)) - 1) + +typedef union tte_hash_field_ { struct { uint64_t tag; uint64_t data; } tte; struct { - uint16_t flags; - uint16_t count; - uint32_t vapad; /* zero if this is a collision entry */ - struct tte_hash_entry *next; + uint64_t flags; + union tte_hash_field_ *next; } of; } tte_hash_field, *tte_hash_field_t; @@ -82,16 +83,33 @@ } *tte_hash_entry_t; +struct fragment_header { + struct fragment_header *fh_next; + uint16_t fh_count; + uint16_t fh_free_head; + uint16_t pad[26]; +}; + +CTASSERT(sizeof(struct fragment_header) == sizeof(struct tte_hash_entry)); + struct tte_hash { uint16_t th_size; /* size in pages */ uint16_t th_context; /* TLB context */ uint32_t th_entries; /* # pages held */ tte_hash_entry_t th_hashtable; /* hash of TTEs */ + struct tte_hash_fragment *th_fhhead; + struct tte_hash_fragment *th_fhtail; +}; + +struct tte_hash_fragment { + struct fragment_header thf_head; + struct tte_hash_entry thf_entries[127]; }; +CTASSERT(sizeof(struct tte_hash_fragment) == PAGE_SIZE); + + static struct tte_hash kernel_tte_hash; -static vm_paddr_t proc0_mem; - /* * Data for the tte_hash allocation mechanism */ @@ -146,13 +164,12 @@ } void -tte_hash_init(vm_paddr_t bootmem) +tte_hash_init(void) { thzone = uma_zcreate("TTE_HASH", sizeof(struct tte_hash), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); tte_hash_max = maxproc; uma_zone_set_obj(thzone, &thzone_obj, tte_hash_max); - proc0_mem = bootmem; } @@ -178,7 +195,7 @@ tte_hash_t th; vm_page_t m, tm; int i; - static int proc0_mem_allocated; + static int color; th = get_tte_hash(); @@ -187,15 +204,6 @@ th->th_context = (uint16_t)context; m = NULL; - - if (proc0_mem_allocated < 400) { - - proc0_mem_allocated++; - th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(proc0_mem); - proc0_mem += PAGE_SIZE*HASH_SIZE; - goto done; - } - while (m == NULL) { m = vm_page_alloc_contig(HASH_SIZE, 2*PAGE_SIZE_4M, (1UL<<34), PAGE_SIZE, (1UL<<34)); @@ -208,9 +216,21 @@ if (tm->flags & PG_ZERO) pmap_zero_page(tm); } + th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); + m = NULL; + while (m == NULL) { + m = vm_page_alloc(NULL, color++, + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | + VM_ALLOC_ZERO); - th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); -done: + if (m == NULL) + VM_WAIT; + } + if (m->flags & PG_ZERO) + pmap_zero_page(m); + + th->th_fhtail = th->th_fhhead = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); + *scratchval = (uint64_t)((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size); return (th); @@ -231,6 +251,26 @@ field->tte.data = tte | (field->tte.data & VTD_LOCK); } +static tte_hash_field_t +tte_hash_allocate_fragment_entry(tte_hash_t th, tte_hash_field_t field) +{ + struct tte_hash_fragment *fh; + tte_hash_field_t newfield; + + fh = th->th_fhtail; + if (fh->thf_head.fh_count == MAX_FRAGMENT_ENTRIES) { + /* XXX allocate a new page */ + panic("new fragment page allocation unimplemented"); + } + newfield = fh->thf_entries[++fh->thf_head.fh_free_head].the_fields; + fh->thf_head.fh_count++; + tte_hash_set_field(&newfield[0], field->tte.tag, field->tte.data); + field->of.flags = TH_COLLISION; + field->of.next = newfield; + + return newfield; +} + static __inline tte_t tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, tte_hash_field_t *field) { @@ -245,13 +285,28 @@ fields = (th->th_hashtable[hash_index].the_fields); entry = 0; +retry: for (i = 0; i < 4 && fields[i].tte.tag != 0; i++) { if (((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M))) { entry = (fields[i].tte.data & ~VTD_LOCK); break; } } - if (field && i < 4) + if (i == 4) { + if (fields[3].of.flags & TH_COLLISION) { + printf("following next pointer looking up 0x%lx\n", va); + fields = fields[3].of.next; + goto retry; + } + printf("allocating fragment entry and shifting entry for tag=0x%lx data=0x%lx\n", + fields[3].tte.tag, fields[3].tte.data); + fields = tte_hash_allocate_fragment_entry(th, &fields[3]); + printf("new fragment address is %p\n", fields); + /* entry following shifted entry is the first unallocated */ + i = 1; + } + + if (field) *field = &fields[i]; /* * XXX handle the case of collisions > 3 @@ -260,12 +315,41 @@ } +static __inline void +tte_hash_lookup_last_inline(tte_hash_t th, vm_offset_t va, tte_hash_field_t *field) +{ + uint64_t hash_shift, hash_index; + tte_hash_field_t fields; + int i; + /* XXX - only handle 8K pages for now */ + + hash_shift = PAGE_SHIFT; + hash_index = (va >> hash_shift) & HASH_MASK(th); + fields = (th->th_hashtable[hash_index].the_fields); + +retry: + for (i = 0; i < 4 && fields[i + 1].tte.tag != 0; i++) + ; + + if (i == 4) { + if (fields[3].of.flags & TH_COLLISION) { + fields = fields[3].of.next; + goto retry; + } + /* if there is no collision pointer, 3 is the last entry */ + i = 3; + } + + if (field) + *field = &fields[i]; +} + + tte_t tte_hash_delete(tte_hash_t th, vm_offset_t va) { uint64_t hash_shift, hash_index; tte_hash_field_t fields, lookup_field, last_field; - int i; tte_t tte_data; /* XXX - only handle 8K pages for now */ @@ -276,17 +360,14 @@ hash_bucket_lock(fields); - tte_data = tte_hash_lookup_inline(th, va, &lookup_field); - - if (tte_data == 0) + if ((tte_data = tte_hash_lookup_inline(th, va, &lookup_field)) == 0) goto done; th->th_entries--; - for (i = 0; (i < 4) && (fields[i + 1].tte.tag != 0); i++) - ; - last_field = &fields[i]; + tte_hash_lookup_last_inline(th, va, &last_field); + /* move last field's values in to the field we are deleting */ if (lookup_field != last_field) tte_hash_set_field(lookup_field, last_field->tte.tag, last_field->tte.data); @@ -378,7 +459,7 @@ uint64_t tte_hash_set_scratchpad_user(tte_hash_t th, uint64_t context) { - + uint64_t hash_scratch; /* This will break if a hash table ever grows above 64MB * 2^(13+13) From owner-p4-projects@FreeBSD.ORG Sat May 6 05:46:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45D6516A410; Sat, 6 May 2006 05:46:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DDED816A418 for ; Sat, 6 May 2006 05:46:42 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 944AF43D4C for ; Sat, 6 May 2006 05:46:42 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k465kfqI009967 for ; Sat, 6 May 2006 05:46:42 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k465kfts009964 for perforce@freebsd.org; Sat, 6 May 2006 05:46:41 GMT (envelope-from soc-andrew@freebsd.org) Date: Sat, 6 May 2006 05:46:41 GMT Message-Id: <200605060546.k465kfts009964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 05:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=96725 Change 96725 by soc-andrew@soc-andrew_serv on 2006/05/06 05:46:16 Install the lua50 port as the lang/lua is 5.1 Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#45 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#45 (text+ko) ==== @@ -826,7 +826,7 @@ @cp -Rp ${RD}/kernels/GENERIC/ ${RD}/bsdinstaller/root/boot/kernel # Install Lua into the package root - @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua \ + @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50 \ ROOT=${RD}/bsdinstaller/root @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-compat51 \ ROOT=${RD}/bsdinstaller/root From owner-p4-projects@FreeBSD.ORG Sat May 6 05:56:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DB5B16A405; Sat, 6 May 2006 05:56:55 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 60D9C16A400 for ; Sat, 6 May 2006 05:56:55 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0335443D4C for ; Sat, 6 May 2006 05:56:55 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k465us70015620 for ; Sat, 6 May 2006 05:56:54 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k465us0M015614 for perforce@freebsd.org; Sat, 6 May 2006 05:56:54 GMT (envelope-from soc-andrew@freebsd.org) Date: Sat, 6 May 2006 05:56:54 GMT Message-Id: <200605060556.k465us0M015614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 05:56:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=96726 Change 96726 by soc-andrew@soc-andrew_serv on 2006/05/06 05:56:15 Detach libaura, libdfui and the frontend from the build Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#13 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#13 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile#5 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile.inc1#3 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/aura/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/dfui/Makefile#2 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#17 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile#3 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile.inc#2 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile.inc1#3 delete .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/install_ncurses/Makefile#4 delete Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#13 (text+ko) ==== @@ -3,10 +3,10 @@ # Script to create a patch and tarballs of files to use in release(7) # The files to diff -FILES="Makefile.inc1 lib/Makefile libexec/Makefile usr.sbin/Makefile release/Makefile share/Makefile etc/mtree/BSD.usr.dist" +FILES="Makefile.inc1 libexec/Makefile release/Makefile share/Makefile etc/mtree/BSD.usr.dist" # Dir's to create a tarball of:name for tarball -DIRS="contrib/bsdinstaller:base_bsdinstaller contrib/lua:base_lua lib/bsdinstaller:lib_bsdinstaller libexec/bsdinstaller:libexec usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release share/bsdinstaller:share sys/i386/conf/NOPREEMPTION:sys" +DIRS="contrib/bsdinstaller:base_bsdinstaller libexec/bsdinstaller:libexec release/bsdinstaller:release share/bsdinstaller:share sys/i386/conf/NOPREEMPTION:sys" VENDOR="//depot/vendor/freebsd/src" BSDINS="//depot/projects/soc2005/bsdinstaller/src" From owner-p4-projects@FreeBSD.ORG Sat May 6 06:24:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2628E16A401; Sat, 6 May 2006 06:24:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C2E1916A403 for ; Sat, 6 May 2006 06:24:28 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68FD543D45 for ; Sat, 6 May 2006 06:24:28 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k466OSLW032091 for ; Sat, 6 May 2006 06:24:28 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k466OSSV032088 for perforce@freebsd.org; Sat, 6 May 2006 06:24:28 GMT (envelope-from soc-andrew@freebsd.org) Date: Sat, 6 May 2006 06:24:28 GMT Message-Id: <200605060624.k466OSSV032088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 06:24:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96727 Change 96727 by soc-andrew@soc-andrew_serv on 2006/05/06 06:23:42 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#46 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#46 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.908 2006/03/23 07:48:58 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.909 2006/04/29 14:03:17 nyan Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -1378,7 +1378,7 @@ IMAGEDIR= ${RD}/image.${FSIMAGE} BOOTDIR= ${RD}/trees/base/boot HINTSFILE= ${BOOTDIR}/device.hints -ACPI_KO= ${BOOTDIR}/kernel/acpi.ko +ACPI_KO= ${RD}/kernels/GENERIC/acpi.ko IMAGEFILE= ${RD}/floppies/${FSIMAGE}.flp .if defined(FDSIZE) && ${FDSIZE} == "SMALL" FLPSIZE= ${SMALLFLOPPYSIZE} ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#8 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.299 2006/04/10 20:14:40 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.300 2006/04/28 10:45:27 brueffer Exp $ Supported Devices @@ -143,6 +143,8 @@ &hwlist.pst; + &hwlist.rr232x; + &hwlist.stg; &hwlist.sym; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.911 2006/04/10 20:30:35 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.918 2006/04/30 05:22:43 hrs Exp $ 2000 @@ -151,39 +151,47 @@ For more details see security advisory FreeBSD-SA-06:07.pf. &merged; + An information disclosure issue found in the + &os; kernel running on 7th- and 8th-generation AMD processors + has been fixed. For more details see security advisory FreeBSD-SA-06:14.fpu. &merged; + Kernel Changes - &man.acpi.4; now has basic support for HPET time counter. + &man.acpi.4; now has basic support for the HPET time counter. - &man.acpi.ibm.4; driver now supports for setting the fan control + The &man.acpi.ibm.4; driver now supports setting the fan control mode to manual or automatic, and adjusting the fan speed if the - fan control mode is manual. Note that manual control of the fan speed - needs to set a sysctl variable - dev.acpi_ibm.0.fan - to zero (manual) with extreme precaution. - This is because disabling automatic fan control might + fan control mode is manual. To enable manual control of the fan speed, + the sysctl variable dev.acpi_ibm.0.fan + needs to be set to zero (manual). This should only be used with + extreme precaution, as disabling automatic fan control might overheat the hardware and lead to permanent damage. - The &man.ddb.4; now supports show lock + The &man.ddb.4; debugger now provides the show lock command. If the argument has a valid lock class, this displays various information about the lock and calls a new function pointer in lock_class (lc_ddb_show) to dump class-specific information about the lock as well (such as the owner of a mutex or - xlock'ed sx lock). + xlock'ed sx lock). &merged; - The &man.ddb.4; now supports show sleepq + The &man.ddb.4; debugger now provides the show sleepq command. This takes a wait channel as an argument and looks for a sleep queue associated with that wait channel. + DEFAULTS kernel configuration files + for each platform have been added. &merged; + A bug in file descriptor handling such that simple - close(0); dup(fd) does not return + close(0); dup(fd) sequence does not return descriptor 0 in some cases, has been fixed. The &man.firmware.9; subsystem has been added. This allows - to load binary data into the kernel via a specially crafted module. + to load binary data into the kernel via a specially crafted module. + &merged; The &man.gdb.1; remote debugging interface now supports copying console messages to a remote debugger instance. @@ -200,17 +208,24 @@ &man.pmcstat.8; can now log over a network socket to a remote host. - The &man.random.4; entropy device driver is now MPSAFE. + The &man.random.4; entropy device driver is now MPSAFE. + &merged; The SIGCHLD signal queuing has been added. For each child process whose status has been changed, - a SIGCHLD instance is queued, if the signal is stilling pending, - and process changed status several times, signal information - is updated to reflect latest process status. + a SIGCHLD instance is queued. If the signal is still pending, + and the process changed status several times, the signal information + is updated to reflect the latest process status. There is a loader tunable kern.sigqueue.queue_sigchild which can control the behavior, setting it to zero disables the SIGCHLD queuing feature. + Instead of dumping the whole physical + memory, the kernel now defaults to dump only pages that are + actively mapped into kvm. A new sysctl variable + debug.minidump + can be used to turn off this behavior when set to zero. + A new sysctl variable kern.malloc_stats has been added. This allows to export kernel malloc statistics via a binary structure stream. @@ -224,27 +239,28 @@ A new sysctl variable kern.elf[32|64].can_exec_dyn has been removed. Instead the brandinfo - structure has been extended to be able to have + structure has been extended to be able to provide the BI_CAN_EXEC_DYN flag for all brands that usually allow executing ELF dynamic binaries. A new sysctl variable kern.forcesigexit has been added. This forces a process - to sigexit if a trap signal is being hold by current thread or - ignored by current process and is enabled by default. + to sigexit if a trap signal is being held by the current thread or + ignored by the current process and is enabled by default. - RedZone, a buffer corruption protection for kernel's &man.malloc.9; - has been implemented. This detects both of buffer underflows and + RedZone, a buffer corruption protection for kernel &man.malloc.9; + facility has been implemented. This detects both of buffer underflows and buffer overflows bugs at runtime on &man.free.9; and &man.realloc.9;, and prints backtraces from where memory was allocated and from where - it was freed. For more details, see &man.redzone.9; manual page. + it was freed. For more details, see the &man.redzone.9; manual page. A new sysctl variable security.mac.biba.interfaces_equal which makes all network interfaces be created with the label biba/equal(equal-equal), has been added. This is useful where programs such as &man.dhclient.8; and &man.ppp.8;. which initialize network interfaces do not have any labeling support. - This variable is set as 0(disabled) by default. + This variable is set as 0(disabled) by default. + &merged; A new sysctl variable vm.zone_stats has been added. This allows to export &man.uma.9; allocator @@ -276,9 +292,6 @@ has been added. For details of the latest development, see . - DEFAULTS kernel configuration files - for each platform have been added. - Boot Loader Changes @@ -295,7 +308,7 @@ then the default speed is determined from the current serial port speed, and otherwise it is set to 9600 or the value of the kernel option BOOT_COMCONSOLE_SPEED - at compile time. + at compile time. &merged; @@ -305,13 +318,14 @@ Hardware Support The &man.acpi.thermal.4; driver now supports - passive cooling. + passive cooling. &merged; The &man.cardbus.4; driver now supports /dev/cardbus%d.cis. - The &man.ce.4; driver, which supports Cronyx Tau-PCI/32 adapters, - has been added. + The &man.ce.4; driver, + which supports Cronyx Tau-PCI/32 adapters, has been added. + &merged; Support for the PadLock Security Co-processor in VIA C3 processors has been added to the &man.crypto.9; subsystem. @@ -326,24 +340,28 @@ standard designed to enable remote monitoring and control of server, networking and telecommunication platforms. - The &man.kbdmux.4; has been integrated into &man.syscons.4; and - kbd device driver. + The &man.kbdmux.4; driver has been integrated into &man.syscons.4; and + the kbd device driver. By default &man.syscons.4; will look for the &man.kbdmux.4; keyboard first, and then, if not found, look for any keyboard. - Switch to &man.kbdmux.4; can be done at boot time by loading - kbdmux kernel module via &man.loader.8;, + Switching to &man.kbdmux.4; can be done at boot time by loading + the kbdmux kernel module via &man.loader.8;, or at runtime via &man.kldload.8; and releasing the active - keyboard. + keyboard. &merged; - The &man.kbdmux.4; has been included in the + The &man.kbdmux.4; driver has been included in the GENERIC kernel by default. Also, the Boot FreeBSD with USB keyboard menu item in the boot loader menu has been removed - since this fixes USB keyboard probing problems. + since this fixes USB keyboard probing problems. + &merged; The loader tunable debug.mpsafevfs is set to 1 by default. + The &man.sab.4; driver has been removed (it has been + superceded by the &man.scc.4; driver). + The &man.scc.4; driver has been added. This provides generic support for serial communications controllers and delegates the control over each channel @@ -370,32 +388,42 @@ to need this even though all of the pins in the 8259A's are masked. The default is still to mask the ExtINT pin. + Support has been improved for + so-called legacy-free hardware, in particular, + i386 systems without AT-style keyboard controllers such as the + Macbook Pro. + Multimedia Support - The &man.agp.4; driver now supports ATI IGP chipsets. + The &man.agp.4; driver now supports ATI IGP chipsets. + &merged; The &man.sound.4; driver now supports wider range sampling rate, multiple precisions choice, - and 24/32 bit PCM format conversion. + and 24/32 bit PCM format conversion. &merged; - The &man.snd.als4000.4; driver is now MPSAFE. + The &man.snd.als4000.4; driver is now MPSAFE. &merged; The &man.snd.atiixp.4; driver has been added. - This supports ATI IXP 200/300/400 series audio controllers. + This supports ATI IXP 200/300/400 series audio controllers. &merged; The &man.snd.atiixp.4; driver now supports suspend and resume features. The &man.snd.cmi.4; driver is now MPSAFE. - The &man.snd.solo.4; driver is now MPSAFE. + The &man.snd.es137x.4; driver is now MPSAFE. &merged; + + The &man.snd.ich.4; driver is now MPSAFE. &merged; + + The &man.snd.solo.4; driver is now MPSAFE. &merged; - The &man.snd.via8233.4; driver is now MPSAFE. + The &man.snd.via8233.4; driver is now MPSAFE. &merged; - The &man.snd.via82c686.4; driver is now MPSAFE. + The &man.snd.via82c686.4; driver is now MPSAFE. &merged; - The &man.speaker.4; driver now supports &os;/amd64. + The &man.speaker.4; driver now supports &os;/amd64. &merged; The &man.uaudio.4; driver now supports 24/32 bit audio formats and conversion. @@ -405,17 +433,23 @@ Network Interface Support The &man.ath.4; driver has been updated to - version 0.9.16.16. + version 0.9.16.16. &merged; The &man.bce.4; driver, which supports Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet controllers, - has been added. For more details, see &man.bce.4;. + has been added. For more details, see &man.bce.4;. &merged; + + A bug which prevents the &man.bfe.4; driver from working + on a system with over 1GB RAM has been fixed. &merged; The &man.bge.4; driver's Jumbo frame support is now MPSAFE. The &man.bge.4; driver now supports big-endian architectures such as sparc64. + The &man.bge.4; driver now supports &man.polling.4; mode. + &merged; + The &man.dc.4; driver is now MPSAFE. &merged; The &man.de.4; driver has been converted to the &man.bus.dma.9; @@ -426,7 +460,7 @@ The &man.el.4; driver has been removed. The &man.em.4; driver now supports big-endian - architectures such as sparc64. + architectures such as sparc64. &merged; The &man.em.4; driver has been updated to version 3.2.18 from Intel, and now supports @@ -445,11 +479,13 @@ architectures such as sparc64. The &man.le.4; driver, which supports AMD Am7900 LANCE - and Am79C9xx PCnet NICs and is based on NetBSD's implementation - has been added. While the &man.lnc.4; driver also support these + and Am79C9xx PCnet NICs and is based on NetBSD's implementation, + has been added. While the &man.lnc.4; driver also supports these NICs, this driver has several advantages over it such as MPSAFE, ALTQ, VLAN_MTU, ifmedia, and 32-bit DMA for PCI - variants. + variants. &merged; + + The &man.lge.4; driver is now MPSAFE. &merged; The &man.my.4; driver is now MPSAFE. &merged; @@ -468,6 +504,8 @@ The &man.sf.4; driver is now MPSAFE. &merged; + The &man.sk.4; driver is now MPSAFE. + The &man.ste.4; driver is now MPSAFE. The &man.ti.4; driver now supports big-endian @@ -497,12 +535,12 @@ suppression, while there is demand for such ARP entry. Due to this change, a sysctl variable net.link.ether.inet.host_down_time - has been removed. + has been removed. &merged; The &man.arp.8; now supports a sysctl variable net.link.ether.inet.log_arp_permanent_modify to suppress logging of attempts to modify - permanent ARP entries. + permanent ARP entries. &merged; The &man.arp.8; utility now allows option with and options @@ -520,34 +558,35 @@ The &man.if.bridge.4; bridge driver now supports creating span ports, which transmit a copy of every frame received by the bridge. This feature can be enabled - by using &man.ifconfig.8;. + by using &man.ifconfig.8;. &merged; The &man.if.bridge.4; bridge driver now supports RFC 3378 EtherIP. This change makes it possible to add &man.gif.4; interfaces to bridges, which will then send and receive IP protocol 97 packets. - Packets are Ethernet frames with an EtherIP header prepended. + Packets are Ethernet frames with an EtherIP header prepended. + &merged; The path MTU discovery for multicast packets in the &os; &man.ip6.4; stack has been disabled by default because notifying path MTU by a lot of routers in multicast can be a kind of distributed Denial-of-Service attack to a router. - This feature can be enabled by using a new sysctl variable - net.inet6.ip6.mcast_pmtu. + This feature can be re-enabled by using a new sysctl variable + net.inet6.ip6.mcast_pmtu. &merged; - The &man.ipfw.4;, IP packet filter now supports IPv6. - The &man.ip6fw.8; is deprecated and will be removed - in the future releases. + The &man.ipfw.4; IP packet filter now supports IPv6. + The &man.ip6fw.8; packet filter is deprecated and will be removed + in the future releases. &merged; The &man.ipfw.4; now supports substitution of the action argument with the value obtained from table lookup, - which allows to optimize the rulesets. + which allows some optimization of rulesets. This is now applicable only to pipe, queue, divert, tee, netgraph, - and ngtee rules. + and ngtee rules. &merged; For example, the following rules will throw different packets to different pipes: @@ -564,9 +603,12 @@ to net.bpf_jitter.enable and this controls both &man.bpf.4; and &man.ng.bpf.4; now. - A bug where a connection of NFS over TCP would not reconnect - when the server sent FIN. This problem had occurred - with Solaris NFS servers. + The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. + &merged; + + A bug has been fixed in which NFS over TCP would not reconnect + when the server sent a FIN. This problem had occurred + with Solaris NFS servers. &merged; The sysctl variable net.inet.ip.portrange.reservedhigh and net.inet.ip.portrange.reservedlow @@ -620,7 +662,7 @@ tick granularity. A new sysctl variable net.inet.tcp.inflight.rttthresh specifies the threshold in milliseconds below which this feature - will disengage. It defaults to 10ms. + will disengage. It defaults to 10ms. &merged; @@ -633,23 +675,28 @@ and now supports full 64-bit DMA. While this feature is enabled by default, this can be forced off by setting the hw.amr.force_sg32 loader tunable for - debugging purpose. + debugging purpose. + &merged; The &man.amr.4; driver now supports &man.ioctl.2; requests necessary for Linux LSI MegaRaid tools on &os;'s Linux emulation - environment. + environment. + &merged; The &man.ata.4; driver now supports a workaround for some controllers whose DMA does not work properly in 48bit mode. For the suspicious controllers - the PIO mode will be used for access to over 137GB areas. + the PIO mode will be used for access to over 137GB areas. + &merged; The &man.ata.4; driver now supports the ITE IT8211F IDE controller, and Promise PDC40718 and PDC40719 chip found in Promise - Fasttrak TX4300. + Fasttrak TX4300. + &merged; The &man.ata.4; driver now supports DMA for kernel crash dump - and crash dumping to &man.ataraid.4; device. + and crash dumping to &man.ataraid.4; device. + &merged; The &man.ata.4; driver now supports USB mass storage class devices. To enable it, a line device atausb @@ -659,10 +706,14 @@ each other. The &man.ataraid.4; driver now supports - JMicron ATA RAID metadata. + JMicron ATA RAID metadata. &merged; + + The GEOM_LABEL class now supports + Ext2FS, NTFS, and ReiserFS. &merged; The GEOM_MIRROR class now supports - kernel crash dump to the GEOM providers. + kernel crash dump to the GEOM providers. + &merged; The GEOM_MIRROR and GEOM_RAID3 classes now support sysctl variables @@ -674,11 +725,12 @@ behavior, and if it is set to 0 such components are not disconnected and the kernel will try to still use them (only first error will be logged). - This is helpful when we have two broken components, but in - different places, so actually all data is available. + This is helpful for the case of multiple broken components (in + different places), so actually all data is available. The broken components will be visible in gmirror list or graid3 list output with flag - BROKEN. + BROKEN. + &merged; The GEOM_MIRROR and GEOM_RAID3 classes now use parallel I/O request for synchronization @@ -691,18 +743,17 @@ kern.geom.mirror.syncs_per_sec, kern.geom.raid3.reqs_per_sync, and kern.geom.raid3.syncs_per_sec - are deprecated and have been removed. + are deprecated and have been removed. + &merged; A new GEOM class GEOM_ZERO has been added. It creates very huge provider (41PB) /dev/gzero and mainly for performance testing. On BIO_READ request it zero-fills bio_data and on BIO_WRITE - it does nothing. + it does nothing. + &merged; - The GEOM_LABEL class now supports - Ext2FS and ReiserFS. - The GEOM class kernel module g_md.ko has been renamed to geom_md.ko for consistency. @@ -711,7 +762,8 @@ amd64 as well as PAE. The &man.mfi.4; driver, which supports - LSI MegaRAID SAS controller family has been added. + the LSI MegaRAID SAS controller family, has been added. + &merged; The &man.mpt.4; driver has been updated to support various new features such as RAID volume and RAID member @@ -723,8 +775,8 @@ The &man.mpt.4; driver now supports SAS HBA (partially), 64-bit PCI, and large data transfer. - The &man.twa.4; has been updated to the 9.3.0.1 - release on the 3ware website. + The &man.twa.4; driver has been updated to the 9.3.0.1 + release on the 3ware Web site. &merged; A new GEOM-based disk encryption facility, GEOM_ELI, has been added. It uses the &man.crypto.9; framework for hardware acceleration @@ -732,7 +784,8 @@ more information. &merged; The &man.geli.8; now supports loading keyfiles before root - file system is mounted. For example, the following entries + file system is mounted. &merged; + For example, the following entries can be used in /boot/loader.conf to enable it: @@ -776,7 +829,7 @@ has been updated to 20051021. DRM has - been updated to a snapshot from DRI CVS as of 20051202. + been updated to a snapshot from DRI CVS as of 20051202. &merged; TrustedBSD OpenBSM distribution, version 1.0 alpha 5, an implementation of the documented Sun Basic @@ -811,22 +864,24 @@ applying binary patches. The &man.bsnmpd.1; utility now supports the Host Resources - MIB described in RFC 2790. + MIB described in RFC 2790. &merged; The &man.cmp.1; utility now supports an flag to compare the symbolic link itself rather than the file that the link points to. - The &man.config.8; utility now supports nocpu - directive. + The &man.config.8; utility now supports the nocpu + directive, which cancels the effect of a + previous cpu directive. &merged; The &man.config.8; utility now reads DEFAULTS kernel configuration file if it exists in the current directory - before the specified configuration file. + before the specified configuration file. &merged; The &man.csh.1; utility now supports NLS catalog. Note that this requires installing - shells/tcsh_nls. + the shells/tcsh_nls port. + &merged; The csup(1) utility has been imported. This is an implementation of CVSup-compatible client written @@ -834,11 +889,11 @@ only. The &man.devd.8; utility now supports a option - to specify a configuration file. + to specify a configuration file. &merged; The &man.ftpd.8; utility now creates a PID file /var/run/ftpd.pid even when - no option is specified. + no option is specified. &merged; The &man.gbde.8; utility now supports and options @@ -846,13 +901,14 @@ The &man.getfacl.1; utility now supports a flag to suppress the per-file header - comment listing the file name, owner, and group. + comment listing the file name, owner, and group. + &merged; The &man.gpt.8; utility now supports setting GPT partition labels. The &man.gvinum.8; utility now supports commands to rename objects and to move a subdisk from - one drive to another. + one drive to another. &merged; The &man.gvinum.8; utility now supports resetconfig sub-command. @@ -882,14 +938,14 @@ jid_file option to write out a JidFile, similar to a PidFile, containing the jailid, path, hostname, IP and the command used to start - the jail. + the jail. &merged; - The &man.kdump.1; now supports a + The &man.kdump.1; utility now supports a flag, which causes kdump to print an additional field holding - the threadid. + the threadid. &merged; - The &man.kdump.1; now supports a - flag to suppress the display of I/O data. + The &man.kdump.1; program now supports a + flag to suppress the display of I/O data. &merged; The &man.kenv.1; utility now supports a flag to suppress warnings. @@ -922,15 +978,17 @@ The &man.ln.1; utility now supports an flag which allows to delete existing - empty directories, when creating symbolic links. + empty directories, when creating symbolic links. + &merged; The &man.locate.1; utility now supports a flag to make this utility - interoperable with &man.xargs.1;'s flag. + interoperable with &man.xargs.1;'s flag. + &merged; The &man.ls.1; utility now supports an flag to disable the automatic - flag for the superuser. + flag for the superuser. &merged; The &man.ls.1; utility now supports an flag to use the file creation @@ -960,16 +1018,18 @@ The &man.mergemaster.8; utility now supports an option to explicitly specify - an architecture to pass through to the underlying makefiles. + an architecture to pass through to the underlying makefiles. + &merged; The &man.mount.8; nodev option has been removed. The &man.mount.8; now supports &man.mqueuefs.5;. - The &man.moused.8; now supports an flag + The &man.moused.8; daemon now supports an flag to enable horizontal virtual scrolling similar to a - flag for vertical virtual scrolling. + flag for vertical virtual scrolling. + &merged; The &man.netstat.1; utility now supports an flag for interface stats mode, @@ -981,16 +1041,16 @@ rather than the KAME IPSEC stack. Note that the output of netstat -s -p ipsec differs depending on which stack is compiled into - the kernel since they each keep different stats. + the kernel since they each keep different statistics. &merged; The &man.periodic.8; daily script now supports - to show the status of &man.gmirror.8;, &man.graid3.8;, + display of the status of &man.gmirror.8;, &man.graid3.8;, &man.gstripe.8;, and &man.gconcat.8; devices. - Note that these are disabled by default. + Note that these are disabled by default. &merged; - A new functions, &man.pidfile.3;, which allow reliable - pidfiles handling have been implemented in - libutil. + A new function, &man.pidfile.3;, which provides reliable + pidfiles handling, has been implemented in + libutil. &merged; The &man.ping.8; utility now supports a sweeping ping in which &man.icmp.4; payload of @@ -1020,7 +1080,7 @@ The &man.rfcomm.sppd.1; now supports service name in addition to option with channel number. The supported names are: DUN (Dial-Up Networking), FAX (Fax), - LAN (LAN Access Using PPP), and SP (Serial Port). + LAN (LAN Access Using PPP), and SP (Serial Port). &merged; The &man.rpcgen.1; utility now generates headers and stub files which can be used with ANSI C compilers by default. @@ -1036,9 +1096,12 @@ The &man.sh.1; utility now supports times built-in command. + The &man.snapinfo.8; utility, which shows snapshot locations + on UFS filesystems, has been added. &merged; + The &man.strtonum.3; library function has been implemented based on OpenBSD's implementation. This is an improved version of - &man.strtoll.3;. + &man.strtoll.3;. &merged; The &man.sysctl.8; utility now supports a flag to suppress a limited set of warnings and errors. @@ -1055,7 +1118,7 @@ The &man.xargs.1; utility now supports a flag which makes the command execution when the standard input - does not contain any non-whitespace-characters. + does not contain any non-whitespace-characters. &merged; The shared library version number of all libraries have been updated due to some possible ABI changes. The libraries @@ -1089,7 +1152,7 @@ /etc/bluetooth/$device.conf (where $device is ubt0, btcc0, and so on.) - For more details, see &man.bluetooth.conf.5;. + For more details, see &man.bluetooth.conf.5;. &merged; The ftpd script for stand-alone &man.ftpd.8; has been added. @@ -1114,15 +1177,16 @@ are attached to the system, but both daemons depend on Bluetooth socket layer and thus disabled by default. Bluetooth sockets layer must be either loaded - as a module or compiled into kernel before the daemons can run. + as a module or compiled into kernel before the daemons can run. + &merged; The hostapd script for - &man.hostapd.8; has been added. + &man.hostapd.8; has been added. &merged; The netif script now supports ipv4_addrs_ifn, which adds one or more IPv4 address from a ranged list in - CIRD notation. For example: + CIRD notation. &merged; For example: ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28" @@ -1139,7 +1203,7 @@ since OLDCARD is deprecated. The ppp-user script has been renamed to - ppp. + ppp. &merged; The removable_interfaces variable has been removed. @@ -1166,6 +1230,10 @@ GNU Readline library has been updated from 5.0 to 5.1. + GNU Troff + has been updated from version 1.19 to version 1.19.2. + &merged; + IPFilter has been updated from 4.1.8 to 4.1.10. @@ -1173,7 +1241,8 @@ 4.2p1 to 4.3p1. hostapd - has been updated from version 0.3.9 to version 0.4.8. + has been updated from version 0.3.9 to version 0.4.8. + &merged; sendmail has been updated from 8.13.4 to 8.13.6. &merged; @@ -1183,7 +1252,8 @@ tzdata2005r release. &merged; WPA Supplicant - has been updated from version 0.3.9 to version 0.4.8. + has been updated from version 0.3.9 to version 0.4.8. + &merged; zlib has been updated from version 1.2.2 to version 1.2.3. @@ -1196,36 +1266,38 @@ flag to disable checking whether the same package is already installed or not. - The &man.pkg.add.1; now supports an + The &man.pkg.add.1; program now supports an flag, which is the same as the flag except that the given prefix is also used recursively for the - dependency packages if any. + dependency packages if any. &merged; - The &man.pkg.add.1; and &man.pkg.create.1; now supports + The &man.pkg.add.1; and &man.pkg.create.1; utilities now support a flag to save packages to the current directory - (or PKGDIR if defined) by default. + (or PKGDIR if defined) by default. + &merged; - The &man.pkg.create.1; now supports an + The &man.pkg.create.1; program now supports an flag to support basic regular expressions for package name, an flag for extended regular - expressions, and a for exact matching. + expressions, and a for exact matching. &merged; - The &man.pkg.version.1; now supports an + The &man.pkg.version.1; utility now supports an flag to show the origin recorded on package generation instead of the package name, and an flag - to list packages whose registered origin is origin only. + to list packages whose registered origin is origin only. + &merged; The &man.portsnap.8; utility (sysutils/portsnap) has been added into the &os; base system. This is a secure, easy to use, fast, lightweight, and generally good way for - users to keep their ports trees up to date. + users to keep their ports trees up to date. &merged; A incorrect handling of HTTP_PROXY_AUTH - in the &man.portsnap.8; utility has been fixed. + in the &man.portsnap.8; utility has been fixed. &merged; The startup scripts from the local_startup directory now evaluated by using &man.rcorder.8; with scripts - in the base system. + in the base system. &merged; The suffix of startup scripts from the Ports Collection has been removed. This means foo.sh @@ -1234,19 +1306,20 @@ foo.ORG will also be invoked. You are recommended to reinstall packages which install such scripts and remove extra files in the - local_startup directory. + local_startup directory. &merged; New rc.conf variables, ldconfig_local_dirs and ldconfig_local32_dirs have been added. - These hold lists of local &man.ldconfig.8; directories. + These hold lists of local &man.ldconfig.8; directories. + &merged; The @cwd command in pkg-plist now allows no directory argument. If no directory argument is given, it will set current working directory to the first prefix given by the - @cwd command. + @cwd command. &merged; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#11 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.81 2006/04/10 20:14:40 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.83 2006/04/28 10:45:28 brueffer Exp $ # # @@ -99,12 +99,13 @@ pcn i386,pc98,alpha,ia64,amd64 pst i386 rc i386 +rr232x i386,amd64 rue i386,pc98,amd64 safe i386,pc98,amd64 sbp i386,sparc64,ia64,amd64 sf i386,pc98,alpha,ia64,amd64 sis i386,pc98,alpha,ia64,amd64 -sk i386,pc98,alpha,amd64 +sk i386,sparc64,pc98,alpha,amd64 sn i386,amd64 snc pc98 snd_ad1816 i386,amd64 ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ &os;/&arch; &release.current; 发行说明 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 6 07:26:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CC4C16A401; Sat, 6 May 2006 07:26:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 F024D16A406 for ; Sat, 6 May 2006 07:26:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6A4443D45 for ; Sat, 6 May 2006 07:26:44 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k467QiaS064991 for ; Sat, 6 May 2006 07:26:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k467QigH064988 for perforce@freebsd.org; Sat, 6 May 2006 07:26:44 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 6 May 2006 07:26:44 GMT Message-Id: <200605060726.k467QigH064988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 07:26:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=96729 Change 96729 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/06 07:26:41 compare against the right ASI in collision handling Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#48 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#48 (text+ko) ==== @@ -1530,7 +1530,7 @@ HASH_LOOKUP(%g2, %l6, %l2, tsb_miss_not_found, 8f) mov 1, %g2 sethi %uhi(VM_MIN_DIRECT_ADDRESS), %g3 - cmp %l3, ASI_LDTD_N + cmp %l3, ASI_N sllx %g2, TH_COLLISION_SHIFT, %g2 sllx %g3, 32, %g3 beq,pt %xcc, 7f From owner-p4-projects@FreeBSD.ORG Sat May 6 07:43:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3937B16A402; Sat, 6 May 2006 07:43:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CF35B16A401 for ; Sat, 6 May 2006 07:43:33 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98B7343D48 for ; Sat, 6 May 2006 07:43:33 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k467hWFs075171 for ; Sat, 6 May 2006 07:43:33 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k467hWNr075144 for perforce@freebsd.org; Sat, 6 May 2006 07:43:32 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 6 May 2006 07:43:32 GMT Message-Id: <200605060743.k467hWNr075144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 96730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 07:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=96730 Change 96730 by brueffer@brueffer_haakonia on 2006/05/06 07:42:31 Some cleanup. Committed from: FreeBSD booth at Linuxtag 2006 Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#3 (text+ko) ==== @@ -101,7 +101,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_SET_PRESELECT_FLAGS Set the current default preselection flags for attributable events on the pipe. @@ -110,7 +110,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_GET_PRESELECT_NAFLAGS Retrieve the current default preselection flags for non-attributable events on the pipe. @@ -119,7 +119,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_SET_PRESELECT_NAFLAGS Set the current default preselection flags for non-attributable events on the pipe. @@ -128,7 +128,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_GET_PRESELECT_AUID Query the current preselection masks for a specific auid on the pipe. The ioctl argument should be of type @@ -200,4 +200,4 @@ .Sh BUGS See the .Xr audit 4 -man page for information on audit-related bugs and limitations. +manual page for information on audit-related bugs and limitations. From owner-p4-projects@FreeBSD.ORG Sat May 6 08:58:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 172D516A401; Sat, 6 May 2006 08:58:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AB51116A402 for ; Sat, 6 May 2006 08:58:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EDD543D49 for ; Sat, 6 May 2006 08:58:57 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k468wvoc034795 for ; Sat, 6 May 2006 08:58:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k468wu91034786 for perforce@freebsd.org; Sat, 6 May 2006 08:58:56 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 6 May 2006 08:58:56 GMT Message-Id: <200605060858.k468wu91034786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 08:58:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=96733 Change 96733 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/06 08:58:32 arbitrary collision handling mostly handled now getting very close to being self-hosting garbage collection of collision buckets will be needed for long-lived processes Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#46 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#21 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#13 (text+ko) ==== @@ -28,6 +28,8 @@ tte_t tte_hash_lookup_nolock(tte_hash_t hash, vm_offset_t va); +void tte_hash_reset(tte_hash_t hash); + uint64_t tte_hash_set_scratchpad_kernel(tte_hash_t th); uint64_t tte_hash_set_scratchpad_user(tte_hash_t th, uint64_t context); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#46 (text+ko) ==== @@ -1797,6 +1797,7 @@ free_pv_entry(pv); } + tte_hash_reset(pmap->pm_hash); sched_unpin(); pmap_invalidate_all(pmap); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#21 (text+ko) ==== @@ -27,6 +27,8 @@ * $ Exp $ */ +#define DEBUG + #include #include #include @@ -36,7 +38,9 @@ #include #include #include - +#ifdef DEBUG +#include +#endif #include #include #include @@ -60,7 +64,7 @@ #define HASH_VALID 0x1 -#define DEBUG + struct tte_hash_entry; @@ -84,7 +88,7 @@ struct fragment_header { - struct fragment_header *fh_next; + struct tte_hash_fragment *fh_next; uint16_t fh_count; uint16_t fh_free_head; uint16_t pad[26]; @@ -213,7 +217,7 @@ } } for (i = 0, tm = m; i < HASH_SIZE; i++, tm++) { - if (tm->flags & PG_ZERO) + if ((tm->flags & PG_ZERO) == 0) pmap_zero_page(tm); } th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); @@ -226,7 +230,7 @@ if (m == NULL) VM_WAIT; } - if (m->flags & PG_ZERO) + if ((m->flags & PG_ZERO) == 0) pmap_zero_page(m); th->th_fhtail = th->th_fhhead = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); @@ -244,6 +248,22 @@ free_tte_hash(th); } +void +tte_hash_reset(tte_hash_t th) +{ + struct tte_hash_fragment *fh; + vm_page_t m; + + for (fh = th->th_fhhead; fh != th->th_fhtail; fh = fh->thf_head.fh_next) { + m = PHYS_TO_VM_PAGE((vm_paddr_t)TLB_DIRECT_TO_PHYS((vm_offset_t)fh)); + m->wire_count--; + vm_page_free(m); + } + fh = th->th_fhhead = th->th_fhtail; + fh->thf_head.fh_count = 0; + fh->thf_head.fh_free_head = 0; +} + static __inline void tte_hash_set_field(tte_hash_field_t field, uint64_t tag, tte_t tte) { @@ -256,11 +276,27 @@ { struct tte_hash_fragment *fh; tte_hash_field_t newfield; + vm_page_t m; + static int color; fh = th->th_fhtail; if (fh->thf_head.fh_count == MAX_FRAGMENT_ENTRIES) { /* XXX allocate a new page */ - panic("new fragment page allocation unimplemented"); + m = NULL; + while (m == NULL) { + m = vm_page_alloc(NULL, color++, + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | + VM_ALLOC_ZERO); + + if (m == NULL) + VM_WAIT; + } + if (m->flags & PG_ZERO) + pmap_zero_page(m); + fh->thf_head.fh_next = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); + fh = th->th_fhtail = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); + printf("allocating new fragment page fh=%p \n", fh); + } newfield = fh->thf_entries[++fh->thf_head.fh_free_head].the_fields; fh->thf_head.fh_count++; @@ -268,16 +304,27 @@ field->of.flags = TH_COLLISION; field->of.next = newfield; - return newfield; + return (newfield); } +/* + * if a match for va is found the tte value is returned + * and if field is non-null field will point to that entry + * + * if no match is found 0 is returned and if field is non-null + * and toappend is true field points to the first empty entry + * allocating a new bucket if the current one is full + */ + + static __inline tte_t -tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, tte_hash_field_t *field) +tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, tte_hash_field_t *field, int toappend) { uint64_t hash_shift, hash_index; tte_hash_field_t fields; int i; tte_t entry; + /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; @@ -294,23 +341,18 @@ } if (i == 4) { if (fields[3].of.flags & TH_COLLISION) { - printf("following next pointer looking up 0x%lx\n", va); fields = fields[3].of.next; goto retry; - } - printf("allocating fragment entry and shifting entry for tag=0x%lx data=0x%lx\n", - fields[3].tte.tag, fields[3].tte.data); - fields = tte_hash_allocate_fragment_entry(th, &fields[3]); - printf("new fragment address is %p\n", fields); - /* entry following shifted entry is the first unallocated */ - i = 1; - } + } else if (toappend == TRUE) { + fields = tte_hash_allocate_fragment_entry(th, &fields[3]); + /* entry following shifted entry is the first unallocated */ + i = 1; + } + } - if (field) + if (field) *field = &fields[i]; - /* - * XXX handle the case of collisions > 3 - */ + return (entry); } @@ -333,14 +375,19 @@ if (i == 4) { if (fields[3].of.flags & TH_COLLISION) { - fields = fields[3].of.next; - goto retry; - } - /* if there is no collision pointer, 3 is the last entry */ - i = 3; - } + if (fields[3].of.next[0].tte.tag != 0) { + fields = fields[3].of.next; + goto retry; + } else { + /* 3rd entry is last */ + *field = &fields[2]; + /* clear collision pointer */ + tte_hash_set_field(&fields[3], 0, 0); - if (field) + } + } else + *field = &fields[3]; /* 4th is the last entry */ + } else *field = &fields[i]; } @@ -360,13 +407,17 @@ hash_bucket_lock(fields); - if ((tte_data = tte_hash_lookup_inline(th, va, &lookup_field)) == 0) + if ((tte_data = tte_hash_lookup_inline(th, va, &lookup_field, FALSE)) == 0) goto done; th->th_entries--; tte_hash_lookup_last_inline(th, va, &last_field); +#ifdef DEBUG + if (last_field->tte.tag == 0) + panic("lookup_last failed for va=0x%lx\n", va); +#endif /* move last field's values in to the field we are deleting */ if (lookup_field != last_field) tte_hash_set_field(lookup_field, last_field->tte.tag, last_field->tte.data); @@ -395,7 +446,7 @@ tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); hash_bucket_lock(fields); - otte_data = tte_hash_lookup_inline(th, va, &lookup_field); + otte_data = tte_hash_lookup_inline(th, va, &lookup_field, TRUE); #ifdef DEBUG if (otte_data) panic("mapping for va=0x%lx already exists tte_data=0x%lx\n", va, otte_data); @@ -411,7 +462,7 @@ tte_t tte_hash_lookup_nolock(tte_hash_t th, vm_offset_t va) { - return tte_hash_lookup_inline(th, va, NULL); + return tte_hash_lookup_inline(th, va, NULL, FALSE); } @@ -434,7 +485,7 @@ fields = (th->th_hashtable[hash_index].the_fields); hash_bucket_lock(fields); - tte_data = tte_hash_lookup_inline(th, va, NULL); + tte_data = tte_hash_lookup_inline(th, va, NULL, FALSE); hash_bucket_unlock_inline(fields); return (tte_data); @@ -468,7 +519,7 @@ hash_scratch = ((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size); set_hash_user_scratchpad(hash_scratch); - return hash_scratch; + return (hash_scratch); } tte_t @@ -485,10 +536,7 @@ fields = (th->th_hashtable[hash_index].the_fields); hash_bucket_lock(fields); - otte_data = tte_hash_lookup_inline(th, va, &lookup_field); -#ifdef TTE_DEBUG - printf("tte_hash_update(va=0x%lx, tte_data=0x%lx, index=%d)\n", va, tte_data, cookie); -#endif + otte_data = tte_hash_lookup_inline(th, va, &lookup_field, TRUE); tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); @@ -499,5 +547,5 @@ if (otte_data == 0) th->th_entries++; - return otte_data; + return (otte_data); } From owner-p4-projects@FreeBSD.ORG Sat May 6 12:46:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5979416A431; Sat, 6 May 2006 12:46:38 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 100FE16A428 for ; Sat, 6 May 2006 12:46:38 +0000 (UTC) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B329843D48 for ; Sat, 6 May 2006 12:46:37 +0000 (GMT) (envelope-from tkuik@freefall.freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k46Ckbmi060340 for ; Sat, 6 May 2006 12:46:37 GMT (envelope-from tkuik@freefall.freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k46Ckb4P060337 for perforce@freebsd.org; Sat, 6 May 2006 12:46:37 GMT (envelope-from tkuik@freefall.freebsd.org) Date: Sat, 6 May 2006 12:46:37 GMT Message-Id: <200605061246.k46Ckb4P060337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tkuik@freefall using -f From: tkuik To: Perforce Change Reviews Cc: Subject: PERFORCE change 96738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 12:46:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=96738 Change 96738 by tkuik@tkuik_freebsd on 2006/05/06 12:46:31 Added check for rings before display in sysctl output. Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/netback/netback.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/netback/netback.c#2 (text+ko) ==== @@ -904,7 +904,7 @@ #if XEN_NETBACK_FIXUP_CSUM /* Check if we need to compute a checksum. This happens */ - /* when briding from one domain to another. */ + /* when bridging from one domain to another. */ if ((m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)) fixup_checksum(m); #endif @@ -1414,31 +1414,29 @@ }; static char * -vif_sysctl_txring_info(netif_tx_back_ring_t *tx) +vif_sysctl_ring_info(netif_t *netif, int cmd) { char *buf = malloc(256, M_DEVBUF, M_WAITOK); if (buf) { - sprintf(buf, "nr_ents=%x req_cons=%x" - " req_prod=%x req_event=%x" - " rsp_prod=%x rsp_event=%x", - tx->nr_ents, tx->req_cons, - tx->sring->req_prod, tx->sring->req_event, - tx->sring->rsp_prod, tx->sring->rsp_event); - } - return buf; -} - -static char * -vif_sysctl_rxring_info(netif_rx_back_ring_t *rx) -{ - char *buf = malloc(256, M_DEVBUF, M_WAITOK); - if (buf) { - sprintf(buf, "nr_ents=%x req_cons=%x" - " req_prod=%x req_event=%x" - " rsp_prod=%x rsp_event=%x", - rx->nr_ents, rx->req_cons, - rx->sring->req_prod, rx->sring->req_event, - rx->sring->rsp_prod, rx->sring->rsp_event); + if (!netif->rings_connected) + sprintf(buf, "rings not connected\n"); + else if (cmd == VIF_SYSCTL_TXRING) { + netif_tx_back_ring_t *tx = &netif->tx; + sprintf(buf, "nr_ents=%x req_cons=%x" + " req_prod=%x req_event=%x" + " rsp_prod=%x rsp_event=%x", + tx->nr_ents, tx->req_cons, + tx->sring->req_prod, tx->sring->req_event, + tx->sring->rsp_prod, tx->sring->rsp_event); + } else { + netif_rx_back_ring_t *rx = &netif->rx; + sprintf(buf, "nr_ents=%x req_cons=%x" + " req_prod=%x req_event=%x" + " rsp_prod=%x rsp_event=%x", + rx->nr_ents, rx->req_cons, + rx->sring->req_prod, rx->sring->req_event, + rx->sring->rsp_prod, rx->sring->rsp_event); + } } return buf; } @@ -1458,10 +1456,8 @@ case VIF_SYSCTL_HANDLE: return sysctl_handle_int(oidp, NULL, netif->handle, req); case VIF_SYSCTL_TXRING: - value = buf = vif_sysctl_txring_info(&netif->tx); - break; case VIF_SYSCTL_RXRING: - value = buf = vif_sysctl_rxring_info(&netif->rx); + value = buf = vif_sysctl_ring_info(netif, arg2); break; default: return (EINVAL); From owner-p4-projects@FreeBSD.ORG Sat May 6 17:20:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1A7416A419; Sat, 6 May 2006 17:20:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 86D8F16A40F for ; Sat, 6 May 2006 17:20:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B97943D60 for ; Sat, 6 May 2006 17:20:09 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k46HK9EG031639 for ; Sat, 6 May 2006 17:20:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k46HK9EC031630 for perforce@freebsd.org; Sat, 6 May 2006 17:20:09 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 6 May 2006 17:20:09 GMT Message-Id: <200605061720.k46HK9EC031630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 17:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=96742 Change 96742 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/06 17:19:52 clean up the semantics of tte_hash_lookup_inline assert that hash has no remaining entries in reset remove fragment pages allocated during process run in reset update membars in lock routines Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#22 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#22 (text+ko) ==== @@ -151,17 +151,20 @@ while (atomic_cmpset_long(&fields[0].tte.data, data, data | VTD_LOCK)) data = fields[0].tte.data & ~VTD_LOCK; - membar(StoreLoad); + membar(LoadLoad); } static __inline void hash_bucket_unlock_inline(tte_hash_field_t fields) { + + membar(StoreStore|LoadStore); #ifdef DEBUG if ((fields[0].tte.data & VTD_LOCK) == 0) panic("trying to unlock bucket that isn't locked"); #endif + fields[0].tte.data &= ~VTD_LOCK; membar(StoreLoad); spinlock_exit(); @@ -186,7 +189,6 @@ th->th_size = (size >> PAGE_SHIFT); th->th_entries = 0; th->th_context = 0; - printf("setting kernel hashtable to %lx\n", va); th->th_hashtable = (tte_hash_entry_t)va; return th; @@ -254,14 +256,17 @@ struct tte_hash_fragment *fh; vm_page_t m; - for (fh = th->th_fhhead; fh != th->th_fhtail; fh = fh->thf_head.fh_next) { + for (fh = th->th_fhhead->thf_head.fh_next; fh != NULL; fh = fh->thf_head.fh_next) { m = PHYS_TO_VM_PAGE((vm_paddr_t)TLB_DIRECT_TO_PHYS((vm_offset_t)fh)); m->wire_count--; vm_page_free(m); } - fh = th->th_fhhead = th->th_fhtail; + fh = th->th_fhtail = th->th_fhhead; + fh->thf_head.fh_next = NULL; fh->thf_head.fh_count = 0; fh->thf_head.fh_free_head = 0; + if (th->th_entries != 0) + panic("%d remaining entries", th->th_entries); } static __inline void @@ -291,11 +296,11 @@ if (m == NULL) VM_WAIT; } - if (m->flags & PG_ZERO) + if ((m->flags & PG_ZERO) == 0) pmap_zero_page(m); fh->thf_head.fh_next = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); fh = th->th_fhtail = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); - printf("allocating new fragment page fh=%p \n", fh); + printf("allocated new fragment page fh=%p \n", fh); } newfield = fh->thf_entries[++fh->thf_head.fh_free_head].the_fields; @@ -304,7 +309,7 @@ field->of.flags = TH_COLLISION; field->of.next = newfield; - return (newfield); + return (&newfield[1]); } /* @@ -312,13 +317,13 @@ * and if field is non-null field will point to that entry * * if no match is found 0 is returned and if field is non-null - * and toappend is true field points to the first empty entry - * allocating a new bucket if the current one is full + * field is set to the first empty entry or the last entry in a bucket + * */ static __inline tte_t -tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, tte_hash_field_t *field, int toappend) +tte_hash_lookup_inline(tte_hash_t th, vm_offset_t va, tte_hash_field_t *field) { uint64_t hash_shift, hash_index; tte_hash_field_t fields; @@ -343,11 +348,8 @@ if (fields[3].of.flags & TH_COLLISION) { fields = fields[3].of.next; goto retry; - } else if (toappend == TRUE) { - fields = tte_hash_allocate_fragment_entry(th, &fields[3]); - /* entry following shifted entry is the first unallocated */ - i = 1; } + i = 3; } if (field) @@ -407,7 +409,7 @@ hash_bucket_lock(fields); - if ((tte_data = tte_hash_lookup_inline(th, va, &lookup_field, FALSE)) == 0) + if ((tte_data = tte_hash_lookup_inline(th, va, &lookup_field)) == 0) goto done; th->th_entries--; @@ -446,7 +448,10 @@ tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); hash_bucket_lock(fields); - otte_data = tte_hash_lookup_inline(th, va, &lookup_field, TRUE); + otte_data = tte_hash_lookup_inline(th, va, &lookup_field); + if (lookup_field->tte.tag != 0) + lookup_field = tte_hash_allocate_fragment_entry(th, lookup_field); + #ifdef DEBUG if (otte_data) panic("mapping for va=0x%lx already exists tte_data=0x%lx\n", va, otte_data); @@ -462,7 +467,7 @@ tte_t tte_hash_lookup_nolock(tte_hash_t th, vm_offset_t va) { - return tte_hash_lookup_inline(th, va, NULL, FALSE); + return tte_hash_lookup_inline(th, va, NULL); } @@ -485,7 +490,7 @@ fields = (th->th_hashtable[hash_index].the_fields); hash_bucket_lock(fields); - tte_data = tte_hash_lookup_inline(th, va, NULL, FALSE); + tte_data = tte_hash_lookup_inline(th, va, NULL); hash_bucket_unlock_inline(fields); return (tte_data); @@ -536,8 +541,10 @@ fields = (th->th_hashtable[hash_index].the_fields); hash_bucket_lock(fields); - otte_data = tte_hash_lookup_inline(th, va, &lookup_field, TRUE); - + otte_data = tte_hash_lookup_inline(th, va, &lookup_field); + if (otte_data == 0 && lookup_field->tte.tag != 0) + lookup_field = tte_hash_allocate_fragment_entry(th, lookup_field); + tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); tte_hash_set_field(lookup_field, tag, tte_data); From owner-p4-projects@FreeBSD.ORG Sat May 6 18:39:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEFB316A404; Sat, 6 May 2006 18:39:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 716F216A401 for ; Sat, 6 May 2006 18:39:46 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D5B443D46 for ; Sat, 6 May 2006 18:39:46 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k46IdkH6074791 for ; Sat, 6 May 2006 18:39:46 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k46Idjhq074785 for perforce@freebsd.org; Sat, 6 May 2006 18:39:45 GMT (envelope-from csjp@freebsd.org) Date: Sat, 6 May 2006 18:39:45 GMT Message-Id: <200605061839.k46Idjhq074785@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 96744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 18:39:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=96744 Change 96744 by csjp@csjp_xor on 2006/05/06 18:39:24 Since pam_strerror(3) is capable of returning NULL, check the return value and if it's NULL set a generic error message, instead of passing it along in the audit record. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#16 (text+ko) ==== @@ -170,6 +170,9 @@ const char *p, *user, *shell, *mytty, **nargv; struct sigaction sa, sa_int, sa_quit, sa_pipe; int temp, fds[2]; +#ifdef USE_BSM_AUDIT + const char *aerr; +#endif shell = class = cleanenv = NULL; asme = asthem = fastlogin = statusp = 0; @@ -331,9 +334,11 @@ PAM_CHANGE_EXPIRED_AUTHTOK); if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT + aerr = pam_strerror(pamh, retcode); + if (aerr == NULL) + aerr = "Unknown PAM error"; if (audit_submit(AUE_su, getuid(), 1, EPERM, - "pam_chauthtok: %s", - pam_strerror(pamh, retcode))) + "pam_chauthtok: %s", aerr)) errx(1, "Permission denied"); #endif syslog(LOG_ERR, "pam_chauthtok: %s", From owner-p4-projects@FreeBSD.ORG Sat May 6 20:11:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7F5B16A40B; Sat, 6 May 2006 20:11:38 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9111916A401 for ; Sat, 6 May 2006 20:11:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 424A943D45 for ; Sat, 6 May 2006 20:11:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k46KBc8P023318 for ; Sat, 6 May 2006 20:11:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k46KBc8F023311 for perforce@freebsd.org; Sat, 6 May 2006 20:11:38 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 6 May 2006 20:11:38 GMT Message-Id: <200605062011.k46KBc8F023311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 20:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=96747 Change 96747 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/06 20:11:36 fix tte_hash_lookup_last_inline generalize number of hash entries Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#23 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#23 (text+ko) ==== @@ -62,10 +62,11 @@ #define MAX_HASH_SIZE 16 #define HASH_MASK(th) ((th->th_size << (PAGE_SHIFT - THE_SHIFT)) - 1) #define HASH_VALID 0x1 +#define HASH_ENTRIES 4 +#define NULL_TAG 0 - struct tte_hash_entry; #define MAX_FRAGMENT_ENTRIES ((PAGE_SIZE / sizeof(struct tte_hash_entry)) - 1) @@ -83,7 +84,7 @@ typedef struct tte_hash_entry { - tte_hash_field the_fields[4]; + tte_hash_field the_fields[HASH_ENTRIES]; } *tte_hash_entry_t; @@ -338,20 +339,23 @@ entry = 0; retry: - for (i = 0; i < 4 && fields[i].tte.tag != 0; i++) { + for (i = 0; i < HASH_ENTRIES && fields[i].tte.tag != 0; i++) { if (((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M))) { entry = (fields[i].tte.data & ~VTD_LOCK); break; } } - if (i == 4) { - if (fields[3].of.flags & TH_COLLISION) { - fields = fields[3].of.next; + if (i == HASH_ENTRIES) { + if (fields[(HASH_ENTRIES - 1)].of.flags & TH_COLLISION) { + fields = fields[(HASH_ENTRIES - 1)].of.next; goto retry; } - i = 3; + i = (HASH_ENTRIES - 1); } + if (i >= HASH_ENTRIES) + panic("invalid state"); + if (field) *field = &fields[i]; @@ -364,33 +368,40 @@ { uint64_t hash_shift, hash_index; tte_hash_field_t fields; - int i; + int i, index; /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); + index = -1;; + retry: - for (i = 0; i < 4 && fields[i + 1].tte.tag != 0; i++) - ; + for (i = 0; i < (HASH_ENTRIES - 1); i++) + if (fields[i + 1].tte.tag == 0) { + index = i; + break; + } - if (i == 4) { - if (fields[3].of.flags & TH_COLLISION) { - if (fields[3].of.next[0].tte.tag != 0) { - fields = fields[3].of.next; + if (index != -1) + *field = &fields[index]; + else { + if (fields[(HASH_ENTRIES - 1)].of.flags & TH_COLLISION) { + if (fields[(HASH_ENTRIES - 1)].of.next[0].tte.tag != 0) { + fields = fields[(HASH_ENTRIES - 1)].of.next; goto retry; } else { /* 3rd entry is last */ - *field = &fields[2]; + *field = &fields[(HASH_ENTRIES - 2)]; /* clear collision pointer */ - tte_hash_set_field(&fields[3], 0, 0); + tte_hash_set_field(&fields[(HASH_ENTRIES - 1)], 0, 0); } } else - *field = &fields[3]; /* 4th is the last entry */ - } else - *field = &fields[i]; + *field = &fields[(HASH_ENTRIES - 1)]; /* last in bucket */ + } + } From owner-p4-projects@FreeBSD.ORG Sat May 6 21:22:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 159F416A401; Sat, 6 May 2006 21:22:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BC56916A407 for ; Sat, 6 May 2006 21:22:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9651B43D6B for ; Sat, 6 May 2006 21:22:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k46LM5xk073140 for ; Sat, 6 May 2006 21:22:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k46LM5Qi073132 for perforce@freebsd.org; Sat, 6 May 2006 21:22:05 GMT (envelope-from jb@freebsd.org) Date: Sat, 6 May 2006 21:22:05 GMT Message-Id: <200605062122.k46LM5Qi073132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 21:22:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=96751 Change 96751 by jb@jb_freebsd2 on 2006/05/06 21:22:05 Suck the 'cyclic' timer front end source. This provides high-speed timers where 'high' is a relative term -- it is limited by the processor architecture. On i386, most processors can't do better than 1 ms. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#1 branch Differences ...