From owner-p4-projects@FreeBSD.ORG Sun Aug 30 07:52:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EB451065670; Sun, 30 Aug 2009 07:52:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43469106566B for ; Sun, 30 Aug 2009 07:52:32 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 194488FC0C for ; Sun, 30 Aug 2009 07:52:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7U7qVcT048643 for ; Sun, 30 Aug 2009 07:52:31 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7U7qVcc048641 for perforce@freebsd.org; Sun, 30 Aug 2009 07:52:31 GMT (envelope-from mav@freebsd.org) Date: Sun, 30 Aug 2009 07:52:31 GMT Message-Id: <200908300752.n7U7qVcc048641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 167965 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 Aug 2009 07:52:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=167965 Change 167965 by mav@mav_mavbook on 2009/08/30 07:51:34 Separate rtc_lock from clock_lock and make it not spinning. Affected files ... .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#28 edit .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#26 edit .. //depot/projects/scottl-camlock/src/sys/isa/atrtc.c#3 edit .. //depot/projects/scottl-camlock/src/sys/isa/rtc.h#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#28 (text+ko) ==== @@ -1592,6 +1592,7 @@ * initialization can use DELAY(). */ i8254_init(); + atrtc_init(); /* * Initialize the console before we print anything out. ==== //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#26 (text+ko) ==== @@ -2580,6 +2580,7 @@ * initialization can use DELAY(). */ i8254_init(); + atrtc_init(); #endif /* @@ -2834,6 +2835,7 @@ * initialization can use DELAY(). */ i8254_init(); + atrtc_init(); /* * Initialize the console before we print anything out. ==== //depot/projects/scottl-camlock/src/sys/isa/atrtc.c#3 (text+ko) ==== @@ -46,11 +46,14 @@ #include #endif -#define RTC_LOCK mtx_lock_spin(&clock_lock) -#define RTC_UNLOCK mtx_unlock_spin(&clock_lock) +#define RTC_LOCK_INIT \ + mtx_init(&rtc_lock, "rtc", NULL, MTX_NOPROFILE) +#define RTC_LOCK mtx_lock(&rtc_lock) +#define RTC_UNLOCK mtx_unlock(&rtc_lock) int atrtcclock_disable = 0; +static struct mtx rtc_lock; static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -59,6 +62,12 @@ * RTC support routines */ +void +atrtc_init(void) +{ + RTC_LOCK_INIT; +} + int rtcin(int reg) { ==== //depot/projects/scottl-camlock/src/sys/isa/rtc.h#5 (text+ko) ==== @@ -112,9 +112,9 @@ #define RTC_CENTURY 0x32 /* current century */ #ifdef _KERNEL -extern struct mtx clock_lock; extern int atrtcclock_disable; int atrtc_setup_clock(void); +void atrtc_init(void); int rtcin(int reg); void atrtc_start(void); void atrtc_rate(unsigned rate); From owner-p4-projects@FreeBSD.ORG Sun Aug 30 08:44:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6F581065674; Sun, 30 Aug 2009 08:44:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A928D1065672 for ; Sun, 30 Aug 2009 08:44:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 988DA8FC17 for ; Sun, 30 Aug 2009 08:44:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7U8iSJo053738 for ; Sun, 30 Aug 2009 08:44:28 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7U8iSYP053736 for perforce@freebsd.org; Sun, 30 Aug 2009 08:44:28 GMT (envelope-from mav@freebsd.org) Date: Sun, 30 Aug 2009 08:44:28 GMT Message-Id: <200908300844.n7U8iSYP053736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 167966 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 Aug 2009 08:44:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=167966 Change 167966 by mav@mav_mavbook on 2009/08/30 08:43:32 Remove msleep() timeout from g_io_schedule_up/down(). It works fine without it, saving few percents of CPU on high request rates without need to rearm callout twice per request, Affected files ... .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#17 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#17 (text+ko) ==== @@ -567,7 +567,7 @@ if (bp == NULL) { CTR0(KTR_GEOM, "g_down going to sleep"); msleep(&g_wait_down, &g_bio_run_down.bio_queue_lock, - PRIBIO | PDROP, "-", hz/10); + PRIBIO | PDROP, "-", 0); continue; } CTR0(KTR_GEOM, "g_down has work to do"); @@ -672,7 +672,7 @@ } CTR0(KTR_GEOM, "g_up going to sleep"); msleep(&g_wait_up, &g_bio_run_up.bio_queue_lock, - PRIBIO | PDROP, "-", hz/10); + PRIBIO | PDROP, "-", 0); } } From owner-p4-projects@FreeBSD.ORG Sun Aug 30 09:41:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D2CB1065673; Sun, 30 Aug 2009 09:41:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01D611065670 for ; Sun, 30 Aug 2009 09:41:32 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CBDCF8FC0A for ; Sun, 30 Aug 2009 09:41:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7U9fVtQ068914 for ; Sun, 30 Aug 2009 09:41:31 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7U9fV6E068912 for perforce@freebsd.org; Sun, 30 Aug 2009 09:41:31 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 30 Aug 2009 09:41:31 GMT Message-Id: <200908300941.n7U9fV6E068912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 167969 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 Aug 2009 09:41:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=167969 Change 167969 by rene@rene_self on 2009/08/30 09:41:26 MFen www/en/vendors.html 1.3 -> 1.4 (SRCID bump) Affected files ... .. //depot/projects/docproj_nl/www/nl/vendors.html#5 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/vendors.html#5 (text+ko) ==== @@ -3,7 +3,7 @@ From owner-p4-projects@FreeBSD.ORG Sun Aug 30 11:00:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA607106568C; Sun, 30 Aug 2009 11:00:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5487A1065680 for ; Sun, 30 Aug 2009 11:00:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 415168FC15 for ; Sun, 30 Aug 2009 11:00:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UB0NrU076071 for ; Sun, 30 Aug 2009 11:00:23 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UB0Ej4076035 for perforce@freebsd.org; Sun, 30 Aug 2009 11:00:14 GMT (envelope-from trasz@freebsd.org) Date: Sun, 30 Aug 2009 11:00:14 GMT Message-Id: <200908301100.n7UB0Ej4076035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 167972 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 Aug 2009 11:00:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=167972 Change 167972 by trasz@trasz_anger on 2009/08/30 10:59:18 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#33 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#38 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mknodes.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bzip2/FREEBSD-vendor#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic2mime#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/LICENSE#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.aut#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.dsb#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.dsg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.dsu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.o2e#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.o9c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.o9u#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/Makefile.wnm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/NEWS#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/brac.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/ch.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/charset.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/charset.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/cmd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/command.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/configure.ac#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/cvt.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/decode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/defines.ds#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/defines.o2#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/defines.o9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/defines.wn#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/edit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/filename.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/forwback.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/funcs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/ifile.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/input.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/jump.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/less.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/less.man#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/less.nro#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lessecho.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lessecho.man#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lessecho.nro#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lesskey.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lesskey.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lesskey.man#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lesskey.nro#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lglob.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/line.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/linenum.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/lsystem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/mark.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/mkhelp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/optfunc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/option.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/option.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/opttbl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/os.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/output.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/pattern.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/pattern.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/pckeys.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/position.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/position.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/prompt.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/screen.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/scrsize.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/search.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/signal.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/tags.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/ttyin.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/version.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/FREEBSD-vendor#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/NEWS#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/README#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/VERSION#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/config/config.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure.ac#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/etc/audit_event#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openpam/FREEBSD-vendor#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/top/display.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/traceroute/as.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/traceroute/as.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/FREEBSD-vendor#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/md4.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/d1_both.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/bftest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/bntest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/casttest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/destest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/dhtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/dsatest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/ecdhtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/ecdsatest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/ectest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/enginetest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/evp_test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/exptest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_aesavs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_desmovs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_dsatest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_dssvs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_hmactest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_randtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_rngvs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_rsagtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_rsastest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_rsavtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_shatest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/fips_test_suite.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/hmactest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/ideatest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/jpaketest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/md2test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/md4test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/md5test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/mdc2test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/randtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/rc2test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/rc4test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/rc5test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/rmdtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/rsa_test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/sha1test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/sha256t.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/sha512t.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/shatest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/test/ssltest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/periodic.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/freebsd-update.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/portsnap.conf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/hostid#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/hostid_save#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ipsec#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/static_arp#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/zfs#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/zvol#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/patch/pch.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/mac.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/mac_free.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/mac_get.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/mac_set.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/mac_text.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/posix1e.3#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/ptsname.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/mmap.2#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_vnet.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.3#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.atom.3#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core.3#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core2.3#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.iaf.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.k7.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.k8.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p4.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p5.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p6.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc_capabilities.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc_read.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb.3#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb10.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb10.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb10_desc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb10_io.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20_compat01.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20_int.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/lib32-make.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/mm-mtree.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/release/svnbranch.awk#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/geom_part.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/route/route.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/savecore/savecore.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/umount/umount.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ahci.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/altq.4#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/asmc.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/epair.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mfi.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mpt.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/polling.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/u3g.4#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/urtw.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/freebsd-update.conf.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/tmpfs.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/release.7#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_amrr.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_beacon.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_bmiss.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_crypto.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_ddb.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_input.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_ioctl.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_node.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_output.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_proto.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_radiotap.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_regdomain.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_scan.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_vap.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/kproc.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/kthread.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/netisr.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/sglist.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/taskqueue.9#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/australasia#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mp_machdep.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmc_mdep.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/smp.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/minidump_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/CAMBRIA#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/common.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/db78xxx.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/db88f6xxx.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvreg.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/mutex.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/vnode.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_sockio.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#38 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#47 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#32 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.amd64#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.arm#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.i386#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.pc98#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_subr.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_subr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/rdma/rdma_cma.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_sym.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aac.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_bus.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amdtemp/amdtemp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amr.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_regdomain.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_bufs.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drv.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_fops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_sysctl.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_blit.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_cp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drm.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_em.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_core.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_ppro.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_x86.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/isc_cam.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ispfw/asm_2400.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ispfw/asm_2500.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mfi/mfi.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mfi/mfi_ioctl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mlx/mlx.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmc.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpo.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pty/pty.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/rp/rp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snp/snp.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/at91dci.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/avr32dci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/musb_otg.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci_pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci_pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/usb_controller.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uss820dci.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/misc/ufm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_aue.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uipaq.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ulpt.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvisor.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/urio.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_busdma.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_controller.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_handle_request.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hid.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_parse.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_request.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uath.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_upgt.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkback/blkback.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/netback/netback.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsport.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clvnops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/smapi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/trap.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/md_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pmap.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pmc_mdep.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/smp.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mp_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/smp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isahint.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_conf.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cons.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_poll.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sx.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sysctl.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thread.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_uuid.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_vimage.c#12 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_pcpu.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_sglist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_smp.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_socket.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pty.c#6 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_ttydisc.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_domain.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/smp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/mp_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#30 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/drm/radeon/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/if_epair/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ispfw/isp_2400_multi/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ispfw/isp_2500/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ispfw/isp_2500_multi/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/pty/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_buffer.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpfdesc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bridgestp.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/flowtable.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/flowtable.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_clone.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ef.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_enc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_epair.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_faith.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gre.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_llatbl.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_llatbl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_loop.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_mib.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_spppsubr.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_stf.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_vlan.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_cb.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_usrreq.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/vnet.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/vnet.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatalk/at_control.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_eiface.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_gif.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_iface.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_pipe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/icmp6.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/icmp_var.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/igmp.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_gif.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_proto.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_rmx.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_divert.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_ipsec.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_options.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_var.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_nat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_input.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_uio.h#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_hostcache.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_offload.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_reass.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timewait.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_var.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/dest6.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/frag6.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_gif.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_mcast.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_rmx.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_src.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_ipsec.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_output.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/route6.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/scope6.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_input.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/keysock.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipcomp.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipip.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_tcp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/bootp_subr.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_subs.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/smp.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mp_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_dg.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_rc.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_vc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpc_generic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_dg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_generic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_vc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_private.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/bus.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/conf.h#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cons.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/imgact_elf.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lock.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#35 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pcpu.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/priv.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sglist.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/smp.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysctl.h#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/taskqueue.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttydisc.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/types.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vimage.h#17 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/device_pager.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/sg_pager.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_extern.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_glue.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xdr/xdr_mbuf.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_probe.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITH_BIND_LIBS#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Dependencies#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/kerneldoc/subsys/common-Doxyfile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/eval3.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/execution/func1.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/execution/func2.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/poll/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/poll/sockpoll.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/priv/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/priv/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/priv/priv_netinet_ipsec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athpoke/athpoke.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/vimage/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/vimage/vimage.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/vimage/vimage.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fstat/fstat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fstat/zfs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gzip/gzip.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/less/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/look/look.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat.1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpidump/acpi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpidump/acpidump.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arp/arp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/getpmac/getpmac.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/iostat/iostat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/jls.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_cmd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_config.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_drive.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_evt.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_flash.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_patrol.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_show.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfi_volume.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfiutil.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfiutil.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mfiutil/mfiutil.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mpt_cam.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mpt_cmd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mpt_config.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mpt_drive.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mpt_evt.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mpt_show.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mpt_volume.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mptutil.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mptutil.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptutil/mptutil.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ntp/scripts/mkver#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/main.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/ether.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/exec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/exec.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/netgraph.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/physical.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/ppp.8.m4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/tty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pstat/pstat.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/devices.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/install.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/media.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/sysinstall.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute6/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute6/traceroute6.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wpa/wpa_cli/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zic.c#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#33 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.204 2009/07/20 19:51:47 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.206 2009/08/23 18:28:58 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090801: vimage.h removed in favour of vnet.h +OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 OLD_LIBS+=lib/libalias.so.6 OLD_LIBS+=lib/libavl.so.1 @@ -801,8 +803,6 @@ OLD_FILES+=rescue/fdisk OLD_FILES+=rescue/gpt .endif -# 20071026: kthread(9)/kproc(9) API changes -OLD_FILES+=usr/share/man/man9/kthread_create.9.gz # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#38 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: - FreeBSD 8.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW: + FreeBSD 9.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090813: + Remove the option STOP_NMI. The default action is now to use NMI + only for KDB via the newly introduced function stop_cpus_hard() + and maintain stop_cpus() to just use a normal IPI_STOP on ia32 + and amd64. + 20090719: Bump the shared library version numbers for all libraries that do not use symbol versioning as part of the 8.0-RELEASE cycle. @@ -65,9 +71,9 @@ 20090624: The ABI of various structures related to the SYSV IPC API have - been changed. As a result, the COMPAT_FREEBSD[456] kernel - options now all require COMPAT_FREEBSD7. Bump __FreeBSD_version - to 800100. + been changed. As a result, the COMPAT_FREEBSD[456] and COMPAT_43 + kernel options now all require COMPAT_FREEBSD7. + Bump __FreeBSD_version to 800100. 20090622: Layout of struct vnet has changed as routing related variables @@ -1665,4 +1671,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.631 2009/07/19 17:25:24 kensmith Exp $ +$FreeBSD: src/UPDATING,v 1.634 2009/08/22 23:44:37 kensmith Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.64 2009/06/23 22:53:34 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $"); #include #include @@ -785,6 +785,7 @@ INTOFF; savelocalvars = localvars; localvars = NULL; + reffunc(cmdentry.u.func); INTON; savehandler = handler; if (setjmp(jmploc.loc)) { @@ -794,6 +795,7 @@ freeparam(&shellparam); shellparam = saveparam; } + unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; handler = savehandler; @@ -805,11 +807,12 @@ funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) - evaltree(cmdentry.u.func, EV_TESTED); + evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); else - evaltree(cmdentry.u.func, 0); + evaltree(getfuncnode(cmdentry.u.func), 0); funcnest--; INTOFF; + unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; freeparam(&shellparam); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.34 2009/06/24 22:04:04 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $"); #include #include @@ -286,7 +286,7 @@ out1fmt("function %s", cmdp->cmdname); if (verbose) { INTOFF; - name = commandtext(cmdp->param.func); + name = commandtext(getfuncnode(cmdp->param.func)); out1c(' '); out1str(name); ckfree(name); @@ -583,7 +583,7 @@ while ((cmdp = *pp) != NULL) { if (cmdp->cmdtype == CMDFUNCTION) { *pp = cmdp->next; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 30 11:17:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2DEB1065676; Sun, 30 Aug 2009 11:17:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96F651065673 for ; Sun, 30 Aug 2009 11:17:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8548E8FC15 for ; Sun, 30 Aug 2009 11:17:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UBHgOm078283 for ; Sun, 30 Aug 2009 11:17:42 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UBHgND078281 for perforce@freebsd.org; Sun, 30 Aug 2009 11:17:42 GMT (envelope-from trasz@freebsd.org) Date: Sun, 30 Aug 2009 11:17:42 GMT Message-Id: <200908301117.n7UBHgND078281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 167974 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 Aug 2009 11:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=167974 Change 167974 by trasz@trasz_anger on 2009/08/30 11:17:25 Fix mismerge. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/rpc/xdr.h#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/rpc/xdr.h#3 (text+ko) ==== @@ -1,112 +1,70 @@ /* - * CDDL HEADER START + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. * - * CDDL HEADER END + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $ + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -/* - * Portions of this source code were derived from Berkeley 4.3 BSD - * under license from the Regents of the University of California. - */ - #ifndef _OPENSOLARIS_RPC_XDR_H_ #define _OPENSOLARIS_RPC_XDR_H_ #include_next #ifndef _KERNEL -#include_next -/* - * Strangely, my glibc version (2.3.6) doesn't have xdr_control(), so - * we have to hack it in here (source taken from OpenSolaris). - * By the way, it is assumed the xdrmem implementation is used. - */ - -#undef xdr_control -#define xdr_control(a,b,c) xdrmem_control(a,b,c) +#include /* - * These are the request arguments to XDR_CONTROL. + * Taken from sys/xdr/xdr_mem.c. * - * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream. - * XDR_SKIPBYTES - skips the next N bytes in the XDR stream. - * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from - * the XDR stream being moved over RDMA - * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in - * the XDR stream moving over RDMA. + * FreeBSD's userland XDR doesn't implement control method (only the kernel), + * but OpenSolaris nvpair still depend on it, so we have to implement it here. */ -#define XDR_PEEK 2 -#define XDR_SKIPBYTES 3 -#define XDR_RDMAGET 4 -#define XDR_RDMASET 5 - -/* FIXME: probably doesn't work */ static __inline bool_t xdrmem_control(XDR *xdrs, int request, void *info) { xdr_bytesrec *xptr; - int32_t *int32p; - int len; switch (request) { - case XDR_GET_BYTES_AVAIL: xptr = (xdr_bytesrec *)info; xptr->xc_is_last_record = TRUE; xptr->xc_num_avail = xdrs->x_handy; return (TRUE); - - case XDR_PEEK: - /* - * Return the next 4 byte unit in the XDR stream. - */ - if (xdrs->x_handy < sizeof (int32_t)) - return (FALSE); - int32p = (int32_t *)info; - *int32p = (int32_t)ntohl((uint32_t) - (*((int32_t *)(xdrs->x_private)))); - return (TRUE); - - case XDR_SKIPBYTES: - /* - * Skip the next N bytes in the XDR stream. - */ - int32p = (int32_t *)info; - len = RNDUP((int)(*int32p)); - if ((xdrs->x_handy -= len) < 0) - return (FALSE); - xdrs->x_private += len; - return (TRUE); - + default: + assert(!"unexpected request"); } return (FALSE); } + +#undef XDR_CONTROL +#define XDR_CONTROL(xdrs, req, op) \ + (((xdrs)->x_ops->x_control == NULL) ? \ + xdrmem_control((xdrs), (req), (op)) : \ + (*(xdrs)->x_ops->x_control)(xdrs, req, op)) + #endif /* !_KERNEL */ #endif /* !_OPENSOLARIS_RPC_XDR_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Aug 30 11:19:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F139B1065673; Sun, 30 Aug 2009 11:19:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFEA6106566C for ; Sun, 30 Aug 2009 11:19:44 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EC928FC12 for ; Sun, 30 Aug 2009 11:19:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UBJiV4078426 for ; Sun, 30 Aug 2009 11:19:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UBJiH4078424 for perforce@freebsd.org; Sun, 30 Aug 2009 11:19:44 GMT (envelope-from trasz@freebsd.org) Date: Sun, 30 Aug 2009 11:19:44 GMT Message-Id: <200908301119.n7UBJiH4078424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 167975 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 Aug 2009 11:19:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=167975 Change 167975 by trasz@trasz_anger on 2009/08/30 11:19:21 Remove a delta that has somehow snuck in. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#27 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#27 (text+ko) ==== @@ -85,10 +85,6 @@ options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options IPSEC -device crypto -device carp - # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC From owner-p4-projects@FreeBSD.ORG Sun Aug 30 15:58:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A415D1065672; Sun, 30 Aug 2009 15:58:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EF8B1065670 for ; Sun, 30 Aug 2009 15:58:53 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C55D8FC0C for ; Sun, 30 Aug 2009 15:58:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UFwq2I012902 for ; Sun, 30 Aug 2009 15:58:52 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UFwqnB012898 for perforce@freebsd.org; Sun, 30 Aug 2009 15:58:52 GMT (envelope-from mav@freebsd.org) Date: Sun, 30 Aug 2009 15:58:52 GMT Message-Id: <200908301558.n7UFwqnB012898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 167982 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 Aug 2009 15:58:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=167982 Change 167982 by mav@mav_mavbook on 2009/08/30 15:57:54 IFC Affected files ... .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#12 integrate .. //depot/projects/scottl-camlock/src/UPDATING#14 integrate .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mknodes.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/scottl-camlock/src/contrib/traceroute/as.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/traceroute/as.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/d1_both.c#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/periodic.conf#4 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#6 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipsec#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/static_arp#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.d/wpa_supplicant#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/patch/pch.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_support.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/ptsname.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.core2.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_read.3#2 integrate .. //depot/projects/scottl-camlock/src/release/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/release/scripts/lib32-make.sh#2 integrate .. //depot/projects/scottl-camlock/src/release/scripts/mm-mtree.sh#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/scottl-camlock/src/sbin/route/route.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/savecore/savecore.c#3 integrate .. //depot/projects/scottl-camlock/src/share/examples/cvsup/stable-supfile#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ahci.4#7 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ip6.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/kproc.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/kthread.9#3 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/africa#4 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#5 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/australasia#4 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/europe#4 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/leapseconds#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/undefined.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/mv/common.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/mvreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixdp425_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#44 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mutex.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#34 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#44 integrate .. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#31 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#16 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#57 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asmc/asmc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_blit.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_cp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drm.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mge.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pty/pty.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snp/snp.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvgarndr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvidctl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/ufm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/urio.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elf_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/vesa.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/isa/isahint.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_cons.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_subr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_uuid.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pty.c#12 delete .. //depot/projects/scottl-camlock/src/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_domain.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#34 integrate .. //depot/projects/scottl-camlock/src/sys/modules/drm/radeon/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/pty/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#25 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_gif.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipip.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/clnt_dg.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/clnt_rc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/clnt_vc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/rpc_generic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/svc_dg.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/svc_generic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/svc_vc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/conf.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/cons.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/imgact_elf.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#30 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#25 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/types.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#15 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Dependencies#3 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/tools/kerneldoc/subsys/common-Doxyfile#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/eval3.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/execution/func1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/execution/func2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/poll/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/poll/sockpoll.c#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/ath/athpoke/athpoke.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/look/look.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/extern.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/pr_time.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpi.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpi_user.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpidump.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpidump.h#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/ether.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/exec.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/exec.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/netgraph.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/physical.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/ppp.8.m4#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/tty.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/traceroute6/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_cli/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/zic/zic.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.205 2009/08/01 19:26:27 rwatson Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.206 2009/08/23 18:28:58 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -803,8 +803,6 @@ OLD_FILES+=rescue/fdisk OLD_FILES+=rescue/gpt .endif -# 20071026: kthread(9)/kproc(9) API changes -OLD_FILES+=usr/share/man/man9/kthread_create.9.gz # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/scottl-camlock/src/UPDATING#14 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: - FreeBSD 8.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW: + FreeBSD 9.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -1671,4 +1671,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.633 2009/08/13 17:09:45 attilio Exp $ +$FreeBSD: src/UPDATING,v 1.634 2009/08/22 23:44:37 kensmith Exp $ ==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.64 2009/06/23 22:53:34 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $"); #include #include @@ -785,6 +785,7 @@ INTOFF; savelocalvars = localvars; localvars = NULL; + reffunc(cmdentry.u.func); INTON; savehandler = handler; if (setjmp(jmploc.loc)) { @@ -794,6 +795,7 @@ freeparam(&shellparam); shellparam = saveparam; } + unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; handler = savehandler; @@ -805,11 +807,12 @@ funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) - evaltree(cmdentry.u.func, EV_TESTED); + evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); else - evaltree(cmdentry.u.func, 0); + evaltree(getfuncnode(cmdentry.u.func), 0); funcnest--; INTOFF; + unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; freeparam(&shellparam); ==== //depot/projects/scottl-camlock/src/bin/sh/exec.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.34 2009/06/24 22:04:04 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $"); #include #include @@ -286,7 +286,7 @@ out1fmt("function %s", cmdp->cmdname); if (verbose) { INTOFF; - name = commandtext(cmdp->param.func); + name = commandtext(getfuncnode(cmdp->param.func)); out1c(' '); out1str(name); ckfree(name); @@ -583,7 +583,7 @@ while ((cmdp = *pp) != NULL) { if (cmdp->cmdtype == CMDFUNCTION) { *pp = cmdp->next; - freefunc(cmdp->param.func); + unreffunc(cmdp->param.func); ckfree(cmdp); } else { pp = &cmdp->next; @@ -670,7 +670,7 @@ INTOFF; cmdp = cmdlookup(name, 1); if (cmdp->cmdtype == CMDFUNCTION) { - freefunc(cmdp->param.func); + unreffunc(cmdp->param.func); } cmdp->cmdtype = entry->cmdtype; cmdp->param = entry->u; @@ -705,7 +705,7 @@ struct tblentry *cmdp; if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->cmdtype == CMDFUNCTION) { - freefunc(cmdp->param.func); + unreffunc(cmdp->param.func); delete_cmd_entry(); return (0); } ==== //depot/projects/scottl-camlock/src/bin/sh/exec.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD: src/bin/sh/exec.h,v 1.15 2006/04/09 12:21:20 stefanf Exp $ + * $FreeBSD: src/bin/sh/exec.h,v 1.16 2009/08/23 21:09:46 jilles Exp $ */ /* values of cmdtype */ @@ -46,11 +46,12 @@ TYPECMD_TYPE /* type */ }; +union node; struct cmdentry { int cmdtype; union param { int index; - union node *func; + struct funcdef *func; } u; int special; }; ==== //depot/projects/scottl-camlock/src/bin/sh/mknodes.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.18 2008/08/04 01:25:48 cperciva Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.20 2009/08/28 22:41:25 jilles Exp $"); /* * This program reads the nodetypes file and nodes.c.pat file. It generates @@ -248,8 +248,11 @@ fputs("\tstruct nodelist *next;\n", hfile); fputs("\tunion node *n;\n", hfile); fputs("};\n\n\n", hfile); - fputs("union node *copyfunc(union node *);\n", hfile); - fputs("void freefunc(union node *);\n", hfile); + fputs("struct funcdef;\n", hfile); + fputs("struct funcdef *copyfunc(union node *);\n", hfile); + fputs("union node *getfuncnode(struct funcdef *);\n", hfile); + fputs("void reffunc(struct funcdef *);\n", hfile); + fputs("void unreffunc(struct funcdef *);\n", hfile); fputs(writer, cfile); while (fgets(line, sizeof line, patfile) != NULL) { ==== //depot/projects/scottl-camlock/src/bin/sh/nodes.c.pat#2 (text+ko) ==== @@ -30,11 +30,12 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.15 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.17 2009/08/28 22:41:25 jilles Exp $ */ #include #include +#include /* * Routine for dealing with parsed shell commands. */ @@ -60,25 +61,40 @@ STATIC char *nodesavestr(char *); +struct funcdef { + unsigned int refcount; + union node n; +}; /* * Make a copy of a parse tree. */ -union node * +struct funcdef * copyfunc(union node *n) { + struct funcdef *fn; + if (n == NULL) return NULL; - funcblocksize = 0; + funcblocksize = offsetof(struct funcdef, n); funcstringsize = 0; calcsize(n); - funcblock = ckmalloc(funcblocksize + funcstringsize); - funcstring = (char *)funcblock + funcblocksize; - return copynode(n); + fn = ckmalloc(funcblocksize + funcstringsize); + fn->refcount = 1; + funcblock = (char *)fn + offsetof(struct funcdef, n); + funcstring = (char *)fn + funcblocksize; + copynode(n); + return fn; } +union node * +getfuncnode(struct funcdef *fn) +{ + return fn == NULL ? NULL : &fn->n; +} + STATIC void calcsize(union node *n) @@ -144,14 +160,26 @@ } +void +reffunc(struct funcdef *fn) +{ + if (fn) + fn->refcount++; +} + /* - * Free a parse tree. + * Decrement the reference count of a function definition, freeing it + * if it falls to 0. */ void -freefunc(union node *n) +unreffunc(struct funcdef *fn) { - if (n) - ckfree(n); + if (fn) { + fn->refcount--; + if (fn->refcount > 0) + return; + ckfree(fn); + } } ==== //depot/projects/scottl-camlock/src/contrib/traceroute/as.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/traceroute/as.c,v 1.1 2008/02/20 23:29:52 rpaulo Exp $ */ +/* $FreeBSD: src/contrib/traceroute/as.c,v 1.2 2009/08/23 17:00:16 ume Exp $ */ /* $NetBSD: as.c,v 1.1 2001/11/04 23:14:36 atatat Exp $ */ /* @@ -63,55 +63,42 @@ }; void * -as_setup(server) - char *server; +as_setup(char *server) { struct aslookup *asn; - struct hostent *he = NULL; - struct servent *se; - struct sockaddr_in in; + struct addrinfo hints, *res0, *res; FILE *f; - int s; + int s, error; if (server == NULL) + server = getenv("RA_SERVER"); + if (server == NULL) server = DEFAULT_AS_SERVER; - (void)memset(&in, 0, sizeof(in)); - in.sin_family = AF_INET; - in.sin_len = sizeof(in); - if ((se = getservbyname("whois", "tcp")) == NULL) { + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + error = getaddrinfo(server, "whois", &hints, &res0); + if (error == EAI_SERVICE) { warnx("warning: whois/tcp service not found"); - in.sin_port = ntohs(43); - } else - in.sin_port = se->s_port; - - if (inet_aton(server, &in.sin_addr) == 0 && - ((he = gethostbyname(server)) == NULL || - he->h_addr == NULL)) { - warnx("%s: %s", server, hstrerror(h_errno)); - return (NULL); + error = getaddrinfo(server, "43", &hints, &res0); } - - if ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) { - warn("socket"); + if (error != 0) { + warnx("%s: %s", server, gai_strerror(error)); return (NULL); } - do { - if (he != NULL) { - memcpy(&in.sin_addr, he->h_addr, he->h_length); - he->h_addr_list++; - } - if (connect(s, (struct sockaddr *)&in, sizeof(in)) == 0) + for (res = res0; res; res = res->ai_next) { + s = socket(res->ai_family, res->ai_socktype, res->ai_protocol); + if (s < 0) + continue; + if (connect(s, res->ai_addr, res->ai_addrlen) >= 0) break; - if (he == NULL || he->h_addr == NULL) { - close(s); - s = -1; - break; - } - } while (1); - - if (s == -1) { + close(s); + s = -1; + } + freeaddrinfo(res0); + if (s < 0) { warn("connect"); return (NULL); } @@ -137,23 +124,23 @@ return (asn); } -int -as_lookup(_asn, addr) - void *_asn; - struct in_addr *addr; +unsigned int +as_lookup(void *_asn, char *addr, sa_family_t family) { struct aslookup *asn = _asn; char buf[1024]; - int as, rc, dlen; + unsigned int as; + int rc, dlen, plen; - as = rc = dlen = 0; - (void)fprintf(asn->as_f, "!r%s/32,l\n", inet_ntoa(*addr)); + as = 0; + rc = dlen = 0; + plen = (family == AF_INET6) ? 128 : 32; + (void)fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen); (void)fflush(asn->as_f); #ifdef AS_DEBUG_FILE if (asn->as_debug) { - (void)fprintf(asn->as_debug, ">> !r%s/32,l\n", - inet_ntoa(*addr)); + (void)fprintf(asn->as_debug, ">> !r%s/%d,l\n", addr, plen); (void)fflush(asn->as_debug); } #endif /* AS_DEBUG_FILE */ @@ -182,7 +169,7 @@ } #endif /* AS_DEBUG_FILE */ break; - case 'C': + case 'C': case 'D': case 'E': case 'F': @@ -209,7 +196,7 @@ /* origin line is the interesting bit */ if (as == 0 && strncasecmp(buf, "origin:", 7) == 0) { - sscanf(buf + 7, " AS%d", &as); + sscanf(buf + 7, " AS%u", &as); #ifdef AS_DEBUG_FILE if (asn->as_debug) { (void)fprintf(asn->as_debug, "as: %d\n", as); @@ -223,8 +210,7 @@ } void -as_shutdown(_asn) - void *_asn; +as_shutdown(void *_asn) { struct aslookup *asn = _asn; ==== //depot/projects/scottl-camlock/src/contrib/traceroute/as.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/traceroute/as.h,v 1.1 2008/02/20 23:29:52 rpaulo Exp $ */ +/* $FreeBSD: src/contrib/traceroute/as.h,v 1.2 2009/08/23 17:00:16 ume Exp $ */ /* $NetBSD: as.h,v 1.1 2001/11/04 23:14:36 atatat Exp $ */ /* @@ -37,6 +37,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -void *as_setup __P((char *)); -int as_lookup __P((void *, struct in_addr *)); -void as_shutdown __P((void *)); +void *as_setup(char *); +unsigned int as_lookup(void *, char *, sa_family_t); +void as_shutdown(void *); ==== //depot/projects/scottl-camlock/src/contrib/traceroute/traceroute.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.36 2009/08/23 17:00:16 ume Exp $"; #endif /* @@ -1477,19 +1477,21 @@ { register struct ip *ip; register int hlen; + char addr[INET_ADDRSTRLEN]; ip = (struct ip *) buf; hlen = ip->ip_hl << 2; cc -= hlen; + strlcpy(addr, inet_ntoa(from->sin_addr), sizeof(addr)); + if (as_path) - Printf(" [AS%d]", as_lookup(asn, &from->sin_addr)); + Printf(" [AS%u]", as_lookup(asn, addr, AF_INET)); if (nflag) - Printf(" %s", inet_ntoa(from->sin_addr)); + Printf(" %s", addr); else - Printf(" %s (%s)", inetname(from->sin_addr), - inet_ntoa(from->sin_addr)); + Printf(" %s (%s)", inetname(from->sin_addr), addr); if (verbose) Printf(" %d bytes to %s", cc, inet_ntoa (ip->ip_dst)); ==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/pqueue/pqueue.c#2 (text+ko) ==== @@ -234,3 +234,17 @@ return ret; } + +int +pqueue_size(pqueue_s *pq) +{ + pitem *item = pq->items; + int count = 0; + + while(item != NULL) + { + count++; + item = item->next; + } + return count; +} ==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/pqueue/pqueue.h#2 (text+ko) ==== @@ -91,5 +91,6 @@ pitem *pqueue_next(piterator *iter); void pqueue_print(pqueue pq); +int pqueue_size(pqueue pq); #endif /* ! HEADER_PQUEUE_H */ ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/d1_both.c#4 (text+ko) ==== @@ -519,6 +519,7 @@ if ( s->d1->handshake_read_seq == frag->msg_header.seq) { + unsigned long frag_len = frag->msg_header.frag_len; pqueue_pop(s->d1->buffered_messages); al=dtls1_preprocess_fragment(s,&frag->msg_header,max); @@ -536,7 +537,7 @@ if (al==0) { *ok = 1; - return frag->msg_header.frag_len; + return frag_len; } ssl3_send_alert(s,SSL3_AL_FATAL,al); @@ -561,7 +562,16 @@ if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len) goto err; - if (msg_hdr->seq <= s->d1->handshake_read_seq) + /* Try to find item in queue, to prevent duplicate entries */ + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pqueue_find(s->d1->buffered_messages, seq64); + pq_64bit_free(&seq64); + + /* Discard the message if sequence number was already there, is + * too far in the future or the fragment is already in the queue */ + if (msg_hdr->seq <= s->d1->handshake_read_seq || + msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL) { unsigned char devnull [256]; @@ -575,30 +585,31 @@ } } - frag = dtls1_hm_fragment_new(frag_len); - if ( frag == NULL) - goto err; + if (frag_len) + { + frag = dtls1_hm_fragment_new(frag_len); + if ( frag == NULL) + goto err; - memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); + memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); - if (frag_len) - { - /* read the body of the fragment (header has already been read */ + /* read the body of the fragment (header has already been read) */ i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE, frag->fragment,frag_len,0); if (i<=0 || (unsigned long)i!=frag_len) goto err; - } + + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); - pq_64bit_init(&seq64); - pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pitem_new(seq64, frag); + pq_64bit_free(&seq64); + if ( item == NULL) + goto err; - item = pitem_new(seq64, frag); - pq_64bit_free(&seq64); - if ( item == NULL) - goto err; + pqueue_insert(s->d1->buffered_messages, item); + } - pqueue_insert(s->d1->buffered_messages, item); return DTLS1_HM_FRAGMENT_RETRY; err: ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/d1_pkt.c#3 (text+ko) ==== @@ -167,6 +167,10 @@ DTLS1_RECORD_DATA *rdata; pitem *item; + /* Limit the size of the queue to prevent DOS attacks */ + if (pqueue_size(queue->q) >= 100) + return 0; + rdata = OPENSSL_malloc(sizeof(DTLS1_RECORD_DATA)); item = pitem_new(priority, rdata); if (rdata == NULL || item == NULL) ==== //depot/projects/scottl-camlock/src/etc/defaults/periodic.conf#4 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.47 2008/01/08 07:22:43 dds Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.48 2009/08/23 06:30:14 kensmith Exp $ # # What files override these defaults ? @@ -224,7 +224,7 @@ # 400.status-pkg weekly_status_pkg_enable="NO" # Find out-of-date pkgs pkg_version=pkg_version # Use this program -pkg_version_index=/usr/ports/INDEX-8 # Use this index file +pkg_version_index=/usr/ports/INDEX-9 # Use this index file # 999.local weekly_local="/etc/weekly.local" # Local scripts ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#6 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.358 2009/06/10 19:03:23 avg Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.359 2009/08/25 19:07:26 delphij Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -357,6 +357,7 @@ ### Network routing options: ### defaultrouter="NO" # Set to default gateway (or NO). +static_arp_pairs="" # Set to static ARP list (or leave empty). static_routes="" # Set to static route list (or leave empty). natm_static_routes="" # Set to static route list for NATM (or leave empty). gateway_enable="NO" # Set to YES if this host will be a gateway. ==== //depot/projects/scottl-camlock/src/etc/network.subr#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.195 2009/06/26 01:27:16 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.199 2009/08/27 15:24:26 dougb Exp $ # # @@ -727,6 +727,13 @@ ;; *) _tmplist="${network_interfaces} ${cloned_interfaces}" + + # lo0 is effectively mandatory, so help prevent foot-shooting + # + case "$_tmplist" in + lo0|'lo0 '*|*' lo0'|*' lo0 '*) ;; # This is fine, do nothing + *) _tmplist="lo0 ${_tmplist}" ;; + esac ;; esac @@ -816,6 +823,17 @@ echo ${str} } +is_wired_interface() +{ + local media + + case `ifconfig $1 2>/dev/null` in + *media:?Ethernet*) media=Ethernet ;; + esac + + test "$media" = "Ethernet" +} + # Setup the interfaces for IPv6 network6_interface_setup() { @@ -858,14 +876,19 @@ ifconfig $i inet6 ${ipv6_ifconfig} alias fi + # Wireless NIC cards are virtualized through the wlan interface + if ! is_wired_interface ${i}; then + case "${i}" in + wlan*) rtsol_interface=yes ;; + *) rtsol_interface=no ;; + esac + fi + if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ] then case ${i} in lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*|pflog[0-9]*|pfsync[0-9]*) ;; - # Wireless NIC cards are virtualized through the wlan interface >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 30 16:44:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C01C4106568B; Sun, 30 Aug 2009 16:44:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C373106566B for ; Sun, 30 Aug 2009 16:44:43 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59C5D8FC17 for ; Sun, 30 Aug 2009 16:44:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UGihwl017254 for ; Sun, 30 Aug 2009 16:44:43 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UGihXi017252 for perforce@freebsd.org; Sun, 30 Aug 2009 16:44:43 GMT (envelope-from mav@freebsd.org) Date: Sun, 30 Aug 2009 16:44:43 GMT Message-Id: <200908301644.n7UGihXi017252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 167985 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 Aug 2009 16:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=167985 Change 167985 by mav@mav_mavbook on 2009/08/30 16:44:42 IFC Affected files ... .. //depot/projects/scottl-camlock/src/contrib/file/magic2mime#3 branch .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 integrate .. //depot/projects/scottl-camlock/src/tools/build/options/WITH_BIND_LIBS#3 branch Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.60 2009/07/10 17:42:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.62 2009/08/30 16:31:25 mav Exp $"); #include #include @@ -1212,9 +1212,9 @@ /*dxfer_len*/sizeof(struct ata_params), timeout ? timeout : 30 * 1000); if (cgd.protocol == PROTO_ATA) - ata_36bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0); + ata_28bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0); else - ata_36bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); + ata_28bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); /* Disable freezing the device queue */ ccb->ccb_h.flags |= CAM_DEV_QFRZDIS; ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.2 2009/08/30 16:31:25 mav Exp $"); #include @@ -91,7 +91,7 @@ } void -ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count) { bzero(&ataio->cmd, sizeof(ataio->cmd)); ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#15 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: head/sys/cam/ata/ata_all.h 195534 2009-07-10 08:18:08Z scottl $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $ */ #ifndef CAM_ATA_ALL_H @@ -84,7 +84,7 @@ int ata_version(int ver); void ata_print_ident(struct ata_params *ident_data); -void ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +void ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count); void ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features, uint64_t lba, uint16_t sector_count); ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#26 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.3 2009/08/30 15:36:56 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.4 2009/08/30 16:31:25 mav Exp $"); #include @@ -283,7 +283,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_36bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0, /*sense_flags*/0, softc->disk->d_devstat); @@ -399,7 +399,7 @@ ata_48bit_cmd(&ccb.ataio, ATA_WRITE_DMA48, 0, lba, count); } else { - ata_36bit_cmd(&ccb.ataio, ATA_WRITE_DMA, + ata_28bit_cmd(&ccb.ataio, ATA_WRITE_DMA, 0, lba, count); } xpt_polled_action(&ccb); @@ -429,7 +429,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_36bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); xpt_polled_action(&ccb); if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) @@ -846,18 +846,18 @@ count = 0; if (softc->flags & ADA_FLAG_CAN_DMA) { if (bp->bio_cmd == BIO_READ) { - ata_36bit_cmd(ataio, ATA_READ_DMA, + ata_28bit_cmd(ataio, ATA_READ_DMA, 0, lba, count); } else { - ata_36bit_cmd(ataio, ATA_WRITE_DMA, + ata_28bit_cmd(ataio, ATA_WRITE_DMA, 0, lba, count); } } else { if (bp->bio_cmd == BIO_READ) { - ata_36bit_cmd(ataio, ATA_READ_MUL, + ata_28bit_cmd(ataio, ATA_READ_MUL, 0, lba, count); } else { - ata_36bit_cmd(ataio, ATA_WRITE_MUL, + ata_28bit_cmd(ataio, ATA_WRITE_MUL, 0, lba, count); } } @@ -877,7 +877,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_36bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0); break; } start_ccb->ccb_h.ccb_state = ADA_CCB_BUFFER_IO; @@ -913,7 +913,7 @@ 0, ada_default_timeout*1000); - ata_36bit_cmd(ataio, ATA_SET_MULTI, 0, 0, softc->secsperint); + ata_28bit_cmd(ataio, ATA_SET_MULTI, 0, 0, softc->secsperint); start_ccb->ccb_h.ccb_state = ADA_CCB_SET_MULTI; xpt_action(start_ccb); } @@ -1161,7 +1161,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_36bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); xpt_polled_action(&ccb); if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#35 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.4 2009/08/18 09:27:17 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.5 2009/08/30 16:31:25 mav Exp $"); #include #include @@ -331,9 +331,9 @@ /*dxfer_len*/sizeof(struct ata_params), 30 * 1000); if (periph->path->device->protocol == PROTO_ATA) - ata_36bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0); else - ata_36bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); break; } case PROBE_SETMODE: @@ -349,7 +349,7 @@ /*data_ptr*/NULL, /*dxfer_len*/0, 30 * 1000); - ata_36bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, + ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, ata_max_mode(ident_buf, ATA_UDMA6, ATA_UDMA6)); break; } ==== //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 (text+ko) ==== @@ -1,112 +1,70 @@ /* - * CDDL HEADER START + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. * - * CDDL HEADER END + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $ + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -/* - * Portions of this source code were derived from Berkeley 4.3 BSD - * under license from the Regents of the University of California. - */ - #ifndef _OPENSOLARIS_RPC_XDR_H_ #define _OPENSOLARIS_RPC_XDR_H_ #include_next #ifndef _KERNEL -#include_next -/* - * Strangely, my glibc version (2.3.6) doesn't have xdr_control(), so - * we have to hack it in here (source taken from OpenSolaris). - * By the way, it is assumed the xdrmem implementation is used. - */ - -#undef xdr_control -#define xdr_control(a,b,c) xdrmem_control(a,b,c) +#include /* - * These are the request arguments to XDR_CONTROL. + * Taken from sys/xdr/xdr_mem.c. * - * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream. - * XDR_SKIPBYTES - skips the next N bytes in the XDR stream. - * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from - * the XDR stream being moved over RDMA - * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in - * the XDR stream moving over RDMA. + * FreeBSD's userland XDR doesn't implement control method (only the kernel), + * but OpenSolaris nvpair still depend on it, so we have to implement it here. */ -#define XDR_PEEK 2 -#define XDR_SKIPBYTES 3 -#define XDR_RDMAGET 4 -#define XDR_RDMASET 5 - -/* FIXME: probably doesn't work */ static __inline bool_t xdrmem_control(XDR *xdrs, int request, void *info) { xdr_bytesrec *xptr; - int32_t *int32p; - int len; switch (request) { - case XDR_GET_BYTES_AVAIL: xptr = (xdr_bytesrec *)info; xptr->xc_is_last_record = TRUE; xptr->xc_num_avail = xdrs->x_handy; return (TRUE); - - case XDR_PEEK: - /* - * Return the next 4 byte unit in the XDR stream. - */ - if (xdrs->x_handy < sizeof (int32_t)) - return (FALSE); - int32p = (int32_t *)info; - *int32p = (int32_t)ntohl((uint32_t) - (*((int32_t *)(xdrs->x_private)))); - return (TRUE); - - case XDR_SKIPBYTES: - /* - * Skip the next N bytes in the XDR stream. - */ - int32p = (int32_t *)info; - len = RNDUP((int)(*int32p)); - if ((xdrs->x_handy -= len) < 0) - return (FALSE); - xdrs->x_private += len; - return (TRUE); - + default: + assert(!"unexpected request"); } return (FALSE); } + +#undef XDR_CONTROL +#define XDR_CONTROL(xdrs, req, op) \ + (((xdrs)->x_ops->x_control == NULL) ? \ + xdrmem_control((xdrs), (req), (op)) : \ + (*(xdrs)->x_ops->x_control)(xdrs, req, op)) + #endif /* !_KERNEL */ #endif /* !_OPENSOLARIS_RPC_XDR_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Aug 30 19:38:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B8F61065676; Sun, 30 Aug 2009 19:38:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D16F6106566B for ; Sun, 30 Aug 2009 19:38:53 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7A328FC0C for ; Sun, 30 Aug 2009 19:38:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UJcrro042794 for ; Sun, 30 Aug 2009 19:38:53 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UJcrru042792 for perforce@freebsd.org; Sun, 30 Aug 2009 19:38:53 GMT (envelope-from mav@freebsd.org) Date: Sun, 30 Aug 2009 19:38:53 GMT Message-Id: <200908301938.n7UJcrru042792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 167986 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 Aug 2009 19:38:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=167986 Change 167986 by mav@mav_mavbook on 2009/08/30 19:38:30 Fix build with INVARIANTS. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#58 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#58 (text+ko) ==== @@ -1072,7 +1072,7 @@ while (ch->slot[tag].state != AHCI_SLOT_EMPTY) { if (++tag >= ch->numslots) tag = 0; - KASSERT(tag != ch->lastslot, "ahci: ALL SLOTS BUSY!"); + KASSERT(tag != ch->lastslot, ("ahci: ALL SLOTS BUSY!")); } ch->lastslot = tag; /* Occupy chosen slot. */ From owner-p4-projects@FreeBSD.ORG Sun Aug 30 20:19:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE7A510656AD; Sun, 30 Aug 2009 20:19:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A26241065694 for ; Sun, 30 Aug 2009 20:19:38 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9040B8FC0A for ; Sun, 30 Aug 2009 20:19:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UKJcn0046706 for ; Sun, 30 Aug 2009 20:19:38 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UKJbvc046704 for perforce@freebsd.org; Sun, 30 Aug 2009 20:19:37 GMT (envelope-from zec@fer.hr) Date: Sun, 30 Aug 2009 20:19:37 GMT Message-Id: <200908302019.n7UKJbvc046704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 167988 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 Aug 2009 20:19:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=167988 Change 167988 by zec@zec_tpx32 on 2009/08/30 20:18:55 Attempt at improving memory housekeeping when vnets get destroyed. This change seems not to be introducing any new panics, while succeeding in really freeing up a few hashtables, and making more visible attempts at destroying UMA zones which still hold some unreleased elements. Affected files ... .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#25 edit .. //depot/projects/vimage-commit2/src/sys/net/flowtable.c#14 edit .. //depot/projects/vimage-commit2/src/sys/net/flowtable.h#11 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#48 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#18 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#15 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#51 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#23 edit .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#37 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#32 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#21 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#58 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#41 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#33 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#22 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#47 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#25 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/net/flowtable.c#14 (text+ko) ==== @@ -803,6 +803,21 @@ return (ft); } +#ifdef VIMAGE +/* + * This should be a reverse of flowtable_alloc(), which is called once + * per-protocol per-vnet. + */ +void +flowtable_free(struct flowtable *ft) +{ + +#ifdef NOTYET + panic("fixme here"); +#endif +} +#endif + /* * The rest of the code is devoted to garbage collection of expired entries. * It is a new additon made necessary by the switch to dynamically allocating ==== //depot/projects/vimage-commit2/src/sys/net/flowtable.h#11 (text+ko) ==== @@ -42,6 +42,7 @@ #define V_ip_ft VNET(ip_ft) struct flowtable *flowtable_alloc(int nentry, int flags); +void flowtable_free(struct flowtable *ft); /* * Given a flow table, look up the L3 and L2 information and ==== //depot/projects/vimage-commit2/src/sys/net/route.c#48 (text+ko) ==== @@ -247,6 +247,9 @@ } } } + + uma_zdestroy(V_rtzone); + free(V_rt_tables, M_RTABLE); } VNET_SYSUNINIT(vnet_route_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, vnet_route_uninit, 0); ==== //depot/projects/vimage-commit2/src/sys/net/vnet.c#8 (text+ko) ==== @@ -56,6 +56,7 @@ #endif #include +#include #include #include @@ -280,6 +281,21 @@ if_vmove(ifp, ifp->if_home_vnet); } + /* + * ifconfig -alias down destroy all the remaining interfaces. + * Only lo0 should survive this step, stripped off of any addresses. + */ + TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) { + if_down(ifp); + if_purgeaddrs(ifp); + if_purgemaddrs(ifp); + if (ifp != V_loif) { + printf("Ouch, destroying ifnet %s\n", ifp->if_xname); + if_clone_destroy(ifp->if_xname); + printf("OK\n"); + } + } + vnet_sysuninit(); CURVNET_RESTORE(); ==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#18 (text+ko) ==== @@ -114,6 +114,9 @@ .pr_domain = &inetdomain, .pr_protocol = IPPROTO_IP, .pr_init = ip_init, +#ifdef VIMAGE + .pr_destroy = ip_destroy, +#endif .pr_slowtimo = ip_slowtimo, .pr_drain = ip_drain, .pr_usrreqs = &nousrreqs @@ -150,39 +153,42 @@ }, #ifdef SCTP { - .pr_type = SOCK_DGRAM, - .pr_domain = &inetdomain, - .pr_protocol = IPPROTO_SCTP, - .pr_flags = PR_WANTRCVD, - .pr_input = sctp_input, - .pr_ctlinput = sctp_ctlinput, - .pr_ctloutput = sctp_ctloutput, - .pr_init = sctp_init, - .pr_drain = sctp_drain, - .pr_usrreqs = &sctp_usrreqs + .pr_type = SOCK_DGRAM, + .pr_domain = &inetdomain, + .pr_protocol = IPPROTO_SCTP, + .pr_flags = PR_WANTRCVD, + .pr_input = sctp_input, + .pr_ctlinput = sctp_ctlinput, + .pr_ctloutput = sctp_ctloutput, + .pr_init = sctp_init, +#ifdef VIMAGE + .pr_init = sctp_destroy, +#endif + .pr_drain = sctp_drain, + .pr_usrreqs = &sctp_usrreqs }, { .pr_type = SOCK_SEQPACKET, .pr_domain = &inetdomain, - .pr_protocol = IPPROTO_SCTP, - .pr_flags = PR_WANTRCVD, - .pr_input = sctp_input, - .pr_ctlinput = sctp_ctlinput, - .pr_ctloutput = sctp_ctloutput, - .pr_drain = sctp_drain, - .pr_usrreqs = &sctp_usrreqs + .pr_protocol = IPPROTO_SCTP, + .pr_flags = PR_WANTRCVD, + .pr_input = sctp_input, + .pr_ctlinput = sctp_ctlinput, + .pr_ctloutput = sctp_ctloutput, + .pr_drain = sctp_drain, + .pr_usrreqs = &sctp_usrreqs }, { .pr_type = SOCK_STREAM, .pr_domain = &inetdomain, - .pr_protocol = IPPROTO_SCTP, - .pr_flags = PR_WANTRCVD, - .pr_input = sctp_input, - .pr_ctlinput = sctp_ctlinput, - .pr_ctloutput = sctp_ctloutput, - .pr_drain = sctp_drain, - .pr_usrreqs = &sctp_usrreqs + .pr_protocol = IPPROTO_SCTP, + .pr_flags = PR_WANTRCVD, + .pr_input = sctp_input, + .pr_ctlinput = sctp_ctlinput, + .pr_ctloutput = sctp_ctloutput, + .pr_drain = sctp_drain, + .pr_usrreqs = &sctp_usrreqs }, #endif /* SCTP */ { ==== //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#15 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#51 (text+ko) ==== @@ -368,6 +368,28 @@ netisr_register(&ip_nh); } +#ifdef VIMAGE +/* + * Per-vnet state cleanup. + */ +void +ip_destroy(void) +{ + +#ifdef FLOWTABLE + flowtable_free(V_ip_ft); +#endif +#ifdef NOTYET + /* Clean up IP reassembly queue. */ + for (i = 0; i < IPREASS_NHASH; i++) + TAILQ_WALK_AND_FREE(&V_ipq[i]); +#endif + uma_zdestroy(V_ipq_zone); + KASSERT(TAILQ_EMPTY(&V_in_ifaddrhead), ("V_in_ifaddrhead not empty")); + hashdestroy(V_in_ifaddrhashtbl, M_IFADDR, V_in_ifaddrhmask); +} +#endif + void ip_fini(void *xtp) { ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#23 (text+ko) ==== @@ -212,6 +212,7 @@ u_long if_hwassist_flags, int sw_csum); void ip_forward(struct mbuf *m, int srcrt); void ip_init(void); +void ip_destroy(void); extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); ==== //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#37 (text+ko) ==== @@ -194,6 +194,10 @@ V_ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb), NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); + + if (!IS_DEFAULT_VNET(curvnet)) + return; + EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -203,10 +207,13 @@ rip_destroy(void) { + KASSERT(LIST_EMPTY(&V_ripcb), ("V_ripcb not empty")); + uma_zdestroy(V_ripcbinfo.ipi_zone); hashdestroy(V_ripcbinfo.ipi_hashbase, M_PCB, V_ripcbinfo.ipi_hashmask); hashdestroy(V_ripcbinfo.ipi_porthashbase, M_PCB, V_ripcbinfo.ipi_porthashmask); + INP_INFO_LOCK_DESTROY(&V_ripcbinfo); } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#32 (text+ko) ==== @@ -235,10 +235,27 @@ void tcp_hc_destroy(void) { + int i; /* XXX TODO walk the hashtable and free all entries */ +#ifdef NOTYET + tcp_hc_purge() forced??? +#endif callout_drain(&V_tcp_hc_callout); + uma_zdestroy(V_tcp_hostcache.zone); + + /* + * Clean up the hash buckets. + */ + for (i = 0; i < V_tcp_hostcache.hashsize; i++) { +#ifdef NOTYET + TAILQ_WALK_AND_FREE(&V_tcp_hostcache.hashbase[i].hch_bucket); +#endif + mtx_destroy(&V_tcp_hostcache.hashbase[i].hch_mtx); + } + + free(V_tcp_hostcache.hashbase, M_HOSTCACHE); } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#21 (text+ko) ==== @@ -132,6 +132,16 @@ tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } +#ifdef VIMAGE +void +tcp_reass_destroy(void) +{ + + /* Walk and free the reas queue */ + uma_zdestroy(V_tcp_reass_zone); +} +#endif + int tcp_reass(struct tcpcb *tp, struct tcphdr *th, int *tlenp, struct mbuf *m) { ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#58 (text+ko) ==== @@ -445,9 +445,17 @@ tcp_destroy(void) { + tcp_reass_destroy(); + syncache_destroy(); + tcp_hc_destroy(); tcp_tw_destroy(); - tcp_hc_destroy(); - syncache_destroy(); + +#ifdef NOTYET + LIST_WALK_AND_FREE_OR_ASSERT_FREE(&V_tcb); +#endif + uma_zdestroy(V_sack_hole_zone); + uma_zdestroy(V_tcpcb_zone); + uma_zdestroy(V_tcbinfo.ipi_zone); /* XXX check that hashes are empty! */ hashdestroy(V_tcbinfo.ipi_hashbase, M_PCB, ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#41 (text+ko) ==== @@ -278,11 +278,20 @@ void syncache_destroy(void) { + int i; /* XXX walk the cache, free remaining objects, stop timers */ + /* Clean up the hash buckets. */ + for (i = 0; i < V_tcp_syncache.hashsize; i++) { +#ifdef NOTYET + TAILQ_ASSERT_EMPTY(&V_tcp_syncache.hashbase[i].sch_bucket); +#endif + callout_drain(&V_tcp_syncache.hashbase[i].sch_timer); + mtx_destroy(&V_tcp_syncache.hashbase[i].sch_mtx); + } + FREE(V_tcp_syncache.hashbase, M_SYNCACHE); uma_zdestroy(V_tcp_syncache.zone); - FREE(V_tcp_syncache.hashbase, M_SYNCACHE); } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#33 (text+ko) ==== @@ -185,6 +185,7 @@ while((tw = TAILQ_FIRST(&V_twq_2msl)) != NULL) tcp_twclose(tw, 0); INP_INFO_WUNLOCK(&V_tcbinfo); + uma_zdestroy(V_tcptw_zone); } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#22 (text+ko) ==== @@ -649,6 +649,7 @@ const void *); int tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *); void tcp_reass_init(void); +void tcp_reass_destroy(void); void tcp_input(struct mbuf *, int); u_long tcp_maxmtu(struct in_conninfo *, int *); u_long tcp_maxmtu6(struct in_conninfo *, int *); ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#47 (text+ko) ==== @@ -199,6 +199,9 @@ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(V_udpcb_zone, maxsockets); + if (!IS_DEFAULT_VNET(curvnet)) + return; + EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -241,6 +244,8 @@ udp_destroy(void) { + uma_zdestroy(V_udbinfo.ipi_zone); + uma_zdestroy(V_udpcb_zone); hashdestroy(V_udbinfo.ipi_hashbase, M_PCB, V_udbinfo.ipi_hashmask); hashdestroy(V_udbinfo.ipi_porthashbase, M_PCB, From owner-p4-projects@FreeBSD.ORG Sun Aug 30 20:22:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D7181065672; Sun, 30 Aug 2009 20:22:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41385106566C for ; Sun, 30 Aug 2009 20:22:42 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2EFB18FC15 for ; Sun, 30 Aug 2009 20:22:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UKMg8F046985 for ; Sun, 30 Aug 2009 20:22:42 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UKMfB7046983 for perforce@freebsd.org; Sun, 30 Aug 2009 20:22:41 GMT (envelope-from zec@fer.hr) Date: Sun, 30 Aug 2009 20:22:41 GMT Message-Id: <200908302022.n7UKMfB7046983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 167989 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 Aug 2009 20:22:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=167989 Change 167989 by zec@zec_tpx32 on 2009/08/30 20:22:09 IFC @ 167987 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#38 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.arm#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/dev/siis/siis.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/trap.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/isa/isahint.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#29 integrate .. //depot/projects/vimage-commit2/src/sys/net/flowtable.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#86 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#39 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#38 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/sys/imgact_elf.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/proc.h#23 integrate .. //depot/projects/vimage-commit2/src/sys/sys/types.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/vm/device_pager.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_extern.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_glue.c#5 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.30 2009/04/05 09:27:19 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.32 2009/08/30 14:38:17 bz Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -108,6 +109,22 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_oinfo); +static Elf64_Brandinfo kfreebsd_brand_info = { + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/lib/ld-kfreebsd-x86-64.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .brand_note = &elf64_kfreebsd_brandnote, + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY +}; + +SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &kfreebsd_brand_info); + void elf64_dump_thread(struct thread *td __unused, void *dst __unused, ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#20 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.668 2009/08/17 13:27:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.669 2009/08/29 16:01:21 rnoland Exp $"); /* * Manages physical address maps. @@ -943,8 +943,8 @@ * coherence domain. */ mfence(); - for (; eva < sva; eva += cpu_clflush_line_size) - clflush(eva); + for (; sva < eva; sva += cpu_clflush_line_size) + clflush(sva); mfence(); } else { ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#8 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.333 2009/08/13 17:09:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.334 2009/08/24 16:19:47 bz Exp $"); /* * AMD64 Trap and System call handling @@ -409,7 +409,9 @@ * This check also covers the images * without the ABI-tag ELF note. */ - if (p->p_osrel >= 700004) { + if (SV_CURPROC_ABI() == + SV_ABI_FREEBSD && + p->p_osrel >= 700004) { i = SIGSEGV; ucode = SEGV_ACCERR; } else { ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.52 2009/07/09 09:34:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.53 2009/08/24 16:19:47 bz Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -127,6 +127,7 @@ static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); static void linux32_fixlimit(struct rlimit *rl, int which); +static boolean_t linux32_trans_osrel(const Elf_Note *note, int32_t *osrel); static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; @@ -1066,14 +1067,38 @@ .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_IA32 }; -static char GNULINUX_ABI_VENDOR[] = "GNU"; +static char GNU_ABI_VENDOR[] = "GNU"; +static int GNULINUX_ABI_DESC = 0; + +static boolean_t +linux32_trans_osrel(const Elf_Note *note, int32_t *osrel) +{ + const Elf32_Word *desc; + uintptr_t p; + + p = (uintptr_t)(note + 1); + p += roundup2(note->n_namesz, sizeof(Elf32_Addr)); + + desc = (const Elf32_Word *)p; + if (desc[0] != GNULINUX_ABI_DESC) + return (FALSE); + + /* + * For linux we encode osrel as follows (see linux_mib.c): + * VVVMMMIII (version, major, minor), see linux_mib.c. + */ + *osrel = desc[1] * 1000000 + desc[2] * 1000 + desc[3]; + + return (TRUE); +} static Elf_Brandnote linux32_brandnote = { - .hdr.n_namesz = sizeof(GNULINUX_ABI_VENDOR), - .hdr.n_descsz = 16, + .hdr.n_namesz = sizeof(GNU_ABI_VENDOR), + .hdr.n_descsz = 16, /* XXX at least 16 */ .hdr.n_type = 1, - .vendor = GNULINUX_ABI_VENDOR, - .flags = 0 + .vendor = GNU_ABI_VENDOR, + .flags = BN_TRANSLATE_OSREL, + .trans_osrel = linux32_trans_osrel }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/vimage-commit2/src/sys/arm/arm/vm_machdep.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.40 2009/07/20 07:53:07 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.42 2009/08/29 21:53:08 kib Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#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/arm/conf/CAMBRIA,v 1.12 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ ident CAMBRIA ==== //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#6 (text+ko) ==== @@ -30,10 +30,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.7 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.8 2009/08/25 09:35:50 raj Exp $"); +#include #include #include +#include #include @@ -62,6 +64,76 @@ static uint32_t used_cpu_wins; +static __inline int +pm_is_disabled(uint32_t mask) +{ + + return (soc_power_ctrl_get(mask) == mask ? 0 : 1); +} + +static __inline uint32_t +obio_get_pm_mask(uint32_t base) +{ + struct obio_device *od; + + for (od = obio_devices; od->od_name != NULL; od++) + if (od->od_base == base) + return (od->od_pwr_mask); + + return (CPU_PM_CTRL_NONE); +} + +/* + * Disable device using power management register. + * 1 - Device Power On + * 0 - Device Power Off + * Mask can be set in loader. + * EXAMPLE: + * loader> set hw.pm-disable-mask=0x2 + * + * Common mask: + * |-------------------------------| + * | Device | Kirkwood | Discovery | + * |-------------------------------| + * | USB0 | 0x00008 | 0x020000 | + * |-------------------------------| + * | USB1 | - | 0x040000 | + * |-------------------------------| + * | USB2 | - | 0x080000 | + * |-------------------------------| + * | GE0 | 0x00001 | 0x000002 | + * |-------------------------------| + * | GE1 | - | 0x000004 | + * |-------------------------------| + * | IDMA | - | 0x100000 | + * |-------------------------------| + * | XOR | 0x10000 | 0x200000 | + * |-------------------------------| + * | CESA | 0x20000 | 0x400000 | + * |-------------------------------| + * | SATA | 0x04000 | 0x004000 | + * --------------------------------| + * This feature can be used only on Kirkwood and Discovery + * machines. + */ +static __inline void +pm_disable_device(int mask) +{ +#ifdef DIAGNOSTIC + uint32_t reg; + + reg = soc_power_ctrl_get(CPU_PM_CTRL_ALL); + printf("Power Management Register: 0%x\n", reg); + + reg &= ~mask; + soc_power_ctrl_set(reg); + printf("Device %x is disabled\n", mask); + + reg = soc_power_ctrl_get(CPU_PM_CTRL_ALL); + printf("Power Management Register: 0%x\n", reg); +#endif +} + uint32_t read_cpu_ctrl(uint32_t reg) { @@ -103,14 +175,36 @@ return (ef); } +/* + * Get the power status of device. This feature is only supported on + * Kirkwood and Discovery SoCs. + */ uint32_t soc_power_ctrl_get(uint32_t mask) { +#ifndef SOC_MV_ORION if (mask != CPU_PM_CTRL_NONE) mask &= read_cpu_ctrl(CPU_PM_CTRL); return (mask); +#else + return (mask); +#endif +} + +/* + * Set the power status of device. This feature is only supported on + * Kirkwood and Discovery SoCs. + */ +void +soc_power_ctrl_set(uint32_t mask) +{ + +#ifndef SOC_MV_ORION + if (mask != CPU_PM_CTRL_NONE) + write_cpu_ctrl(CPU_PM_CTRL, mask); +#endif } void @@ -191,7 +285,14 @@ soc_decode_win(void) { uint32_t dev, rev; + int mask; + mask = 0; + TUNABLE_INT_FETCH("hw.pm-disable-mask", &mask); + + if (mask != 0) + pm_disable_device(mask); + /* Retrieve our ID: some windows facilities vary between SoC models */ soc_id(&dev, &rev); @@ -623,8 +724,12 @@ /* Disable and clear all USB windows for all ports */ m = usb_max_ports(); + for (p = 0; p < m; p++) { + if (pm_is_disabled(CPU_PM_CTRL_USB(p))) + continue; + for (i = 0; i < MV_WIN_USB_MAX; i++) { win_usb_cr_write(i, p, 0); win_usb_br_write(i, p, 0); @@ -710,6 +815,9 @@ uint32_t br, sz; int i, j; + if (pm_is_disabled(obio_get_pm_mask(base))) + return; + /* Disable, clear and revoke protection for all ETH windows */ for (i = 0; i < MV_WIN_ETH_MAX; i++) { @@ -880,6 +988,8 @@ uint32_t br, sz; int i, j; + if (pm_is_disabled(CPU_PM_CTRL_IDMA)) + return; /* * Disable and clear all IDMA windows, revoke protection for all channels */ @@ -1172,6 +1282,9 @@ uint32_t br, sz; int i, j, z, e = 1, m, window; + if (pm_is_disabled(CPU_PM_CTRL_XOR)) + return; + /* * Disable and clear all XOR windows, revoke protection for all * channels @@ -1364,6 +1477,9 @@ uint32_t br, cr; int i, j; + if (pm_is_disabled(CPU_PM_CTRL_CRYPTO)) + return; + /* Disable and clear all CESA windows */ for (i = 0; i < MV_WIN_CESA_MAX; i++) { win_cesa_cr_write(i, 0); @@ -1432,6 +1548,9 @@ uint32_t cr, br; int i, j; + if (pm_is_disabled(CPU_PM_CTRL_SATA)) + return; + for (i = 0; i < MV_WIN_SATA_MAX; i++) { win_sata_cr_write(i, 0); win_sata_br_write(i, 0); ==== //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.5 2009/08/25 09:30:03 raj Exp $"); #include #include @@ -68,11 +68,8 @@ * 0xffff_2000 - 0xffff_ffff : unused (~55KB) */ -const struct pmap_devmap *pmap_devmap_bootstrap_table; -vm_offset_t pmap_bootstrap_lastaddr; - /* Static device mappings. */ -static const struct pmap_devmap pmap_devmap[] = { +const struct pmap_devmap pmap_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. @@ -105,16 +102,6 @@ { -1, -1, -1 } }; -int -platform_pmap_init(void) -{ - - pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; - pmap_devmap_bootstrap_table = &pmap_devmap[0]; - - return (0); -} - void platform_mpp_init(void) { ==== //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.5 2009/08/25 09:30:03 raj Exp $"); #include #include @@ -68,11 +68,8 @@ * 0xffff_2000 - 0xffff_ffff : unused (~55KB) */ -const struct pmap_devmap *pmap_devmap_bootstrap_table; -vm_offset_t pmap_bootstrap_lastaddr; - /* Static device mappings. */ -static const struct pmap_devmap pmap_devmap[] = { +const struct pmap_devmap pmap_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. @@ -105,16 +102,6 @@ { -1, -1, -1 } }; -int -platform_pmap_init(void) -{ - - pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; - pmap_devmap_bootstrap_table = &pmap_devmap[0]; - - return (0); -} - void platform_mpp_init(void) { ==== //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 (text+ko) ==== @@ -1,5 +1,4 @@ -# $FreeBSD: src/sys/arm/mv/kirkwood/files.db88f6xxx,v 1.1 2008/10/13 20:07:13 raj Exp $ +# $FreeBSD: src/sys/arm/mv/kirkwood/files.db88f6xxx,v 1.2 2009/08/25 09:39:11 raj Exp $ -arm/mv/rtc.c standard -arm/mv/kirkwood/kirkwood.c standard +include "arm/mv/kirkwood/files.kirkwood" arm/mv/kirkwood/db88f6xxx.c standard ==== //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 (text+ko) ==== @@ -1,13 +1,8 @@ -# $FreeBSD: src/sys/arm/mv/kirkwood/std.db88f6xxx,v 1.1 2008/10/13 20:07:13 raj Exp $ +# $FreeBSD: src/sys/arm/mv/kirkwood/std.db88f6xxx,v 1.2 2009/08/25 09:39:11 raj Exp $ include "../mv/std.mv" +include "../mv/kirkwood/std.kirkwood" files "../mv/kirkwood/files.db88f6xxx" -makeoptions KERNPHYSADDR=0x00900000 -makeoptions KERNVIRTADDR=0xc0900000 -options KERNPHYSADDR=0x00900000 -options KERNVIRTADDR=0xc0900000 -options PHYSADDR=0x00000000 options PHYSMEM_SIZE=0x20000000 -options STARTUP_PAGETABLE_ADDR=0x00100000 ==== //depot/projects/vimage-commit2/src/sys/arm/mv/mv_machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.6 2009/07/01 20:07:44 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.7 2009/08/25 09:30:03 raj Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -86,6 +86,7 @@ #include #include /* XXX eventually this should be eliminated */ +#include #ifdef DEBUG #define debugf(fmt, args...) printf(fmt, ##args) @@ -133,7 +134,9 @@ vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; +vm_offset_t pmap_bootstrap_lastaddr; +const struct pmap_devmap *pmap_devmap_bootstrap_table; struct pv_addr systempage; struct pv_addr msgbufpv; struct pv_addr irqstack; @@ -423,8 +426,8 @@ while (1); /* Platform-specific initialisation */ - if (platform_pmap_init() != 0) - return (NULL); + pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; + pmap_devmap_bootstrap_table = &pmap_devmap[0]; pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); ==== //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.7 2009/06/24 15:41:18 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.8 2009/08/25 09:35:50 raj Exp $ */ #ifndef _MVREG_H_ @@ -218,6 +218,7 @@ */ #define CPU_PM_CTRL 0x1C #define CPU_PM_CTRL_NONE 0 +#define CPU_PM_CTRL_ALL ~0x0 #if defined(SOC_MV_KIRKWOOD) #define CPU_PM_CTRL_GE0 (1 << 0) @@ -234,8 +235,11 @@ #define CPU_PM_CTRL_SATA1 (1 << 15) #define CPU_PM_CTRL_XOR1 (1 << 16) #define CPU_PM_CTRL_CRYPTO (1 << 17) -#define CPU_PM_CTRL_GE1 (1 << 18) -#define CPU_PM_CTRL_TDM (1 << 19) +#define CPU_PM_CTRL_GE1 (1 << 19) +#define CPU_PM_CTRL_TDM (1 << 20) +#define CPU_PM_CTRL_XOR (CPU_PM_CTRL_XOR0 | CPU_PM_CTRL_XOR1) +#define CPU_PM_CTRL_USB(u) (CPU_PM_CTRL_USB0) +#define CPU_PM_CTRL_SATA (CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1) #elif defined(SOC_MV_DISCOVERY) #define CPU_PM_CTRL_GE0 (1 << 1) #define CPU_PM_CTRL_GE1 (1 << 2) @@ -258,6 +262,14 @@ #define CPU_PM_CTRL_XOR (1 << 21) #define CPU_PM_CTRL_CRYPTO (1 << 22) #define CPU_PM_CTRL_DEVICE (1 << 23) +#define CPU_PM_CTRL_USB(u) (1 << (17 + (u))) +#define CPU_PM_CTRL_SATA (CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1) +#else +#define CPU_PM_CTRL_CRYPTO (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_IDMA (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_XOR (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_SATA (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_USB(u) (CPU_PM_CTRL_NONE) #endif /* ==== //depot/projects/vimage-commit2/src/sys/arm/mv/mvvar.h#4 (text+ko) ==== @@ -34,13 +34,17 @@ * * from: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0var.h, rev 1 * - * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.5 2009/01/09 10:20:51 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.7 2009/08/25 09:35:50 raj Exp $ */ #ifndef _MVVAR_H_ #define _MVVAR_H_ #include +#include +#include +#include +#include #define MV_TYPE_PCI 0 #define MV_TYPE_PCIE 1 @@ -104,6 +108,7 @@ int remap; }; +extern const struct pmap_devmap pmap_devmap[]; extern const struct obio_pci mv_pci_info[]; extern const struct gpio_config mv_gpio_config[]; extern bus_space_tag_t obio_tag; @@ -124,13 +129,13 @@ void mv_gpio_out(uint32_t pin, uint8_t val, uint8_t enable); uint8_t mv_gpio_in(uint32_t pin); -int platform_pmap_init(void); void platform_mpp_init(void); int soc_decode_win(void); void soc_id(uint32_t *dev, uint32_t *rev); void soc_identify(void); void soc_dump_decode_win(void); uint32_t soc_power_ctrl_get(uint32_t mask); +void soc_power_ctrl_set(uint32_t mask); int decode_win_cpu_set(int target, int attr, vm_paddr_t base, uint32_t size, int remap); ==== //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.5 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.6 2009/08/25 09:30:03 raj Exp $"); #include #include @@ -70,12 +70,10 @@ * 0xffff_2000 - 0xffff_ffff : unused (~55KB) */ -const struct pmap_devmap *pmap_devmap_bootstrap_table; -vm_offset_t pmap_bootstrap_lastaddr; int platform_pci_get_irq(u_int bus, u_int slot, u_int func, u_int pin); /* Static device mappings. */ -static const struct pmap_devmap pmap_devmap[] = { +const struct pmap_devmap pmap_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. @@ -184,16 +182,6 @@ }; #endif -int -platform_pmap_init(void) -{ - - pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; - pmap_devmap_bootstrap_table = &pmap_devmap[0]; - - return (0); -} - void platform_mpp_init(void) { ==== //depot/projects/vimage-commit2/src/sys/cam/ata/ata_all.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.1 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.2 2009/08/30 16:31:25 mav Exp $"); #include @@ -91,7 +91,7 @@ } void -ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count) { bzero(&ataio->cmd, sizeof(ataio->cmd)); ==== //depot/projects/vimage-commit2/src/sys/cam/ata/ata_all.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.1 2009/07/10 08:18:08 scottl Exp $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $ */ #ifndef CAM_ATA_ALL_H @@ -83,7 +83,7 @@ int ata_version(int ver); void ata_print_ident(struct ata_params *ident_data); -void ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +void ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count); void ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features, uint64_t lba, uint16_t sector_count); ==== //depot/projects/vimage-commit2/src/sys/cam/ata/ata_da.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.2 2009/07/17 21:48:08 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.4 2009/08/30 16:31:25 mav Exp $"); #include @@ -287,7 +287,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0, /*sense_flags*/SF_RETRY_UA, softc->disk->d_devstat); @@ -411,7 +411,7 @@ ata_48bit_cmd(&ccb.ataio, ATA_WRITE_DMA48, 0, lba, count); } else { - ata_36bit_cmd(&ccb.ataio, ATA_WRITE_DMA, + ata_28bit_cmd(&ccb.ataio, ATA_WRITE_DMA, 0, lba, count); } xpt_polled_action(&ccb); @@ -441,7 +441,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); xpt_polled_action(&ccb); if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) @@ -856,10 +856,10 @@ } } else { if (bp->bio_cmd == BIO_READ) { - ata_36bit_cmd(ataio, ATA_READ_DMA, + ata_28bit_cmd(ataio, ATA_READ_DMA, 0, lba, count); } else { - ata_36bit_cmd(ataio, ATA_WRITE_DMA, + ata_28bit_cmd(ataio, ATA_WRITE_DMA, 0, lba, count); } } @@ -878,7 +878,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0); break; } start_ccb->ccb_h.ccb_state = ADA_CCB_BUFFER_IO; @@ -1126,7 +1126,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); xpt_polled_action(&ccb); if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) ==== //depot/projects/vimage-commit2/src/sys/cam/ata/ata_xpt.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.4 2009/08/18 09:27:17 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.5 2009/08/30 16:31:25 mav Exp $"); #include #include @@ -357,9 +357,9 @@ /*dxfer_len*/sizeof(struct ata_params), 30 * 1000); if (periph->path->device->protocol == PROTO_ATA) - ata_36bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0); else - ata_36bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); break; } case PROBE_SETMODE: @@ -375,7 +375,7 @@ /*data_ptr*/NULL, /*dxfer_len*/0, 30 * 1000); - ata_36bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, + ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, ata_max_mode(ident_buf, ATA_UDMA6, ATA_UDMA6)); break; } ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_da.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.236 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.237 2009/08/26 21:14:28 stas Exp $"); #include @@ -554,6 +554,14 @@ { {T_DIRECT, SIP_MEDIA_REMOVABLE, "Netac", "OnlyDisk*", "2000"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * Sony Cyber-Shot DSC cameras + * PR: usb/137035 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Sony DSC", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE | DA_Q_NO_PREVENT } }; ==== //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.33 2009/04/05 09:27:19 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.35 2009/08/30 14:38:17 bz Exp $"); #include "opt_compat.h" @@ -172,6 +172,21 @@ (sysinit_cfunc_t) elf32_insert_brand_entry, &ia32_brand_oinfo); +static Elf32_Brandinfo kia32_brand_info = { + .brand = ELFOSABI_FREEBSD, + .machine = EM_386, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/lib/ld.so.1", + .sysvec = &ia32_freebsd_sysvec, + .brand_note = &elf32_kfreebsd_brandnote, + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY +}; + +SYSINIT(kia32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &kia32_brand_info); + void elf32_dump_thread(struct thread *td __unused, void *dst __unused, ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#26 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.142 2009/08/01 19:26:27 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.143 2009/08/28 22:51:07 zec Exp $"); #include #include @@ -1085,6 +1085,7 @@ "bytes packets errs drop fifo frame compressed", "bytes packets errs drop fifo frame compressed"); + CURVNET_SET(TD_TO_VNET(curthread)); IFNET_RLOCK(); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { linux_ifname(ifp, ifname, sizeof ifname); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 30 20:24:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E69D01065670; Sun, 30 Aug 2009 20:24:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAC59106566B for ; Sun, 30 Aug 2009 20:24:44 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80B6A8FC0A for ; Sun, 30 Aug 2009 20:24:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UKOi9q047103 for ; Sun, 30 Aug 2009 20:24:44 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UKOiI9047101 for perforce@freebsd.org; Sun, 30 Aug 2009 20:24:44 GMT (envelope-from zec@fer.hr) Date: Sun, 30 Aug 2009 20:24:44 GMT Message-Id: <200908302024.n7UKOiI9047101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 167990 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 Aug 2009 20:24:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=167990 Change 167990 by zec@zec_tpx32 on 2009/08/30 20:23:52 Fix a typo. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#19 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#19 (text+ko) ==== @@ -162,7 +162,7 @@ .pr_ctloutput = sctp_ctloutput, .pr_init = sctp_init, #ifdef VIMAGE - .pr_init = sctp_destroy, + .pr_destroy = sctp_destroy, #endif .pr_drain = sctp_drain, .pr_usrreqs = &sctp_usrreqs From owner-p4-projects@FreeBSD.ORG Sun Aug 30 21:15:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6E8E1065679; Sun, 30 Aug 2009 21:15:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 525C41065670 for ; Sun, 30 Aug 2009 21:15:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 404678FC0A for ; Sun, 30 Aug 2009 21:15:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7ULFj7N061879 for ; Sun, 30 Aug 2009 21:15:45 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7ULFjF4061877 for perforce@freebsd.org; Sun, 30 Aug 2009 21:15:45 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 30 Aug 2009 21:15:45 GMT Message-Id: <200908302115.n7ULFjF4061877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 167993 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 Aug 2009 21:15:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=167993 Change 167993 by rene@rene_self on 2009/08/30 21:15:18 MFen handbook/firewalls up to the new line 2087 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#10 (text+ko) ==== @@ -1402,13 +1402,11 @@ gedaan worden met een aantal verschillende operatoren. Er kunnen ook reeksen van poorten ingesteld worden. - port = of een van de volgende - operators: !=, <, >, <, >=, eq, ne, - lt, gt, le, ge. + poort "=" | "!=" | "<" | ">" | "<=" | ">=" | + "eq" | "ne" | "lt" | "gt" | "le" | "ge" Reeksen van poorten worden met de volgende optie - aangegeven: port <> of - ><. + aangegeven: poort <> | >< De volgende twee parameters die betrekking hebben op @@ -1418,13 +1416,12 @@ - <acronym>TCP</acronym>_VLAG Vlaggen zijn alleen beschikbaar voor het filteren van TCP. De letters staan voor de mogelijke vlaggen die bekeken kunnen worden in de - kop van een TCP pakket. + kop van een TCP-pakket. In de moderne regels wordt de optie flags S gebruikt om het verzoek tot het starten van @@ -1463,9 +1460,10 @@ pakketten die niet passen in de sessie, worden automatisch geblokkeerd. - keep state staat ook ICMP pakketten toe - die gerelateerd zijn aan een TCP of UDP - sessie. Dus als er een ICMP type 3 code 4 komt in antwoord op + keep state staat ook + ICMP-pakketten toe die gerelateerd zijn aan een + TCP- of UDP-sessie. Dus als er + een ICMP-type 3 code 4 komt in antwoord op websurfen, dat wordt toegestaan van binnen naar buiten door een keep state regel, dan wordt dat toegelaten. Pakketten waarvan IPF zeker is dat ze onderdeel zijn van de @@ -1477,19 +1475,20 @@ vergeleken met de dynamische staattabel. Als een pakket voldoet aan de verwachting van het volgende pakket in de sessie, dan mag het de firewall verlaten en wordt de - staattabel bijgewerkt. De overige pakketten worden - vergeleken met de set van regels voor uitgaand - verkeer. + toestand van de sessie in de dynamische toestandstabel bijgewerkt. + Pakketten die niet bij een reeds actieve sessie horen, worden tegen de + uitgaande regelverzameling gecontroleerd. Pakketten die binnenkomen op de interface die met Internet is verbonden worden eerst vergeleken met de dynamische staattabel. Als een pakket voldoet aan de verwachting van het volgende pakket in de sessie, dan mag het - de firewall verlaten en wordt de staattabel bijgewerkt. De - overige pakketten worden vergeleken met de set van regels - voor uitgaand verkeer. + de firewall verlaten en wordt de toestand van de sessie in de dynamische + toestandstabel bijgewerkt. Pakketten die niet bij een reeds actieve + sessie horen, worden vergeleken met de regelverzameling voor + binnenkomend verkeer. - Als de sessie wordt beëindigd wordt hij uit de + Als de sessie wordt beëindigd wordt het uit de dynamische staattabel verwijderd. Met stateful filteren is het mogelijk om de focus te @@ -1510,10 +1509,16 @@ De onderstaande regels zijn een voorbeeld van hoe een erg veilige inclusieve firewall opgezet kan worden. Een inclusieve firewall staat alleen diensten toe die passen bij - de pass regels en blokkeert al het - overige verkeer. Alle firewalls hebben tenminste twee - interfaces waarop regels van toepassing zijn om de firewall - te laten werken. + de pass-regels en blokkeert al het + overige verkeer. Firewalls die bedoeld zijn om andere machines te + beschermen, ook wel netwerk-firewalls genoemd, dienen + tenminste twee inferfaces te hebben, die over het algemeen zijn + ingesteld om de ene kant te vertrouwen (het LAN) maar + niet de andere (het publieke Internet). Ook kan een firewall worden + ingesteld om alleen het systeem te beschermen waarop het + draait—dit wordt een host-gebaseerde firewall + genoemd, en is in het bijzonder geschikt voor servers op een onvertrouwd + netwerk. Alle &unix; systemen en dus ook &os; zijn zo ontworpen dat ze voor interne communicatie de interface @@ -1523,21 +1528,20 @@ vinden. Voor de interface die is verbonden met het publieke - Internet worden regels gemaakt waarmee sessies naar het - Internet mogelijk gemaakt worden en toegang wordt gegeven - voor pakketten die uit die sessies terug komen. Dit kan - de PPP interface tun0 zijn of de - netwerkkaart die is verbonden met een xDSL of - kabelmodem. + Internet worden regels gemaakt waarmee de toegang voor uitgaande en + binnenkomende verbindingen worden geauthoriseerd en beheersd. + Dit kan de PPP-interface tun0 zijn of de + netwerkkaart die is verbonden met een xDSL- of kabelmodem. In gevallen dat er één of meer netwerkkaarten - zijn aangesloten op het LAN achter de firewall, dan moeten er - op de firewall regels zijn om het verkeer tussen die interfaces - vrije doorgang te geven. + zijn aangesloten op private netwerksegmenten kunnen er regels + op de firewall nodig zijn om pakketten die van die LAN-interfaces + afkomen vrije doorgang te geven naar elkaar en/of naar buiten + (het Internet). - De regels worden opgedeeld in drie onderdelen: alle - interfaces met vrije doorgang, uitgaand op publieke - interfaces en inkomend op publieke interfaces. + De regels worden opgedeeld in drie onderdelen: eerst de vertrouwde + interfaces, dan het publieke uitgaande interface en als laatste het + onvertrouwde publieke binnenkomende interfaces. In iedere sectie moeten zo staan dat de regels die het meest gebruikt worden vóór de regels die minder @@ -1546,70 +1550,74 @@ richting geblokkeerd en gelogd moet worden. In het onderdeel Uitgaand staan alleen regels met - pass die parameters bevatten om - individuele diensten beschikbaar te maken zodat er Internet - toegang is. Al die regels moeten gebruik maken van - quick, on, - proto, port en - keep state. De regels met - proto tcp maken ook gebruik van - flag om te bekijken of het een pakket + pass die parameters bevatten om + uniek individuele diensten identificeren die het publieke Internet mogen + benaderen. Bij al die regels staan de opties + quick, on, + proto, port en + keep state aan. De regels met + proto tcp maken ook gebruik van de optie + flag om te bekijken of het een pakket betreft voor het opzetten van een sessie om de stateful functionaliteit aan te sturen. - In het onderdeel Inkomend staan alle regels voor het - blokkeren van ongewenste pakketten eerst om twee redenen. - Als eerste kan het zo zijn dat wat er wordt geblokkeerd - later toegestaan zou worden door regels die diensten - toestaan. De tweede reden is dat nu ongewenste pakketten - die vaak voor komen en die bij voorkeur niet in de - logboeken voor komen niet meer van toepassing zijn op de - laatste regel van het onderdeel waarin ze zouden worden - gelogd. Met de laatste regel van dit onderdeel worden - alle overige pakketten geblokkeerd en gelogd en ze kunnen - bewijsmateriaal zijn in een zaak tegen iemand die heeft - geprobeerd een systeem aan te vallen. + In het onderdeel Inkomend staan eerst alle regels voor het + blokkeren van ongewenste pakketten, om twee redenen. + Als eerste kan het zo zijn dat kwaadardige pakketten gedeeltelijk + overeenkomen met legitiem verkeer. Deze pakketten moeten worden + weggegooid in plaats van binnengelaten te worden, gebaseerd op hun + gedeeltelijke match met de allow-regels. De tweede + reden is dat bekende en oninteressante verwerpingen stil geblokkeerd + kunnen worden in plaats van gevangen en gelogd te worden door de + laatste regels in de sectie. De laatste regel in elke sectie blokkeert + en logt alle pakketten en kan worden gebruikt voor het wettelijke bewijs + nodig om degenen die uw systeem aanvallen aan te klagen. - Voor al het verkeer dat wordt geweigerd wordt geen - antwoord gestuurd. De pakketten verdwijnen gewoon. Zo weet - een aanvaller niet of een pakket het doelsysteem wel heeft - bereikt. Zo kan een aanvaller geen informatie verzamelen + Waar ook gezorgd voor moet worden is dat al het verkeer dat wordt + geweigerd geen antwoord verstuurd. Ongeldige pakketten dienen gewoon te + verdwijnen. Zo weet een aanvaller niet of een pakket het doelsysteem + wel heeft bereikt. Zo kan een aanvaller geen informatie verzamelen over een systeem: hoe minder informatie er over een systeem beschikbaar is, hoe meer tijd iemand erin moet steken voordat - er iets slechts gedaan kan worden. Zo wordt bijvoorbeeld - een inkomend verzoek van een nmap OS fingerprint - gelogd omdat een aanvaller zoiets zou proberen. + er iets slechts gedaan kan worden. Regels die een optie log + first bevatten, zullen alleen de eerste keer dat de + gebeurtenis voorkomt de gebeurtenis loggen. Deze optie is opgenomen in + de voorbeeldregel nmap OS fingerpint. Het + gereedschap security/nmap wordt vaak + door aanvallers gebruikt om het besturingssysteem van uw server + proberen te achterhalen. - We raden aan om als er logmeldingen komen van een regel + We raden aan om telkens als er logmeldingen komen van een regel met log first het commando ipfstat -hio uit te voeren om te - bekijken hoe vaak de regel van toepassing is geweest om te - kijken of de firewall overspoeld wordt, m.a.w. aangevallen - wordt. + bekijken hoe vaak de regel van toepassing is geweest. Een groot aantal + overeenkomsten geeft gewoonlijk aan dat de firewall overspoeld wordt, + m.a.w. aangevallen wordt. - Als er pakketten gelogd worden waarvan de beheerder het - poortnummer niet herkent, dan is de functie van dat poortnummer - na te zoeken in /etc/services of op . + Het bestand /etc/services kan gebruikt worden + om onbekende poortnummers op te zoeken. Ook kan + worden bezocht en het poortnummer worden opgezocht om het doel van een + bepaalde poort uit te vinden. Op de volgende link worden poortnummers van Trojans beschreven: . De onderstaande set regels is een complete en erg veilige - inclusieve set met regels voor een firewall die de auteur - zelf heeft gebruikt op zijn systeem. Deze set met regels is - een aanrader en eenvoudig aan te passen door commentaar te - maken van een regel voor een dienst die niet gewenst + inclusieve set met regels voor een firewall die is + getest op productiesystemen. Deze set met regels is eenvoudig aan te + passen voor uw eigen systeem. Maak gewoon commentaar van elke + pass-regel voor een dienst die niet gewenst is. - Logberichten die niet gewenst zijn, zijn uit te sluiten - door ze met een regel te blokkeren in het begin van het + Logberichten die niet gewenst zijn, zijn uit te sluiten door een + block-regel toe te voegen in het begin van het onderdeel Inkomend. Voor de onderstaande regels dient de dc0 interfacenaam in iedere regel - vervangen te worden door de interfacenaam van de netwerkkaart + vervangen te worden door de echte interfacenaam van de netwerkkaart in het systeem die met het publieke Internet is verbonden. Voor gebruikers van PPP zou dat tun0 zijn. @@ -1634,8 +1642,8 @@ ################################################################# # Interface aan het publieke Internet (onderdeel Uitgaand). # Inspecteer verzoeken om een sessie te starten van achter de -# firewall op het private netwerk of vanaf de server zelf naar -# het publieke Internet. +# firewall op het private netwerk of vanaf deze gateway-server +# naar het publieke Internet. ################################################################# # Geef toegang tot de DNS server van de ISP. @@ -1667,41 +1675,41 @@ # Sta Time toe. pass out quick on dc0 proto tcp from any to any port = 37 flags S keep state -# Sta NNTP nieuws toe. +# Sta uitgaand NNTP nieuws toe. pass out quick on dc0 proto tcp from any to any port = 119 flags S keep state -# Sta lokale en LAN gebruiker toe niet beveiligde FTP te gebruiken +# Sta uitgaande lokale niet beveiligde FTP (ook van LAN-gebruikers) toe # (zowel passieve als actieve modes). Deze functie maakt gebruik van -# de in IPNAT ingebouwde FTP proxy die in het bestand met nat regels +# de in IP-NAT ingebouwde FTP-proxy die in het bestand met NAT-regels # staat om dit in één regel te laten werken. Als er met # pkg_add pakketten toegevoegd moeten kunnen worden op een systeem, dan # is deze regel nodig. pass out quick on dc0 proto tcp from any to any port = 21 flags S keep state -# Sta beveiligde FTP, Telnet en SCP toe. +# Sta uitgaande SSH/SFTP/SCP toe (vervangingen van telnet/rlogin/FTP) # Deze functie maakt gebruik van SSH (secure shell) pass out quick on dc0 proto tcp from any to any port = 22 flags S keep state # Sta uitgaande niet beveiligde telnet toe. pass out quick on dc0 proto tcp from any to any port = 23 flags S keep state -# Sta de &os; CVSUP functie toe. +# Sta de &os; CVSUP-functie toe. pass out quick on dc0 proto tcp from any to any port = 5999 flags S keep state # Sta ping toe naar het publieke Internet. pass out quick on dc0 proto icmp from any to any icmp–type 8 keep state -# Sta whois toe vanaf overal naar het publieke Internet. +# Sta whois toe vanaf het LAN naar het publieke Internet. pass out quick on dc0 proto tcp from any to any port = 43 flags S keep state # Blokkeer en log het eerste voorkomen van al het andere dat probeert -# buiten te komen. Deze regel dwingt de 'block all' logica af. +# buiten te komen. Deze regel implementeert de standaard-blokkade. block out log first quick on dc0 all ################################################################# # Interface aan het publieke Internet (onderdeel Inkomend). # Inspecteert pakketten die van het publieke Internet komen -# met als bestemming de host zelf of het private netwerk. +# met als bestemming deze gateway-server of het private netwerk. ################################################################# # Blokkeer al het verkeer voor niet–routeerbare of gereserveerde @@ -1730,7 +1738,7 @@ block in quick on dc0 all with opt ssrr # Blokkeer pogingen voor nmap OS fingerprint. -# Log first occurrence of these so I can get their IP address +# Blokkeer het eerste voorkomen ervan voor de IP-adressen block in log first quick on dc0 proto tcp from any to any flags FUP # Blokkeer alles met speciale opties. @@ -1768,14 +1776,14 @@ #pass in quick on dc0 proto tcp from any to any port = 23 flags S keep state # Sta beveiligde FTP, telnet en SCP toe vanaf Internet. -# Deze functie gebruik SSH (secure shell). +# Deze functie gebruikt SSH (secure shell). pass in quick on dc0 proto tcp from any to any port = 22 flags S keep state # Blokkeer en log het eerste voorkomen van al het andere dat probeert # binnen te komen. Het loggen van alleen het eerste voorkomen stopt # een ontzegging van dienst aanval die gericht is op het laten -# vollopen van de partitie waarop de logboeken staan. Deze regel dwingt -# de 'block all' logica af. +# vollopen van de partitie waarop de logboeken staan. Deze regel implmenteert +# de standaard blokkade. block in log first quick on dc0 all ################### Einde van de regels ################################### @@ -1803,8 +1811,8 @@ NAT - NAT staat voor Network Address - Translation (netwerkadres vertaling). In &linux; heet dit IP + NAT staat voor Network Address + Translation (netwerkadres vertaling). In &linux; heet dit IP Masquerading. Een van de vele mogelijkheden die IPF NAT kan bieden is het delen van één IP adres op het publieke @@ -1814,11 +1822,10 @@ ISP's wijzen normaliter namelijk dynamisch een IP adres toe aan hun niet-commerciële gebruikers. Dynamisch betekent hier dat het - IP adres iedere dat er wordt ingebeld of - dat de kabel- of xDSL-modem uit- en aangeschakeld wordt - anders kan zijn. Dit IP adres is het - adres waarmee een netwerkapparaat bekend is op het publieke - Internet. + IP-adres iedere dat er wordt ingebeld of + dat het kabel- of xDSL-modem uit- en aangeschakeld wordt + anders kan zijn. Dit dynamische IP-adres wordt + gebruikt om uw systeem op het publieke Internet te identificeren. Stel dat er vijf PC's in een huis staan en iedere computer in dat huis heeft toegang tot Internet nodig. Dan @@ -1826,28 +1833,18 @@ en vijf telefoonlijnen om dat te realiseren. Met NAT is er maar één - account bij een ISP nodig en moeten er vier PC's met kabels - op een switch aangesloten waarop ook een &os; systeem is - aangesloten dat als gateway gaat opereren. + account bij een ISP nodig. De andere vier PC's moeten met kabels + op een switch worden aangesloten waarop ook een &os; systeem is + aangesloten dat binnen uw LAN als gateway gaat opereren. NAT zal automatisch de private LAN IP adressen van alle PC's vertalen naar - een enkel publiek IP adres als de + een enkel publiek IP-adres als de pakketten de firewall naar het Internet verlaten. - NAT wordt vaak gebruikt zonder - toestemming of wetenschap van een ISP en in de meeste - gevallen is het, als het wordt ontdekt, grond voor een ISP - om de account op te zeggen. Commerciële gebruikers - betalen veel meer voor hun Internet verbindingen en krijgen - vaak een reeks statische IP adressen die - nooit verandert. Een ISP verwacht en staat toe dat - commerciële gebruikers NAT inzetten - voor connectiviteit voor hun interne netwerk. - - Er is een speciale reeks van IP - adressen gereserveerd voor NAT op LANs. + Er is een speciale reeks van IP-adressen + gereserveerd voor NAT op private LANs. Volgens RFC 1918 kunnen de volgende reeksen - IP adressen gebruikt worden op private + IP-adressen gebruikt worden op private netwerken die nooit direct op het publieke Internet gerouteerd worden. @@ -1913,12 +1910,12 @@ . Meer details staan in &man.ipnat.1;. Bij het maken van wijzigingen aan de - NAT regels nadat NAT + NAT-regels nadat NAT gestart is, wordt aangeraden de wijziging aan het bestand met - regels te maken en daarna met ipnat - alle actieve NAT regels - te wissen. Daarna kunnen de regels uit het bestand weer als - volgt geladen worden: + regels te maken en daarna het commando ipnat + te gebruiken om alle actieve + NAT-regels te wissen. Daarna kunnen de regels uit + het bestand weer als volgt geladen worden: &prompt.root; ipnat -CF -f /etc/ipnat.rules @@ -2067,7 +2064,7 @@ te veel adressen zijn om te bedienen met één IP adres. Als er een blok van publiekelijke IP adressen beschikbaar is, dan kunnen deze adressen - gebruikt worden in een poel, welke door + gebruikt worden in een poel, welke door IPNAT gebruikt kan worden om één van de adressen te gebruiken als uitgaand adres. @@ -2099,11 +2096,11 @@ verkeer bij de juiste computer terecht komt. IPNAT gebruikt daarvoor de opties in NAT waarmee verkeer omgeleid kan worden. - Als bijvoorbeeld een webserver op 10.0.10.25 draait en het publieke + Als bijvoorbeeld een webserver op het LAN-adres 10.0.10.25 draait en het enkele publieke IP adres zou 20.20.20.5 zijn, dan zou dit mogelijk - zijn met één van de volgende twee regels: + role="ipaddr">20.20.20.5 zijn, dan zou de regel er als volgt + uit zien: rdr dc0 20.20.20.5/32 port 80 -> 10.0.10.25 port 80 @@ -2131,17 +2128,16 @@ FTP is er in twee smaken: actief en passief. Het verschil zit 'm in hoe het datakanaal wordt opgezet. De passieve variant is veiliger voor een gebruiker omdat bij deze variant - beide communicatiekanalen door de client zelf worden opgezet. - Op de volgende link zijn details over FTP na te lezen: - . - IP<acronym>NAT</acronym> regels + IP<acronym>NAT</acronym>-regels - IPNAT heeft een een speciale FTP proxy + IPNAT heeft een een speciale FTP-proxy ingebouwd die kan worden ingeschakeld met een - NAT map regel. Die kan + NAT-map-regel. Die kan al het uitgaande verkeer monitoren wat betreft opstartverzoeken voor sessies voor actieve en passieve FTP en dynamisch tijdelijke filterregels maken die alleen het @@ -2184,9 +2180,9 @@ IP<acronym>NAT</acronym> FTP filterregels - Als de NAT FTP proxy wordt gebruikt + Als de NAT-FTP-proxy wordt gebruikt is er maar één filterregel voor FTP - nodig. Zonder de FTP proxy zouden er drie regels nodig + nodig. Zonder de FTP-proxy zouden er drie regels nodig zijn: # Sta LAN client toe te FTP-en naar Internet From owner-p4-projects@FreeBSD.ORG Sun Aug 30 23:38:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8043E1065672; Sun, 30 Aug 2009 23:38:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44AA3106566C for ; Sun, 30 Aug 2009 23:38:21 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F1928FC20 for ; Sun, 30 Aug 2009 23:38:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UNcKVu074478 for ; Sun, 30 Aug 2009 23:38:20 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UNcKFA074476 for perforce@freebsd.org; Sun, 30 Aug 2009 23:38:20 GMT (envelope-from zec@fer.hr) Date: Sun, 30 Aug 2009 23:38:20 GMT Message-Id: <200908302338.n7UNcKFA074476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 167994 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 Aug 2009 23:38:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=167994 Change 167994 by zec@zec_tpx32 on 2009/08/30 23:37:58 Report uma zone names when complaining about lost memory on uma_zdestroy(). Affected files ... .. //depot/projects/vimage-commit2/src/sys/vm/uma_core.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/vm/uma_core.c#5 (text+ko) ==== @@ -1484,9 +1484,9 @@ keg = (uma_keg_t)arg; KEG_LOCK(keg); if (keg->uk_free != 0) { - printf("Freed UMA keg was not empty (%d items). " + printf("Freed UMA keg %s was not empty (%d items). " " Lost %d pages of memory.\n", - keg->uk_free, keg->uk_pages); + keg->uk_name, keg->uk_free, keg->uk_pages); } KEG_UNLOCK(keg); From owner-p4-projects@FreeBSD.ORG Mon Aug 31 09:34:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 357F6106568B; Mon, 31 Aug 2009 09:34:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDD231065676 for ; Mon, 31 Aug 2009 09:34:11 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB7188FC12 for ; Mon, 31 Aug 2009 09:34:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7V9YBLH058184 for ; Mon, 31 Aug 2009 09:34:11 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7V9YBJ1058182 for perforce@freebsd.org; Mon, 31 Aug 2009 09:34:11 GMT (envelope-from zec@fer.hr) Date: Mon, 31 Aug 2009 09:34:11 GMT Message-Id: <200908310934.n7V9YBJ1058182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 167999 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, 31 Aug 2009 09:34:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=167999 Change 167999 by zec@zec_tpx32 on 2009/08/31 09:34:08 IFC @ 167987 Affected files ... .. //depot/projects/vimage/src/share/man/man4/ahci.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/ip6.4#2 integrate .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/vimage/src/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#16 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#20 integrate .. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/vimage/src/sys/arm/mv/common.c#6 integrate .. //depot/projects/vimage/src/sys/arm/mv/discovery/db78xxx.c#5 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/db88f6xxx.c#5 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/arm/mv/mvreg.h#7 integrate .. //depot/projects/vimage/src/sys/arm/mv/mvvar.h#4 integrate .. //depot/projects/vimage/src/sys/arm/mv/orion/db88f5xxx.c#5 integrate .. //depot/projects/vimage/src/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/vimage/src/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/vimage/src/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/vimage/src/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#18 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#11 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#41 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#28 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#61 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#11 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#21 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/vimage/src/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_regdomain.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mge/if_mge.c#7 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#29 integrate .. //depot/projects/vimage/src/sys/dev/siis/siis.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scvgarndr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scvidctl.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.c#9 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#31 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#17 integrate .. //depot/projects/vimage/src/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/vimage/src/sys/isa/isahint.c#3 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#22 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#36 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#32 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#36 integrate .. //depot/projects/vimage/src/sys/kern/kern_kthread.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#28 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#23 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#22 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#43 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#32 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#54 integrate .. //depot/projects/vimage/src/sys/net/flowtable.c#9 integrate .. //depot/projects/vimage/src/sys/net/if.c#93 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#34 integrate .. //depot/projects/vimage/src/sys/net/if_llatbl.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_llatbl.h#5 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#47 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#44 integrate .. //depot/projects/vimage/src/sys/net/vnet.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#42 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#45 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#19 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#44 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#62 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#40 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#22 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#19 integrate .. //depot/projects/vimage/src/sys/sys/imgact_elf.h#5 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#37 integrate .. //depot/projects/vimage/src/sys/sys/types.h#8 integrate .. //depot/projects/vimage/src/sys/vm/device_pager.c#10 integrate .. //depot/projects/vimage/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm.h#6 integrate .. //depot/projects/vimage/src/sys/vm/vm_extern.h#8 integrate .. //depot/projects/vimage/src/sys/vm/vm_glue.c#11 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/ahci.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.2 2009/07/25 18:19:31 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.3 2009/08/30 15:20:13 mav Exp $ .\" -.Dd June 26, 2009 +.Dd August 24, 2009 .Dt AHCI 4 .Os .Sh NAME @@ -60,6 +60,13 @@ .It 2 multiple MSI vectors used, if supported; .El +.It Va hint.ahci.X.ccc +controls Command Completion Coalescing (CCC) usage by the specified controller. +Non-zero value enables CCC and defines maximum time (in ms), request can wait +for interrupt, if there are some more requests present on controller queue. +CCC reduces number of context switches on systems with many parallel requests, +but it can decrease disk performance on some workloads due to additional +command latency. .It Va hint.ahcich.X.pm_level controls SATA interface Power Management for specified channel, allowing some power to be saved at the cost of additional command @@ -74,7 +81,15 @@ host initiates PARTIAL PM state transition every time port becomes idle; .It 3 host initiates SLUMBER PM state transition every time port becomes idle. +.It 4 +driver initiates PARTIAL PM state transition 1ms after port becomes idle; +.It 5 +driver initiates SLUMBER PM state transition 125ms after port becomes idle. .El +Some controllers, such as ICH8, do not implement modes 2 and 3 with NCQ used. +Because of artificial entering latency, performance degradation in modes +4 and 5 is much smaller then in modes 2 and 3. +.Pp Note that interface Power Management is not compatible with device presence detection. You will have to reset bus manually on device hot-plug. ==== //depot/projects/vimage/src/share/man/man4/ip6.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.23 2008/02/22 21:02:36 bms Exp $ +.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.24 2009/08/30 14:45:09 motoyuki Exp $ .\" .Dd February 21, 2008 .Dt IP6 4 @@ -692,7 +692,7 @@ Most of the socket options are defined in RFC 2292 or RFC 2553. The .Dv IPV6_V6ONLY -socket option is defined in RFC 3542. +socket option is defined in RFC 3493 Section 5.3. The .Dv IPV6_PORTRANGE socket option and the conflict resolution rule are not defined in the ==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#9 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.360 2009/05/16 20:55:28 dougb Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.361 2009/08/25 19:07:26 delphij Exp $ .\" -.Dd April 10, 2009 +.Dd August 25, 2009 .Dt RC.CONF 5 .Os .Sh NAME @@ -2227,6 +2227,22 @@ .Pq Vt str The IPv6 equivalent of .Va defaultrouter . +.It Va static_arp_pairs +.Pq Vt str +Set to the list of static ARP pairs that are to be added at system +boot time. +For each whitespace separated +.Ar element +in the value, a +.Va static_arp_ Ns Aq Ar element +variable is assumed to exist whose contents will later be passed to a +.Dq Nm arp Cm -S +operation. +For example +.Bd -literal +static_arp_pairs="gw" +static_arp_gw="192.168.1.1 00:01:02:03:04:05" +.Ed .It Va static_routes .Pq Vt str Set to the list of static routes that are to be added at system ==== //depot/projects/vimage/src/share/man/man5/tmpfs.5#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/tmpfs.5,v 1.4 2008/06/12 18:49:24 remko Exp $ +.\" $FreeBSD: src/share/man/man5/tmpfs.5,v 1.5 2009/08/25 01:04:15 delphij Exp $ .\" .Dd June 12, 2008 .Dt TMPFS 5 @@ -70,6 +70,7 @@ maximum number of inodes. .It Cm size maximum size (in bytes) for the file system. +.El .Sh EXAMPLES To mount a .Nm ==== //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.30 2009/04/05 09:27:19 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.32 2009/08/30 14:38:17 bz Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -108,6 +109,22 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_oinfo); +static Elf64_Brandinfo kfreebsd_brand_info = { + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/lib/ld-kfreebsd-x86-64.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .brand_note = &elf64_kfreebsd_brandnote, + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY +}; + +SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &kfreebsd_brand_info); + void elf64_dump_thread(struct thread *td __unused, void *dst __unused, ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#34 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.668 2009/08/17 13:27:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.669 2009/08/29 16:01:21 rnoland Exp $"); /* * Manages physical address maps. @@ -943,8 +943,8 @@ * coherence domain. */ mfence(); - for (; eva < sva; eva += cpu_clflush_line_size) - clflush(eva); + for (; sva < eva; sva += cpu_clflush_line_size) + clflush(sva); mfence(); } else { ==== //depot/projects/vimage/src/sys/amd64/amd64/trap.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.333 2009/08/13 17:09:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.334 2009/08/24 16:19:47 bz Exp $"); /* * AMD64 Trap and System call handling @@ -409,7 +409,9 @@ * This check also covers the images * without the ABI-tag ELF note. */ - if (p->p_osrel >= 700004) { + if (SV_CURPROC_ABI() == + SV_ABI_FREEBSD && + p->p_osrel >= 700004) { i = SIGSEGV; ucode = SEGV_ACCERR; } else { ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.52 2009/07/09 09:34:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.53 2009/08/24 16:19:47 bz Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -127,6 +127,7 @@ static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); static void linux32_fixlimit(struct rlimit *rl, int which); +static boolean_t linux32_trans_osrel(const Elf_Note *note, int32_t *osrel); static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; @@ -1066,14 +1067,38 @@ .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_IA32 }; -static char GNULINUX_ABI_VENDOR[] = "GNU"; +static char GNU_ABI_VENDOR[] = "GNU"; +static int GNULINUX_ABI_DESC = 0; + +static boolean_t +linux32_trans_osrel(const Elf_Note *note, int32_t *osrel) +{ + const Elf32_Word *desc; + uintptr_t p; + + p = (uintptr_t)(note + 1); + p += roundup2(note->n_namesz, sizeof(Elf32_Addr)); + + desc = (const Elf32_Word *)p; + if (desc[0] != GNULINUX_ABI_DESC) + return (FALSE); + + /* + * For linux we encode osrel as follows (see linux_mib.c): + * VVVMMMIII (version, major, minor), see linux_mib.c. + */ + *osrel = desc[1] * 1000000 + desc[2] * 1000 + desc[3]; + + return (TRUE); +} static Elf_Brandnote linux32_brandnote = { - .hdr.n_namesz = sizeof(GNULINUX_ABI_VENDOR), - .hdr.n_descsz = 16, + .hdr.n_namesz = sizeof(GNU_ABI_VENDOR), + .hdr.n_descsz = 16, /* XXX at least 16 */ .hdr.n_type = 1, - .vendor = GNULINUX_ABI_VENDOR, - .flags = 0 + .vendor = GNU_ABI_VENDOR, + .flags = BN_TRANSLATE_OSREL, + .trans_osrel = linux32_trans_osrel }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#12 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.40 2009/07/20 07:53:07 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.42 2009/08/29 21:53:08 kib Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#8 (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/arm/conf/CAMBRIA,v 1.12 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ ident CAMBRIA ==== //depot/projects/vimage/src/sys/arm/mv/common.c#6 (text+ko) ==== @@ -30,10 +30,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.7 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.8 2009/08/25 09:35:50 raj Exp $"); +#include #include #include +#include #include @@ -62,6 +64,76 @@ static uint32_t used_cpu_wins; +static __inline int +pm_is_disabled(uint32_t mask) +{ + + return (soc_power_ctrl_get(mask) == mask ? 0 : 1); +} + +static __inline uint32_t +obio_get_pm_mask(uint32_t base) +{ + struct obio_device *od; + + for (od = obio_devices; od->od_name != NULL; od++) + if (od->od_base == base) + return (od->od_pwr_mask); + + return (CPU_PM_CTRL_NONE); +} + +/* + * Disable device using power management register. + * 1 - Device Power On + * 0 - Device Power Off + * Mask can be set in loader. + * EXAMPLE: + * loader> set hw.pm-disable-mask=0x2 + * + * Common mask: + * |-------------------------------| + * | Device | Kirkwood | Discovery | + * |-------------------------------| + * | USB0 | 0x00008 | 0x020000 | + * |-------------------------------| + * | USB1 | - | 0x040000 | + * |-------------------------------| + * | USB2 | - | 0x080000 | + * |-------------------------------| + * | GE0 | 0x00001 | 0x000002 | + * |-------------------------------| + * | GE1 | - | 0x000004 | + * |-------------------------------| + * | IDMA | - | 0x100000 | + * |-------------------------------| + * | XOR | 0x10000 | 0x200000 | + * |-------------------------------| + * | CESA | 0x20000 | 0x400000 | + * |-------------------------------| + * | SATA | 0x04000 | 0x004000 | + * --------------------------------| + * This feature can be used only on Kirkwood and Discovery + * machines. + */ +static __inline void +pm_disable_device(int mask) +{ +#ifdef DIAGNOSTIC + uint32_t reg; + + reg = soc_power_ctrl_get(CPU_PM_CTRL_ALL); + printf("Power Management Register: 0%x\n", reg); + + reg &= ~mask; + soc_power_ctrl_set(reg); + printf("Device %x is disabled\n", mask); + + reg = soc_power_ctrl_get(CPU_PM_CTRL_ALL); + printf("Power Management Register: 0%x\n", reg); +#endif +} + uint32_t read_cpu_ctrl(uint32_t reg) { @@ -103,14 +175,36 @@ return (ef); } +/* + * Get the power status of device. This feature is only supported on + * Kirkwood and Discovery SoCs. + */ uint32_t soc_power_ctrl_get(uint32_t mask) { +#ifndef SOC_MV_ORION if (mask != CPU_PM_CTRL_NONE) mask &= read_cpu_ctrl(CPU_PM_CTRL); return (mask); +#else + return (mask); +#endif +} + +/* + * Set the power status of device. This feature is only supported on + * Kirkwood and Discovery SoCs. + */ +void +soc_power_ctrl_set(uint32_t mask) +{ + +#ifndef SOC_MV_ORION + if (mask != CPU_PM_CTRL_NONE) + write_cpu_ctrl(CPU_PM_CTRL, mask); +#endif } void @@ -191,7 +285,14 @@ soc_decode_win(void) { uint32_t dev, rev; + int mask; + mask = 0; + TUNABLE_INT_FETCH("hw.pm-disable-mask", &mask); + + if (mask != 0) + pm_disable_device(mask); + /* Retrieve our ID: some windows facilities vary between SoC models */ soc_id(&dev, &rev); @@ -623,8 +724,12 @@ /* Disable and clear all USB windows for all ports */ m = usb_max_ports(); + for (p = 0; p < m; p++) { + if (pm_is_disabled(CPU_PM_CTRL_USB(p))) + continue; + for (i = 0; i < MV_WIN_USB_MAX; i++) { win_usb_cr_write(i, p, 0); win_usb_br_write(i, p, 0); @@ -710,6 +815,9 @@ uint32_t br, sz; int i, j; + if (pm_is_disabled(obio_get_pm_mask(base))) + return; + /* Disable, clear and revoke protection for all ETH windows */ for (i = 0; i < MV_WIN_ETH_MAX; i++) { @@ -880,6 +988,8 @@ uint32_t br, sz; int i, j; + if (pm_is_disabled(CPU_PM_CTRL_IDMA)) + return; /* * Disable and clear all IDMA windows, revoke protection for all channels */ @@ -1172,6 +1282,9 @@ uint32_t br, sz; int i, j, z, e = 1, m, window; + if (pm_is_disabled(CPU_PM_CTRL_XOR)) + return; + /* * Disable and clear all XOR windows, revoke protection for all * channels @@ -1364,6 +1477,9 @@ uint32_t br, cr; int i, j; + if (pm_is_disabled(CPU_PM_CTRL_CRYPTO)) + return; + /* Disable and clear all CESA windows */ for (i = 0; i < MV_WIN_CESA_MAX; i++) { win_cesa_cr_write(i, 0); @@ -1432,6 +1548,9 @@ uint32_t cr, br; int i, j; + if (pm_is_disabled(CPU_PM_CTRL_SATA)) + return; + for (i = 0; i < MV_WIN_SATA_MAX; i++) { win_sata_cr_write(i, 0); win_sata_br_write(i, 0); ==== //depot/projects/vimage/src/sys/arm/mv/discovery/db78xxx.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.5 2009/08/25 09:30:03 raj Exp $"); #include #include @@ -68,11 +68,8 @@ * 0xffff_2000 - 0xffff_ffff : unused (~55KB) */ -const struct pmap_devmap *pmap_devmap_bootstrap_table; -vm_offset_t pmap_bootstrap_lastaddr; - /* Static device mappings. */ -static const struct pmap_devmap pmap_devmap[] = { +const struct pmap_devmap pmap_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. @@ -105,16 +102,6 @@ { -1, -1, -1 } }; -int -platform_pmap_init(void) -{ - - pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; - pmap_devmap_bootstrap_table = &pmap_devmap[0]; - - return (0); -} - void platform_mpp_init(void) { ==== //depot/projects/vimage/src/sys/arm/mv/kirkwood/db88f6xxx.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.5 2009/08/25 09:30:03 raj Exp $"); #include #include @@ -68,11 +68,8 @@ * 0xffff_2000 - 0xffff_ffff : unused (~55KB) */ -const struct pmap_devmap *pmap_devmap_bootstrap_table; -vm_offset_t pmap_bootstrap_lastaddr; - /* Static device mappings. */ -static const struct pmap_devmap pmap_devmap[] = { +const struct pmap_devmap pmap_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. @@ -105,16 +102,6 @@ { -1, -1, -1 } }; -int -platform_pmap_init(void) -{ - - pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; - pmap_devmap_bootstrap_table = &pmap_devmap[0]; - - return (0); -} - void platform_mpp_init(void) { ==== //depot/projects/vimage/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 (text+ko) ==== @@ -1,5 +1,4 @@ -# $FreeBSD: src/sys/arm/mv/kirkwood/files.db88f6xxx,v 1.1 2008/10/13 20:07:13 raj Exp $ +# $FreeBSD: src/sys/arm/mv/kirkwood/files.db88f6xxx,v 1.2 2009/08/25 09:39:11 raj Exp $ -arm/mv/rtc.c standard -arm/mv/kirkwood/kirkwood.c standard +include "arm/mv/kirkwood/files.kirkwood" arm/mv/kirkwood/db88f6xxx.c standard ==== //depot/projects/vimage/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 (text+ko) ==== @@ -1,13 +1,8 @@ -# $FreeBSD: src/sys/arm/mv/kirkwood/std.db88f6xxx,v 1.1 2008/10/13 20:07:13 raj Exp $ +# $FreeBSD: src/sys/arm/mv/kirkwood/std.db88f6xxx,v 1.2 2009/08/25 09:39:11 raj Exp $ include "../mv/std.mv" +include "../mv/kirkwood/std.kirkwood" files "../mv/kirkwood/files.db88f6xxx" -makeoptions KERNPHYSADDR=0x00900000 -makeoptions KERNVIRTADDR=0xc0900000 -options KERNPHYSADDR=0x00900000 -options KERNVIRTADDR=0xc0900000 -options PHYSADDR=0x00000000 options PHYSMEM_SIZE=0x20000000 -options STARTUP_PAGETABLE_ADDR=0x00100000 ==== //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.6 2009/07/01 20:07:44 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.7 2009/08/25 09:30:03 raj Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -86,6 +86,7 @@ #include #include /* XXX eventually this should be eliminated */ +#include #ifdef DEBUG #define debugf(fmt, args...) printf(fmt, ##args) @@ -133,7 +134,9 @@ vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; +vm_offset_t pmap_bootstrap_lastaddr; +const struct pmap_devmap *pmap_devmap_bootstrap_table; struct pv_addr systempage; struct pv_addr msgbufpv; struct pv_addr irqstack; @@ -423,8 +426,8 @@ while (1); /* Platform-specific initialisation */ - if (platform_pmap_init() != 0) - return (NULL); + pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; + pmap_devmap_bootstrap_table = &pmap_devmap[0]; pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); ==== //depot/projects/vimage/src/sys/arm/mv/mvreg.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.7 2009/06/24 15:41:18 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.8 2009/08/25 09:35:50 raj Exp $ */ #ifndef _MVREG_H_ @@ -218,6 +218,7 @@ */ #define CPU_PM_CTRL 0x1C #define CPU_PM_CTRL_NONE 0 +#define CPU_PM_CTRL_ALL ~0x0 #if defined(SOC_MV_KIRKWOOD) #define CPU_PM_CTRL_GE0 (1 << 0) @@ -234,8 +235,11 @@ #define CPU_PM_CTRL_SATA1 (1 << 15) #define CPU_PM_CTRL_XOR1 (1 << 16) #define CPU_PM_CTRL_CRYPTO (1 << 17) -#define CPU_PM_CTRL_GE1 (1 << 18) -#define CPU_PM_CTRL_TDM (1 << 19) +#define CPU_PM_CTRL_GE1 (1 << 19) +#define CPU_PM_CTRL_TDM (1 << 20) +#define CPU_PM_CTRL_XOR (CPU_PM_CTRL_XOR0 | CPU_PM_CTRL_XOR1) +#define CPU_PM_CTRL_USB(u) (CPU_PM_CTRL_USB0) +#define CPU_PM_CTRL_SATA (CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1) #elif defined(SOC_MV_DISCOVERY) #define CPU_PM_CTRL_GE0 (1 << 1) #define CPU_PM_CTRL_GE1 (1 << 2) @@ -258,6 +262,14 @@ #define CPU_PM_CTRL_XOR (1 << 21) #define CPU_PM_CTRL_CRYPTO (1 << 22) #define CPU_PM_CTRL_DEVICE (1 << 23) +#define CPU_PM_CTRL_USB(u) (1 << (17 + (u))) +#define CPU_PM_CTRL_SATA (CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1) +#else +#define CPU_PM_CTRL_CRYPTO (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_IDMA (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_XOR (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_SATA (CPU_PM_CTRL_NONE) +#define CPU_PM_CTRL_USB(u) (CPU_PM_CTRL_NONE) #endif /* ==== //depot/projects/vimage/src/sys/arm/mv/mvvar.h#4 (text+ko) ==== @@ -34,13 +34,17 @@ * * from: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0var.h, rev 1 * - * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.5 2009/01/09 10:20:51 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.7 2009/08/25 09:35:50 raj Exp $ */ #ifndef _MVVAR_H_ #define _MVVAR_H_ #include +#include +#include +#include +#include #define MV_TYPE_PCI 0 #define MV_TYPE_PCIE 1 @@ -104,6 +108,7 @@ int remap; }; +extern const struct pmap_devmap pmap_devmap[]; extern const struct obio_pci mv_pci_info[]; extern const struct gpio_config mv_gpio_config[]; extern bus_space_tag_t obio_tag; @@ -124,13 +129,13 @@ void mv_gpio_out(uint32_t pin, uint8_t val, uint8_t enable); uint8_t mv_gpio_in(uint32_t pin); -int platform_pmap_init(void); void platform_mpp_init(void); int soc_decode_win(void); void soc_id(uint32_t *dev, uint32_t *rev); void soc_identify(void); void soc_dump_decode_win(void); uint32_t soc_power_ctrl_get(uint32_t mask); +void soc_power_ctrl_set(uint32_t mask); int decode_win_cpu_set(int target, int attr, vm_paddr_t base, uint32_t size, int remap); ==== //depot/projects/vimage/src/sys/arm/mv/orion/db88f5xxx.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.5 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.6 2009/08/25 09:30:03 raj Exp $"); #include #include @@ -70,12 +70,10 @@ * 0xffff_2000 - 0xffff_ffff : unused (~55KB) */ -const struct pmap_devmap *pmap_devmap_bootstrap_table; -vm_offset_t pmap_bootstrap_lastaddr; int platform_pci_get_irq(u_int bus, u_int slot, u_int func, u_int pin); /* Static device mappings. */ -static const struct pmap_devmap pmap_devmap[] = { +const struct pmap_devmap pmap_devmap[] = { /* * Map the on-board devices VA == PA so that we can access them * with the MMU on or off. @@ -184,16 +182,6 @@ }; #endif -int -platform_pmap_init(void) -{ - - pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; - pmap_devmap_bootstrap_table = &pmap_devmap[0]; - - return (0); -} - void platform_mpp_init(void) { ==== //depot/projects/vimage/src/sys/cam/ata/ata_all.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.1 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.2 2009/08/30 16:31:25 mav Exp $"); #include @@ -91,7 +91,7 @@ } void -ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count) { bzero(&ataio->cmd, sizeof(ataio->cmd)); ==== //depot/projects/vimage/src/sys/cam/ata/ata_all.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.1 2009/07/10 08:18:08 scottl Exp $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $ */ #ifndef CAM_ATA_ALL_H @@ -83,7 +83,7 @@ int ata_version(int ver); void ata_print_ident(struct ata_params *ident_data); -void ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +void ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count); void ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features, uint64_t lba, uint16_t sector_count); ==== //depot/projects/vimage/src/sys/cam/ata/ata_da.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.2 2009/07/17 21:48:08 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.4 2009/08/30 16:31:25 mav Exp $"); #include @@ -287,7 +287,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0, /*sense_flags*/SF_RETRY_UA, softc->disk->d_devstat); @@ -411,7 +411,7 @@ ata_48bit_cmd(&ccb.ataio, ATA_WRITE_DMA48, 0, lba, count); } else { - ata_36bit_cmd(&ccb.ataio, ATA_WRITE_DMA, + ata_28bit_cmd(&ccb.ataio, ATA_WRITE_DMA, 0, lba, count); } xpt_polled_action(&ccb); @@ -441,7 +441,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); xpt_polled_action(&ccb); if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) @@ -856,10 +856,10 @@ } } else { if (bp->bio_cmd == BIO_READ) { - ata_36bit_cmd(ataio, ATA_READ_DMA, + ata_28bit_cmd(ataio, ATA_READ_DMA, 0, lba, count); } else { - ata_36bit_cmd(ataio, ATA_WRITE_DMA, + ata_28bit_cmd(ataio, ATA_WRITE_DMA, 0, lba, count); } } @@ -878,7 +878,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(ataio, ATA_FLUSHCACHE48, 0, 0, 0); else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 31 15:08:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D56A1065672; Mon, 31 Aug 2009 15:08:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11AB71065670 for ; Mon, 31 Aug 2009 15:08:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F38098FC1A for ; Mon, 31 Aug 2009 15:08:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VF8GR8099199 for ; Mon, 31 Aug 2009 15:08:16 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7VF8Gss099197 for perforce@freebsd.org; Mon, 31 Aug 2009 15:08:16 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 31 Aug 2009 15:08:16 GMT Message-Id: <200908311508.n7VF8Gss099197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 168005 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, 31 Aug 2009 15:08:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=168005 Change 168005 by pgj@beehive on 2009/08/31 15:08:03 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#22 integrate .. //depot/projects/docproj_hu/www/en/docproj/translations.sgml#9 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#21 integrate .. //depot/projects/docproj_hu/www/en/vendors.html#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#47 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#22 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#22 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.489 2009/07/26 11:48:34 blackend Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.490 2009/08/26 20:54:04 blackend Exp $ --> @@ -568,6 +568,7 @@ + ==== //depot/projects/docproj_hu/www/en/docproj/translations.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -157,13 +157,15 @@

The FreeBSD Dutch Documentation Project

-E-Mail: remko@FreeBSD.org
+E-Mail: remko@FreeBSD.org or + rene@FreeBSD.org
Released documents
-
Handbook (85% complete)
+
Handbook
+
Several articles
+
Web page
Work in progress (gets periodically build from perforce)
-
Handbook
-
Web page
+
FAQ
Repository of the ongoing work
Perforce
==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#21 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2614,6 +2614,27 @@ stas Received + + + Justin Settle + Kuma Athlon 7750 + jkim + Received + + + + Justin Settle + HTPC Machine + wxs + Received + + + + Justin Settle + Soekris 5501 + lstewart + Received + &footer; ==== //depot/projects/docproj_hu/www/en/vendors.html#2 (text+ko) ==== @@ -1,5 +1,6 @@ + ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#47 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.18 2009/08/16 00:32:04 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.19 2009/08/26 14:50:43 pgj Exp $ ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#22 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/press.xml,v 1.9 2009/08/23 11:55:55 pgj Exp $ + $FreeBSD: www/hu/share/sgml/press.xml,v 1.10 2009/08/26 14:50:43 pgj Exp $ From owner-p4-projects@FreeBSD.ORG Mon Aug 31 17:30:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0B9E10656AB; Mon, 31 Aug 2009 17:30:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 944CD1065698 for ; Mon, 31 Aug 2009 17:30:53 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 825F58FC1E for ; Mon, 31 Aug 2009 17:30:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VHUrVo022038 for ; Mon, 31 Aug 2009 17:30:53 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7VHUrYg022036 for perforce@freebsd.org; Mon, 31 Aug 2009 17:30:53 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 31 Aug 2009 17:30:53 GMT Message-Id: <200908311730.n7VHUrYg022036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 168012 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, 31 Aug 2009 17:30:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=168012 Change 168012 by pgj@beehive on 2009/08/31 17:30:44 MFen (doc): 1.137 -> 1.138 hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml 1.192 -> 1.194 hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#14 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#8 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml - %SRCID% 1.137 + %SRCID% 1.138 --> @@ -209,9 +209,18 @@ telepítése. Csupán ennyit kell beírnunk: - &prompt.root; cd /usr/ports/emulators/linux_base-fc4 + &prompt.root; cd /usr/ports/emulators/linux_base-f10 &prompt.root; make install distclean + + A &os; 8.0 kiadását megelõzõ + változataiban az emulators/linux_base-f10 port + helyett az emulators/linux_base-fc4 portot + használjuk. + + A telepítés végeztével kaptunk is egy mûködõ bináris Linux kompatibilitást, habár egyes programok ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#14 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -708,12 +708,34 @@ Amennyiben továbbra is szükségünk lenne rá, a 7.4 és késõbbi változatokban ezt úgy tudjuk - engedélyezni, ha a konfigurációs - állomány ServerLayout vagy - ServerFlags szekciójába - felvesszük a következõ sort: + engedélyezni, ha a begépeljük a + következõ parancsot egy X + terminálablakban: + + &prompt.user; setxkbmap -option terminate:ctrl_alt_bksp + + Egy másik lehetséges megoldás, ha a + billenytûzet beállításához + létrehozunk a /usr/local/etc/hal/fdi/policy + könyvtárban egy konfigurációs + állományt x11-input.fdi + néven a hald + számára. Ebben az állományban a + következõknek kell szerepelnie: + + <?xml version="1.0" encoding="ISO-8859-2"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.keyboard"> + <merge key="input.x11_options.XkbOptions" type="string">terminate:ctrl_alt_bksp</merge> + </match> +</deviceinfo> - Option "DontZap" "Off" + A hald a + számítógép + újraindításával fogja majd + beolvasni ezt az állományt. Ha az egér még nem mûködne, @@ -743,6 +765,68 @@ váltása) mentén a korábbiakban megszokott módon konfigurálhatóak. + + Ahogy arról korábban szó esett, a 7.4 + verziótól kezdõdõen a + hald magától + érzékelni fogja a + számítógépre csatlakoztatott + billentyûzetet. Elõfordulhat, hogy a + billentyûzet típusa vagy éppen + kiosztása nem lesz megfelelõ. Ennek + beállítására többnyire a + népszerûbb munkakörnyezetek, mint + például a GNOME, + KDE vagy + Xfce tartalmaznak külön + segédprogramot. A &man.setxkbmap.1; vagy a + hald konfigurációs + szabályával azonban akár + közvetlenül is meg tudjuk változtatni a + billentyûzhez társított + tulajdonságokat. + + Például ha egy 102 gombos + billentyûzetet szeretnénk használni francia + kiosztással, akkor ehhez a /usr/local/etc/hal/fdi/policy + könyvtárban kell létrehoznunk egy + x11-input.fdi nevû + állományt a hald + részére. Ebben az állományban + szerepeljenek az alábbi sorok: + + <?xml version="1.0" encoding="ISO-8859-2"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.keyboard"> + <merge key="input.x11_options.XkbModel" type="string">pc102</merge> + <merge key="input.x11_options.XkbLayout" type="string">fr</merge> + </device> +</deviceinfo> + + Ha létezik már ilyen + állományunk, akkor a billentyûzet + megfelelõ beállításához + egyszerûen csak másoljuk ki a fenti sorokat + és adjuk hozzá. + + Indítsuk újra a + számítógépet, hogy a + hald beolvassa az + állományt. + + Ugyanezt egy X terminálból is + kényelmesen el tudjuk végezni: + + &prompt.user; setxkbmap -model pc102 -layout fr + + A paraméterként megadható + billentyûzettípusokat és -kiosztásokat + a /usr/local/share/X11/xkb/rules/base.lst + állományban találhatjuk meg. + + Az X11 finomhangolása From owner-p4-projects@FreeBSD.ORG Mon Aug 31 18:27:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED267106568B; Mon, 31 Aug 2009 18:27:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1A1D1065670 for ; Mon, 31 Aug 2009 18:27:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A05558FC0A for ; Mon, 31 Aug 2009 18:27:56 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VIRuSO028313 for ; Mon, 31 Aug 2009 18:27:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7VIRu9B028311 for perforce@freebsd.org; Mon, 31 Aug 2009 18:27:56 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 31 Aug 2009 18:27:56 GMT Message-Id: <200908311827.n7VIRu9B028311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168019 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, 31 Aug 2009 18:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=168019 Change 168019 by hselasky@hselasky_laptop001 on 2009/08/31 18:27:32 USB CORE: - Fix NULL-pointer dereference in usb_endpoint_foreach(). The function in question is currently not used anywhere. - Report and patch from: Patroklos Argyroudis at census, inc PR: usb/138389 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#52 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#52 (text+ko) ==== @@ -367,12 +367,14 @@ struct usb_endpoint * usb_endpoint_foreach(struct usb_device *udev, struct usb_endpoint *ep) { - struct usb_endpoint *ep_end = udev->endpoints + udev->endpoints_max; + struct usb_endpoint *ep_end; /* be NULL safe */ if (udev == NULL) return (NULL); + ep_end = udev->endpoints + udev->endpoints_max; + /* get next endpoint */ if (ep == NULL) ep = udev->endpoints; From owner-p4-projects@FreeBSD.ORG Mon Aug 31 20:07:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E9651065679; Mon, 31 Aug 2009 20:07:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3EEA106566C for ; Mon, 31 Aug 2009 20:07:52 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C3E4A8FC16 for ; Mon, 31 Aug 2009 20:07:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VK7qs1038502 for ; Mon, 31 Aug 2009 20:07:52 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7VK7qkQ038500 for perforce@freebsd.org; Mon, 31 Aug 2009 20:07:52 GMT (envelope-from zec@fer.hr) Date: Mon, 31 Aug 2009 20:07:52 GMT Message-Id: <200908312007.n7VK7qkQ038500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168026 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, 31 Aug 2009 20:07:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=168026 Change 168026 by zec@zec_tpx32 on 2009/08/31 20:07:17 Make options VIMAGE kernels actually boot. Affected files ... .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#29 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/vfs_lookup.c#29 (text+ko) ==== @@ -349,6 +349,7 @@ break; } #ifdef IMUNES_SYMLINK_HACK + CURVNET_SET(TD_TO_VNET(curthread)); if (V_morphing_symlinks) { char *sp = strchr(cp, '@'); int vnamelen = strlen(td->td_ucred->cr_prison->pr_name); @@ -358,6 +359,7 @@ if (ndp->ni_pathlen > 1) uma_zfree(namei_zone, cp); error = ENAMETOOLONG; + CURVNET_RESTORE(); break; } bcopy(sp + 1, sp + vnamelen, @@ -367,6 +369,7 @@ linklen += (vnamelen - 1); } } + CURVNET_RESTORE(); #endif if (linklen + ndp->ni_pathlen >= MAXPATHLEN) { if (ndp->ni_pathlen > 1) From owner-p4-projects@FreeBSD.ORG Mon Aug 31 21:29:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FAA51065695; Mon, 31 Aug 2009 21:29:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF2B1106566C for ; Mon, 31 Aug 2009 21:29:21 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD1F58FC13 for ; Mon, 31 Aug 2009 21:29:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VLTLfw055401 for ; Mon, 31 Aug 2009 21:29:21 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7VLTLjM055399 for perforce@freebsd.org; Mon, 31 Aug 2009 21:29:21 GMT (envelope-from peter@wemm.org) Date: Mon, 31 Aug 2009 21:29:21 GMT Message-Id: <200908312129.n7VLTLjM055399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 168029 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, 31 Aug 2009 21:29:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=168029 Change 168029 by peter@peter_daintree on 2009/08/31 21:28:32 IFC @168028 Affected files ... .. //depot/projects/hammer/bin/sh/eval.c#22 integrate .. //depot/projects/hammer/bin/sh/exec.c#14 integrate .. //depot/projects/hammer/bin/sh/mknodes.c#6 integrate .. //depot/projects/hammer/bin/sh/nodes.c.pat#6 integrate .. //depot/projects/hammer/etc/network.subr#31 integrate .. //depot/projects/hammer/lib/libc/posix1e/acl_support.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#8 integrate .. //depot/projects/hammer/release/Makefile#108 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#12 integrate .. //depot/projects/hammer/share/man/man4/ahci.4#2 integrate .. //depot/projects/hammer/share/man/man4/ip6.4#8 integrate .. //depot/projects/hammer/share/man/man4/ips.4#7 integrate .. //depot/projects/hammer/share/man/man4/mfi.4#7 integrate .. //depot/projects/hammer/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/hammer/share/zoneinfo/africa#14 integrate .. //depot/projects/hammer/share/zoneinfo/asia#22 integrate .. //depot/projects/hammer/share/zoneinfo/australasia#13 integrate .. //depot/projects/hammer/share/zoneinfo/europe#17 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#191 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#34 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/hammer/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/hammer/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/hammer/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/hammer/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#52 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#27 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#52 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#43 integrate .. //depot/projects/hammer/sys/conf/NOTES#163 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/hammer/sys/dev/siis/siis.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#7 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#36 integrate .. //depot/projects/hammer/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#122 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#42 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#17 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#55 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#59 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#83 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#81 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_kthread.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#86 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#48 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#115 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#67 integrate .. //depot/projects/hammer/sys/modules/Makefile#144 integrate .. //depot/projects/hammer/sys/net/flowtable.c#5 integrate .. //depot/projects/hammer/sys/net/rtsock.c#50 integrate .. //depot/projects/hammer/sys/net/vnet.c#2 integrate .. //depot/projects/hammer/sys/netinet/in.c#43 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#81 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#16 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#47 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#30 integrate .. //depot/projects/hammer/sys/sys/conf.h#53 integrate .. //depot/projects/hammer/sys/sys/imgact_elf.h#12 integrate .. //depot/projects/hammer/sys/sys/proc.h#132 integrate .. //depot/projects/hammer/sys/sys/types.h#30 integrate .. //depot/projects/hammer/sys/vm/device_pager.c#22 integrate .. //depot/projects/hammer/sys/vm/sg_pager.c#2 integrate .. //depot/projects/hammer/sys/vm/vm.h#11 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#23 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#55 integrate .. //depot/projects/hammer/tools/regression/acltools/tools-posix.test#4 integrate .. //depot/projects/hammer/tools/regression/bin/sh/builtins/eval3.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/execution/func2.0#1 branch .. //depot/projects/hammer/tools/tools/ath/athpoke/athpoke.c#3 integrate .. //depot/projects/hammer/usr.bin/w/extern.h#2 integrate .. //depot/projects/hammer/usr.bin/w/pr_time.c#3 integrate .. //depot/projects/hammer/usr.bin/w/w.c#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#23 integrate .. //depot/projects/hammer/usr.sbin/zic/zic.c#7 integrate Differences ... ==== //depot/projects/hammer/bin/sh/eval.c#22 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.65 2009/08/23 21:09:46 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $"); #include #include @@ -807,9 +807,9 @@ funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) - evaltree(&cmdentry.u.func->n, EV_TESTED); + evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); else - evaltree(&cmdentry.u.func->n, 0); + evaltree(getfuncnode(cmdentry.u.func), 0); funcnest--; INTOFF; unreffunc(cmdentry.u.func); ==== //depot/projects/hammer/bin/sh/exec.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.35 2009/08/23 21:09:46 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $"); #include #include @@ -286,7 +286,7 @@ out1fmt("function %s", cmdp->cmdname); if (verbose) { INTOFF; - name = commandtext(&cmdp->param.func->n); + name = commandtext(getfuncnode(cmdp->param.func)); out1c(' '); out1str(name); ckfree(name); ==== //depot/projects/hammer/bin/sh/mknodes.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.19 2009/08/23 21:09:46 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.20 2009/08/28 22:41:25 jilles Exp $"); /* * This program reads the nodetypes file and nodes.c.pat file. It generates @@ -248,11 +248,9 @@ fputs("\tstruct nodelist *next;\n", hfile); fputs("\tunion node *n;\n", hfile); fputs("};\n\n\n", hfile); - fputs("struct funcdef {\n", hfile); - fputs("\tunsigned int refcount;\n", hfile); - fputs("\tunion node n;\n", hfile); - fputs("};\n\n\n", hfile); + fputs("struct funcdef;\n", hfile); fputs("struct funcdef *copyfunc(union node *);\n", hfile); + fputs("union node *getfuncnode(struct funcdef *);\n", hfile); fputs("void reffunc(struct funcdef *);\n", hfile); fputs("void unreffunc(struct funcdef *);\n", hfile); ==== //depot/projects/hammer/bin/sh/nodes.c.pat#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.16 2009/08/23 21:09:46 jilles Exp $ + * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.17 2009/08/28 22:41:25 jilles Exp $ */ #include @@ -61,6 +61,10 @@ STATIC char *nodesavestr(char *); +struct funcdef { + unsigned int refcount; + union node n; +}; /* * Make a copy of a parse tree. @@ -85,6 +89,12 @@ } +union node * +getfuncnode(struct funcdef *fn) +{ + return fn == NULL ? NULL : &fn->n; +} + STATIC void calcsize(union node *n) @@ -153,7 +163,8 @@ void reffunc(struct funcdef *fn) { - fn->refcount++; + if (fn) + fn->refcount++; } ==== //depot/projects/hammer/etc/network.subr#31 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.198 2009/08/24 22:05:08 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.199 2009/08/27 15:24:26 dougb Exp $ # # @@ -879,8 +879,8 @@ # Wireless NIC cards are virtualized through the wlan interface if ! is_wired_interface ${i}; then case "${i}" in - wlan*) rtsol_available=yes ;; - *) rtsol_available=no ;; + wlan*) rtsol_interface=yes ;; + *) rtsol_interface=no ;; esac fi ==== //depot/projects/hammer/lib/libc/posix1e/acl_support.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_support.c,v 1.17 2009/06/25 12:46:59 trasz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_support.c,v 1.18 2009/08/29 03:17:24 kientzle Exp $"); #include #include "namespace.h" @@ -80,7 +80,7 @@ return (0); } - + /* * _posix1e_acl_entry_compare -- compare two acl_entry structures to * determine the order they should appear in. Used by _posix1e_acl_sort to @@ -164,7 +164,7 @@ * from code in sys/kern/kern_acl.c, and if changes are made in one, they * should be made in the other also. This copy of acl_check is made * available * in userland for the benefit of processes wanting to check ACLs - * for validity before submitting them to the kernel, or for performing + * for validity before submitting them to the kernel, or for performing * in userland file system checking. Needless to say, the kernel makes * the real checks on calls to get/setacl. * @@ -203,7 +203,7 @@ stage = ACL_USER; count_user_obj++; break; - + case ACL_USER: /* printf("_posix1e_acl_check: %d: ACL_USER\n", i); */ if (stage > ACL_USER) @@ -213,8 +213,8 @@ return (EINVAL); highest_uid = entry->ae_id; count_user++; - break; - + break; + case ACL_GROUP_OBJ: /* printf("_posix1e_acl_check: %d: ACL_GROUP_OBJ\n", i); */ @@ -223,7 +223,7 @@ stage = ACL_GROUP; count_group_obj++; break; - + case ACL_GROUP: /* printf("_posix1e_acl_check: %d: ACL_GROUP\n", i); */ if (stage > ACL_GROUP) @@ -234,7 +234,7 @@ highest_gid = entry->ae_id; count_group++; break; - + case ACL_MASK: /* printf("_posix1e_acl_check: %d: ACL_MASK\n", i); */ if (stage > ACL_MASK) @@ -242,7 +242,7 @@ stage = ACL_MASK; count_mask++; break; - + case ACL_OTHER: /* printf("_posix1e_acl_check: %d: ACL_OTHER\n", i); */ if (stage > ACL_OTHER) @@ -250,7 +250,7 @@ stage = ACL_OTHER; count_other++; break; - + default: /* printf("_posix1e_acl_check: %d: INVALID\n", i); */ return (EINVAL); @@ -260,7 +260,7 @@ if (count_user_obj != 1) return (EINVAL); - + if (count_group_obj != 1) return (EINVAL); @@ -312,7 +312,7 @@ g = NULL; else g = getgrgid(id); - if (g == NULL) + if (g == NULL) i = snprintf(buf, buf_len, "%d", id); else i = snprintf(buf, buf_len, "%s", g->gr_name); ==== //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.23 2007/07/22 15:17:29 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.24 2009/08/30 05:12:37 jon Exp $"); #define _BSD_SOURCE @@ -183,6 +183,11 @@ pam_err = pam_get_item(pamh, PAM_TTY, (const void **)&tty); if (pam_err != PAM_SUCCESS) goto err; + if (tty == NULL) { + PAM_LOG("No PAM_TTY"); + pam_err = PAM_SERVICE_ERR; + goto err; + } if (strncmp(tty, _PATH_DEV, strlen(_PATH_DEV)) == 0) tty = (const char *)tty + strlen(_PATH_DEV); if (*(const char *)tty == '\0') ==== //depot/projects/hammer/release/Makefile#108 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.947 2009/08/24 21:56:41 jhb Exp $ +# $FreeBSD: src/release/Makefile,v 1.948 2009/08/27 13:18:59 blackend Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] [SVNROOT=svn://svn.freebsd.org/base] \ @@ -1163,10 +1163,10 @@ .endif # -# --==## Documentation Project files such as the Handbook and FAQ ##==-- +# --==## Documentation Project tools required to build the release notes ##==-- # doc.1: - @echo "Making docs..." + @echo "Making docproj tools..." @for i in ${DOCPORTS}; do \ cd /usr/ports/$$i && \ env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \ ==== //depot/projects/hammer/sbin/camcontrol/camcontrol.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.60 2009/07/10 17:42:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.62 2009/08/30 16:31:25 mav Exp $"); #include #include @@ -206,6 +206,7 @@ struct ccb_trans_settings *cts); static void cpi_print(struct ccb_pathinq *cpi); static int get_cpi(struct cam_device *device, struct ccb_pathinq *cpi); +static int get_cgd(struct cam_device *device, struct ccb_getdev *cgd); static int get_print_cts(struct cam_device *device, int user_settings, int quiet, struct ccb_trans_settings *cts); static int ratecontrol(struct cam_device *device, int retry_count, @@ -1015,17 +1016,18 @@ ((u_int64_t)parm->lba_size48_4 << 48); printf("\n"); - printf("Protocol "); + printf("protocol "); + printf("ATA/ATAPI-%d", ata_version(parm->version_major)); if (parm->satacapabilities && parm->satacapabilities != 0xffff) { if (parm->satacapabilities & ATA_SATA_GEN2) - printf("SATA revision 2.x\n"); + printf(" SATA 2.x\n"); else if (parm->satacapabilities & ATA_SATA_GEN1) - printf("SATA revision 1.x\n"); + printf(" SATA 1.x\n"); else - printf("Unknown SATA revision\n"); + printf(" SATA x.x\n"); } else - printf("ATA/ATAPI revision %d\n", ata_version(parm->version_major)); + printf("\n"); printf("device model %.40s\n", parm->model); printf("serial number %.20s\n", parm->serial); printf("firmware revision %.8s\n", parm->revision); @@ -1038,22 +1040,74 @@ (parm->support.command2 & ATA_SUPPORT_CFA)) printf("CFA supported\n"); - printf("lba%ssupported ", + printf("LBA%ssupported ", parm->capabilities1 & ATA_SUPPORT_LBA ? " " : " not "); if (lbasize) printf("%d sectors\n", lbasize); else printf("\n"); - printf("lba48%ssupported ", + printf("LBA48%ssupported ", parm->support.command2 & ATA_SUPPORT_ADDRESS48 ? " " : " not "); if (lbasize48) printf("%ju sectors\n", (uintmax_t)lbasize48); else printf("\n"); - printf("dma%ssupported\n", + printf("PIO supported PIO"); + if (parm->atavalid & ATA_FLAG_64_70) { + if (parm->apiomodes & 0x02) + printf("4"); + else if (parm->apiomodes & 0x01) + printf("3"); + } else if (parm->mwdmamodes & 0x04) + printf("4"); + else if (parm->mwdmamodes & 0x02) + printf("3"); + else if (parm->mwdmamodes & 0x01) + printf("2"); + else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x200) + printf("2"); + else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x100) + printf("1"); + else + printf("0"); + printf("\n"); + + printf("DMA%ssupported ", parm->capabilities1 & ATA_SUPPORT_DMA ? " " : " not "); + if (parm->capabilities1 & ATA_SUPPORT_DMA) { + if (parm->mwdmamodes & 0xff) { + printf("WDMA"); + if (parm->mwdmamodes & 0x04) + printf("2"); + else if (parm->mwdmamodes & 0x02) + printf("1"); + else if (parm->mwdmamodes & 0x01) + printf("0"); + printf(" "); + } + if ((parm->atavalid & ATA_FLAG_88) && + (parm->udmamodes & 0xff)) { + printf("UDMA"); + if (parm->udmamodes & 0x40) + printf("6"); + else if (parm->udmamodes & 0x20) + printf("5"); + else if (parm->udmamodes & 0x10) + printf("4"); + else if (parm->udmamodes & 0x08) + printf("3"); + else if (parm->udmamodes & 0x04) + printf("2"); + else if (parm->udmamodes & 0x02) + printf("1"); + else if (parm->udmamodes & 0x01) + printf("0"); + printf(" "); + } + } + printf("\n"); printf("overlap%ssupported\n", parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not "); @@ -1070,10 +1124,10 @@ parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no"); if (parm->satacapabilities && parm->satacapabilities != 0xffff) { - printf("Native Command Queuing (NCQ) %s %s" + printf("Native Command Queuing (NCQ) %s " " %d/0x%02X\n", parm->satacapabilities & ATA_SUPPORT_NCQ ? - "yes" : "no", " -", + "yes" : "no", (parm->satacapabilities & ATA_SUPPORT_NCQ) ? ATA_QUEUE_LEN(parm->queue) : 0, (parm->satacapabilities & ATA_SUPPORT_NCQ) ? @@ -1121,9 +1175,14 @@ { union ccb *ccb; struct ata_params *ident_buf; + struct ccb_getdev cgd; u_int i, error = 0; int16_t *ptr; - + + if (get_cgd(device, &cgd) != 0) { + warnx("couldn't get CGD"); + return(1); + } ccb = cam_getccb(device); if (ccb == NULL) { @@ -1152,10 +1211,10 @@ /*data_ptr*/(u_int8_t *)ptr, /*dxfer_len*/sizeof(struct ata_params), timeout ? timeout : 30 * 1000); -// if (periph->path->device->protocol == PROTO_ATA) - ata_36bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0); -// else -// ata_36bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); + if (cgd.protocol == PROTO_ATA) + ata_28bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0); + else + ata_28bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); /* Disable freezing the device queue */ ccb->ccb_h.flags |= CAM_DEV_QFRZDIS; @@ -2588,46 +2647,71 @@ int retval = 0; ccb = cam_getccb(device); - if (ccb == NULL) { warnx("get_cpi: couldn't allocate CCB"); return(1); } - bzero(&(&ccb->ccb_h)[1], sizeof(struct ccb_pathinq) - sizeof(struct ccb_hdr)); - ccb->ccb_h.func_code = XPT_PATH_INQ; - if (cam_send_ccb(device, ccb) < 0) { warn("get_cpi: error sending Path Inquiry CCB"); - if (arglist & CAM_ARG_VERBOSE) cam_error_print(device, ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr); - retval = 1; - goto get_cpi_bailout; } - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - if (arglist & CAM_ARG_VERBOSE) cam_error_print(device, ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr); - retval = 1; - goto get_cpi_bailout; } - bcopy(&ccb->cpi, cpi, sizeof(struct ccb_pathinq)); get_cpi_bailout: + cam_freeccb(ccb); + return(retval); +} +/* + * Get a get device CCB for the specified device. + */ +static int +get_cgd(struct cam_device *device, struct ccb_getdev *cgd) +{ + union ccb *ccb; + int retval = 0; + + ccb = cam_getccb(device); + if (ccb == NULL) { + warnx("get_cgd: couldn't allocate CCB"); + return(1); + } + bzero(&(&ccb->ccb_h)[1], + sizeof(struct ccb_pathinq) - sizeof(struct ccb_hdr)); + ccb->ccb_h.func_code = XPT_GDEV_TYPE; + if (cam_send_ccb(device, ccb) < 0) { + warn("get_cgd: error sending Path Inquiry CCB"); + if (arglist & CAM_ARG_VERBOSE) + cam_error_print(device, ccb, CAM_ESF_ALL, + CAM_EPF_ALL, stderr); + retval = 1; + goto get_cgd_bailout; + } + if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + if (arglist & CAM_ARG_VERBOSE) + cam_error_print(device, ccb, CAM_ESF_ALL, + CAM_EPF_ALL, stderr); + retval = 1; + goto get_cgd_bailout; + } + bcopy(&ccb->cgd, cgd, sizeof(struct ccb_getdev)); + +get_cgd_bailout: cam_freeccb(ccb); - return(retval); } @@ -2673,6 +2757,9 @@ case PI_SOFT_RST: str = "soft reset alternative"; break; + case PI_SATAPM: + str = "SATA Port Multiplier"; + break; default: str = "unknown PI bit set"; break; @@ -2702,6 +2789,12 @@ str = "user has disabled initial BUS RESET or" " controller is in target/mixed mode"; break; + case PIM_NO_6_BYTE: + str = "do not send 6-byte commands"; + break; + case PIM_SEQSCAN: + str = "scan bus sequentially"; + break; default: str = "unknown PIM bit set"; break; ==== //depot/projects/hammer/share/man/man4/ahci.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.2 2009/07/25 18:19:31 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.3 2009/08/30 15:20:13 mav Exp $ .\" -.Dd June 26, 2009 +.Dd August 24, 2009 .Dt AHCI 4 .Os .Sh NAME @@ -60,6 +60,13 @@ .It 2 multiple MSI vectors used, if supported; .El +.It Va hint.ahci.X.ccc +controls Command Completion Coalescing (CCC) usage by the specified controller. +Non-zero value enables CCC and defines maximum time (in ms), request can wait +for interrupt, if there are some more requests present on controller queue. +CCC reduces number of context switches on systems with many parallel requests, +but it can decrease disk performance on some workloads due to additional +command latency. .It Va hint.ahcich.X.pm_level controls SATA interface Power Management for specified channel, allowing some power to be saved at the cost of additional command @@ -74,7 +81,15 @@ host initiates PARTIAL PM state transition every time port becomes idle; .It 3 host initiates SLUMBER PM state transition every time port becomes idle. +.It 4 +driver initiates PARTIAL PM state transition 1ms after port becomes idle; +.It 5 +driver initiates SLUMBER PM state transition 125ms after port becomes idle. .El +Some controllers, such as ICH8, do not implement modes 2 and 3 with NCQ used. +Because of artificial entering latency, performance degradation in modes +4 and 5 is much smaller then in modes 2 and 3. +.Pp Note that interface Power Management is not compatible with device presence detection. You will have to reset bus manually on device hot-plug. ==== //depot/projects/hammer/share/man/man4/ip6.4#8 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.23 2008/02/22 21:02:36 bms Exp $ +.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.24 2009/08/30 14:45:09 motoyuki Exp $ .\" .Dd February 21, 2008 .Dt IP6 4 @@ -692,7 +692,7 @@ Most of the socket options are defined in RFC 2292 or RFC 2553. The .Dv IPV6_V6ONLY -socket option is defined in RFC 3542. +socket option is defined in RFC 3493 Section 5.3. The .Dv IPV6_PORTRANGE socket option and the conflict resolution rule are not defined in the ==== //depot/projects/hammer/share/man/man4/ips.4#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ips.4,v 1.7 2006/11/05 08:55:21 maxim Exp $ +.\" $FreeBSD: src/share/man/man4/ips.4,v 1.8 2009/08/31 16:20:06 trasz Exp $ .\" .Dd November 4, 2006 .Dt IPS 4 @@ -92,6 +92,10 @@ .It ServeRAID 7t/7k/7M .El +.Pp +Newer ServeRAID controllers are supported by the +.Xr aac 4 +driver. .Sh DIAGNOSTICS Several error codes may be shown when the card initializes the .Tn IBM @@ -180,6 +184,7 @@ .Tn SCSI subsystem. .Sh SEE ALSO +.Xr aac 4 , .Xr ch 4 , .Xr da 4 , .Xr sysctl 8 ==== //depot/projects/hammer/share/man/man4/mfi.4#7 (text) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.8 2009/08/15 11:47:05 trasz Exp $ +.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.9 2009/08/31 16:19:06 trasz Exp $ .\" .Dd August 15, 2009 .Dt MFI 4 @@ -102,9 +102,9 @@ An attempt was made to remove a mounted volume. .El .Sh SEE ALSO -.Xr mfiutil 1 , .Xr amr 4 , -.Xr pci 4 +.Xr pci 4 , +.Xr mfiutil 8 .Sh HISTORY The .Nm ==== //depot/projects/hammer/share/timedef/ja_JP.UTF-8.src#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.3 2007/12/30 03:08:52 ache Exp $ +# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.4 2009/08/30 10:47:00 ume Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too @@ -68,13 +68,11 @@ # # am # -#午前 -AM +午前 # # pm # -#午後 -PM +午後 # # date_fmt # ==== //depot/projects/hammer/share/zoneinfo/africa#14 (text+ko) ==== @@ -1,5 +1,5 @@ # 
-# @(#)africa	8.21
+# @(#)africa	8.23
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -276,8 +276,27 @@
 # In 2009 (and for the next several years), Ramadan ends before the fourth
 # Thursday in September; Egypt is expected to revert to the last Thursday
 # in September.
+
+# From Steffen Thorsen (2009-08-11):
+# We have been able to confirm the August change with the Egyptian Cabinet 
+# Information and Decision Support Center:
+# 
+# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
+# 
+# 
+# The Middle East News Agency
+# 
+# http://www.mena.org.eg/index.aspx
+# 
+# also reports "Egypt starts winter time on August 21"
+# today in article numbered "71, 11/08/2009 12:25 GMT." 
+# Only the title above is available without a subscription to their service,
+# and can be found by searching for "winter" in their search engine
+# (at least today).
+
 Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2009	only	-	Aug	20	23:00s	0	-
+Rule	Egypt	2010	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
@@ -502,11 +521,33 @@
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
 # 
 
+# From Steffen Thorsen (2009-06-05):
+# According to several sources, Mauritius will not continue to observe
+# DST the coming summer...
+#
+# Some sources, in French:
+# 
+# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
+# 
+# 
+# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
+# 
+#
+# Our wrap-up:
+# 
+# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+# 
+
+# From Arthur David Olson (2009-07-11):
+# The "mauritius-dst-will-not-repeat" wrapup includes this: 
+# "The trial ended on March 29, 2009, when the clocks moved back by one hour
+# at 2am (or 02:00) local time..."
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
 Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	max	-	Oct	lastSun	2:00s	1:00	S
-Rule Mauritius	2009	max	-	Mar	lastSun	2:00s	0	-
+Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
+Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
 			4:00 Mauritius	MU%sT	# Mauritius Time

==== //depot/projects/hammer/share/zoneinfo/asia#22 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)asia	8.35
+# @(#)asia	8.36
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -172,6 +172,12 @@
 #
 # No DST end date has been announced yet.
 
+# From Arthur David Olson (2009-07-11):
+# Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time zone string
+# can appear in the Dhaka binary file and for the benefit of old glibc
+# reimplementations of the time zone software that mishandle permanent DST.
+# A change will be required once the end date is known.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dhaka	6:01:40 -	LMT	1890
 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
@@ -180,7 +186,8 @@
 			6:30	-	BURT	1951 Sep 30
 			6:00	-	DACT	1971 Mar 26 # Dacca Time
 			6:00	-	BDT	2009 Jun 19 23:00 # Bangladesh Time
-			6:00	1:00	BDST
+			6:00	1:00	BDST	2010
+			6:00	-	BDT
 
 # Bhutan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

==== //depot/projects/hammer/share/zoneinfo/australasia#13 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)australasia	8.11
+# @(#)australasia	8.12
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -427,6 +427,22 @@
 			-11:00	-	SST			# S=Samoa
 
 # Samoa
+
+# From Alexander Krivenyshev (2008-12-06):
+# The Samoa government (Western Samoa) may implement DST on the first Sunday of 
+# October 2009 (October 4, 2009) until the last Sunday of March 2010 (March 28, 
+# 2010). 
+# 
+# "Selected Committee reports to Cabinet on Daylight Saving Time",
+# Government of Samoa:
+# 
+# http://www.govt.ws/pr_article.cfm?pr_id=560
+# 
+# or
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_samoa01.html
+# 
+
 Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:26:56 -	LMT	1911
 			-11:30	-	SAMT	1950		# Samoa Time

==== //depot/projects/hammer/share/zoneinfo/europe#17 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)europe	8.21
+# @(#)europe	8.22
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -459,7 +459,7 @@
 Rule	EU	1981	max	-	Mar	lastSun	 1:00u	1:00	S
 Rule	EU	1996	max	-	Oct	lastSun	 1:00u	0	-
 # The most recent directive covers the years starting in 2002.  See:
-# 
+# 
 # Directive 2000/84/EC of the European Parliament and of the Council
 # of 19 January 2001 on summer-time arrangements.
 # 

==== //depot/projects/hammer/share/zoneinfo/leapseconds#18 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)leapseconds	8.8
+# @(#)leapseconds	8.9
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -58,29 +58,30 @@
 # 61, Av. de l'Observatoire 75014 PARIS (France)
 # Tel.      : 33 (0) 1 40 51 22 26
 # FAX       : 33 (0) 1 40 51 22 91
-# e-mail    : services.iers@obspm.fr
-# http://hpiers.obspm.fr/eop-pc
+# Internet  : services.iers@obspm.fr
 #
-# Paris, 15 January 2009
+# Paris, 4 July 2009
 #
-# Bulletin C 37
+# Bulletin C 38
 #
 # To authorities responsible
 # for the measurement and
 # distribution of time
 #
-# NO positive leap second will be introduced at the end of June 2009.
-# The difference between Coordinated Universal Time UTC and the 
-# International Atomic Time TAI is :             
-#                
-#     from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+# INFORMATION ON UTC - TAI
+#
+# NO positive leap second will be introduced at the end of December 2009.
+# The difference between Coordinated Universal Time UTC and the

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 08:23:18 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9240010656A4; Tue,  1 Sep 2009 08:23:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 564F71065697
	for ; Tue,  1 Sep 2009 08:23:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 44EA28FC24
	for ; Tue,  1 Sep 2009 08:23:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n818NGbh036353
	for ; Tue, 1 Sep 2009 08:23:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n818NG2b036351
	for perforce@freebsd.org; Tue, 1 Sep 2009 08:23:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 1 Sep 2009 08:23:16 GMT
Message-Id: <200909010823.n818NG2b036351@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168039 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, 01 Sep 2009 08:23:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=168039

Change 168039 by hselasky@hselasky_laptop001 on 2009/09/01 08:23:04

	
	USB storage:
	 - quirk from Tobias Grosser for Western Mypassword.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#76 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#30 (text+ko) ====

@@ -949,6 +949,10 @@
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		NO_INQUIRY_EVPD
 	},
+	{USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_MYPASSWORD, RID_WILDCARD,
+		UMASS_PROTO_DEFAULT,
+		FORCE_SHORT_INQUIRY
+	},
 	{USB_VENDOR_WINMAXGROUP, USB_PRODUCT_WINMAXGROUP_FLASH64MC, RID_WILDCARD,
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		NO_INQUIRY

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#76 (text+ko) ====

@@ -2504,6 +2504,7 @@
 product WESTERN EXTHDD		0x0400	External HDD
 product WESTERN HUB		0x0500	USB HUB
 product WESTERN MYBOOK		0x0901	MyBook External HDD
+product WESTERN MYPASSWORD	0x0704	MyPassword External HDD
 
 /* Windbond Electronics */
 product WINBOND UH104		0x5518	4-port USB Hub

From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 12:07:22 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D8DBF1065693; Tue,  1 Sep 2009 12:07:21 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9CF8A106568D
	for ; Tue,  1 Sep 2009 12:07:21 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8AB728FC22
	for ; Tue,  1 Sep 2009 12:07:21 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n81C7L7E066981
	for ; Tue, 1 Sep 2009 12:07:21 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n81C7LB0066979
	for perforce@freebsd.org; Tue, 1 Sep 2009 12:07:21 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 1 Sep 2009 12:07:21 GMT
Message-Id: <200909011207.n81C7LB0066979@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168042 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, 01 Sep 2009 12:07:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=168042

Change 168042 by anchie@anchie_malimis on 2009/09/01 12:06:30

	Removed printfs used for debugging.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#19 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#23 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#18 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#10 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#29 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#19 (text+ko) ====

@@ -523,22 +523,18 @@
 		struct rtentry *saved_nrt;
 
 	case RTM_SND:
-		printf("RTM_SND!\n");
-
 		switch (rtm->rtm_seq) {
 			struct mbuf *n;
 
 		case RTM_SND_IN: 
 			ifp = ifnet_byindex(rtm->rtm_index);
-			if (!ifp) {
-				printf("%s: RTM_SND_IN ifp == NULL", __func__);
+			if (!ifp)
 				senderr(EINVAL);
-			}
-			if ((n = m_dup(m, M_DONTWAIT)) == NULL) {
-				printf("%s: RTM_SND_IN n == NULL", __func__);
+
+			if ((n = m_dup(m, M_DONTWAIT)) == NULL)
 				senderr(ENOBUFS);
-			}
 			m_adj(n, sizeof(struct rt_msghdr));
+
 			printf("%s: RTM_SND_IN ifp=%p(%s), mbuf=%p\n",
 			    __func__, ifp, ifp->if_xname, n);
 			error = send_output_hook(n, ifp, SND_IN);
@@ -547,15 +543,13 @@
 			goto flush;
 		case RTM_SND_OUT:
 			ifp = ifnet_byindex(rtm->rtm_index);
-			if (!ifp) {
-				printf("%s: RTM_SND_OUT ifp == NULL", __func__);
+			if (!ifp)
 				senderr(EINVAL);
-			}
-			if ((n = m_dup(m, M_DONTWAIT)) == NULL) {
-				printf("%s: RTM_SND_OUT n == NULL", __func__);
+
+			if ((n = m_dup(m, M_DONTWAIT)) == NULL)
 				senderr(ENOBUFS);
-			}
 			m_adj(n, sizeof(struct rt_msghdr));
+
 			printf("%s: RTM_SND_OUT ifp=%p(%s), mbuf=%p\n",
 			    __func__, ifp, ifp->if_xname, n);
 			error = send_output_hook(n, ifp, SND_OUT);
@@ -952,7 +946,6 @@
 	if (m && len > MHLEN) {
 		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
-			printf("rtsock.c: rt_msg1(), m_free 1\n");
 			m_free(m);
 			m = NULL;
 		}
@@ -972,7 +965,6 @@
 		len += dlen;
 	}
 	if (m->m_pkthdr.len != len) {
-		printf("rtsock.c: rt_msg1(), m_free 2");
 		m_freem(m);
 		return (NULL);
 	}
@@ -1218,22 +1210,18 @@
 	struct if_announcemsghdr *ifan;
 	struct mbuf *m;
 
-	printf("rtsock.c: rt_makeifannouncemsg()\n");
-
 	if (route_cb.any_count == 0)
 		return NULL;
 	bzero((caddr_t)info, sizeof(*info));
-	printf("rtsock.c: rt_makeifannouncemsg(), prije rt_msg1()\n");
 	m = rt_msg1(type, info);
-	printf("rtsock.c: rt_makeifannouncemsg(), nakon rt_msg1()\n");
 	if (m != NULL) {
 		ifan = mtod(m, struct if_announcemsghdr *);
 		ifan->ifan_index = ifp->if_index;
 		strlcpy(ifan->ifan_name, ifp->if_xname,
 			sizeof(ifan->ifan_name));
 		ifan->ifan_what = what;
-	} else
-		printf("rtsock.c: rt_makeifannouncemsg(), m == NULL!\n");
+	}
+
 	return m;
 }
 
@@ -1248,8 +1236,6 @@
 
 	switch (direction) {
 	case SND_IN:
-		printf("rtsock.c: rt_securendmsg(), SND_IN\n");
-
 		/* Incoming traffic sent to userspace for SeND validation. */
 		m = rt_makeifannouncemsg(ifp, RTM_SND, RTM_SND_IN, &info);
 		break;
@@ -1259,15 +1245,12 @@
 		break;
 	}
 
-	printf("rtsock.c: rt_securendmsg(), after rt_makeifannouncemsg\n");
 	rt_msg3(m, data, data_len);
-	printf("rtsock.c: rt_securendmsg(), after rt_msg3\n");
 }
 
 void
 rt_msg3(struct mbuf *m, void *data, size_t data_len)
 {
-	printf("rtsock.c: rt_msg3()\n");
 
 	if (m != NULL) {
 		/*
@@ -1283,30 +1266,21 @@
 		if (data_len > M_TRAILINGSPACE(m)) {
 			struct mbuf *n = m_get(M_NOWAIT, MT_DATA);
 			if (n == NULL) {
-				printf("rtsock.c: rt_msg3(), m_freem!\n");
 				m_freem(m);
 				return;
 			}
-			printf("rtsock.c: rt_msg3(), prije bcopy!\n");
 			bcopy(data, mtod(n, void *), data_len);
 			printf("rtsock.c: rt_msg3(), nakon bcopy!\n");
 			n->m_len = data_len;
-			printf("Nakon n->m_len = data_len = %zu;\n", data_len);
 			m->m_next = n;
-			printf("Nakon m->m_next = n;\n");
 		} else if (data_len > 0) {
-			printf("rtsock.c: rt_msg3(), prije bcopy 2!\n");
-			printf("data_len = %zu\n", data_len);
 			bcopy(data, mtod(m, u_int8_t *) + m->m_len, data_len);
-			printf("rtsock.c: rt_msg3(), nakon bcopy 2!\n");
 			m->m_len += data_len;
 		}
 		if (m->m_flags & M_PKTHDR)
 			m->m_pkthdr.len += data_len;
 #endif
-		printf("prije mtod!\n");
 		mtod(m, struct if_announcemsghdr *)->ifan_msglen += data_len;
-		printf("prije rt_dispatch\n");
 		rt_dispatch(m, NULL);
 	}
 }

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#23 (text+ko) ====

@@ -824,9 +824,6 @@
 		break;
 
 	case ND_NEIGHBOR_SOLICIT:
-		printf("icmp6.c: ND_NEIGHBOR_SOLICIT!\n");
-		printf("icmp6.c: ip6len = %d\n", ip6len);
-		printf("icmp6.c: icmp6len = %d\n", icmp6len);
 		icmp6_ifstat_inc(ifp, ifs6_in_neighborsolicit);
 		if (code != 0)
 			goto badcode;
@@ -2146,8 +2143,6 @@
 	struct ifnet *outif = NULL;
 	struct in6_addr origdst, src, *srcp = NULL;
 
-	printf("%s %d\n", __FUNCTION__, __LINE__);
-
 	/* too short to reflect */
 	if (off < sizeof(struct ip6_hdr)) {
 		nd6log((LOG_DEBUG,
@@ -2552,8 +2547,6 @@
 	struct ifnet *outif = NULL;
 	struct sockaddr_in6 src_sa;
 
-	printf("%s %d\n", __FUNCTION__, __LINE__);
-
 	icmp6_errcount(&V_icmp6stat.icp6s_outerrhist, ND_REDIRECT, 0);
 
 	/* if we are not router, we don't send icmp6 redirect */

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#18 (text+ko) ====

@@ -1691,7 +1691,6 @@
     struct sockaddr_in6 *dst, struct rtentry *rt0)
 {
 
-	printf("%s %d\n", __FUNCTION__, __LINE__);
 	return (nd6_output_lle(ifp, origifp, m0, dst, rt0, NULL, NULL));
 }
 
@@ -1720,8 +1719,6 @@
 	int ip6len, skip = 0;
 	unsigned short *nd_type;
 
-	printf("%s %d\n", __FUNCTION__, __LINE__);
-
 	ip6 = mtod(m, struct ip6_hdr *);
 	ip6len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen);	
 
@@ -1905,7 +1902,6 @@
 		mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL);
 		if (mtag != NULL) {
 			skip = 1;
-			printf("%s: ND_OUTGOING tag found.\n", __FUNCTION__);
 			nd_type = (unsigned short *)(mtag + 1);
 			send_input_hook(m, ifp, SND_OUT, ip6len);
 		} else
@@ -1953,7 +1949,6 @@
 		    NULL));
 	}
 	error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, NULL);
-	printf("%s %d: nakon if_output()\n", __FUNCTION__, __LINE__);
 
 	return (error);
 
@@ -2052,8 +2047,6 @@
 {
 	struct llentry *ln;
 
-	printf("nd6_storelladdr\n");
-
 	*lle = NULL;
 	IF_AFDATA_UNLOCK_ASSERT(ifp);
 	if (m->m_flags & M_MCAST) {
@@ -2070,7 +2063,6 @@
 #endif
 		case IFT_BRIDGE:
 		case IFT_ISO88025:
-			printf("nd6_storelladdr, IFT_ETHER\n");
 			ETHER_MAP_IPV6_MULTICAST(&SIN6(dst)->sin6_addr,
 						 desten);
 			return (0);
@@ -2095,23 +2087,15 @@
 	/*
 	 * the entry should have been created in nd6_store_lladdr
 	 */
-	{
-	char ip6buf[INET6_ADDRSTRLEN];
-
-	printf("XXX-BZ, nd6_storelladdr: ifp=%p, xname=%s, dst=%s\n", ifp, ifp->if_xname, ip6_sprintf(ip6buf, &((struct sockaddr_in6 *)dst)->sin6_addr));
-	}
-
 	IF_AFDATA_LOCK(ifp);
 	ln = lla_lookup(LLTABLE6(ifp), 0, dst);
 	IF_AFDATA_UNLOCK(ifp);
 	/* ToFix: ln == NULL! lla_lookup -> generic link layer lookup func. */
 	if ((ln == NULL) || !(ln->la_flags & LLE_VALID)) {
-		printf("ln == NULL etc...\n");
 		if (ln != NULL) {
 			LLE_RUNLOCK(ln);
 		}
 		/* this could happen, if we could not allocate memory */
-		printf("nd6_storelladdr: could not allocate memory.\n");
 		m_freem(m);
 		return (1);
 	}

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#10 (text+ko) ====

@@ -401,8 +401,6 @@
 
 	bzero(&ro, sizeof(ro));
 
-	printf("%s %d\n", __FUNCTION__, __LINE__);
-
 	if (IN6_IS_ADDR_MULTICAST(taddr6))
 		return;
 
@@ -575,8 +573,6 @@
 			M_NOWAIT);
 		if (mtag == NULL)
 			goto bad;
-		else
-			printf("%s: PACKET_TAG_ND_OUTGOING added.\n", __FUNCTION__);
 		*(unsigned short *)(mtag + 1) = nd_ns->nd_ns_type;
 		m_tag_prepend(m, mtag); 
 	}
@@ -963,8 +959,6 @@
 
 	bzero(&ro, sizeof(ro));
 
-	printf("%s %d\n", __FUNCTION__, __LINE__);
-
 	daddr6 = *daddr6_0;	/* make a local copy for modification */
 
 	/* estimate the size of message */

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#29 (text+ko) ====

@@ -33,8 +33,6 @@
 	int icmp6len; 
 	int offp;
 
-	printf("send.c: send_output()\n");
-
 	/* 
 	 * Receive incoming (SEND-protected) or outgoing traffic  
 	 * (SEND-validated) from the SEND user space application.
@@ -90,7 +88,6 @@
 			nd6_ra_input(m, sizeof(struct ip6_hdr), icmp6len);
 			break;
 		default:
-			/* XXX-BZ TODO */
 			printf("%s:%d: icmp6_code=%u\n",
 			    __func__, __LINE__, icmp6->icmp6_code);
 			m_print(m, m->m_pkthdr.len);
@@ -116,11 +113,6 @@
 		if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst))
 			m->m_flags |= M_MCAST;
 
-                {
-			char ip6buf[INET6_ADDRSTRLEN];
-			printf("XXX-AK %s: ifp=%p, xname=%s, ip6->ip6_dst=%s\n", __func__, ifp, ifp->if_xname, ip6_sprintf(ip6buf, &ip6->ip6_dst));
-                }
-
 		bzero(&dst, sizeof(dst));
         	dst.sin6_family = AF_INET6;
         	dst.sin6_len = sizeof(dst);

From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 12:20:36 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 92EBB1065695; Tue,  1 Sep 2009 12:20:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 578861065692
	for ; Tue,  1 Sep 2009 12:20:36 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 463A38FC1B
	for ; Tue,  1 Sep 2009 12:20:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n81CKaOQ067998
	for ; Tue, 1 Sep 2009 12:20:36 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n81CKa77067996
	for perforce@freebsd.org; Tue, 1 Sep 2009 12:20:36 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 1 Sep 2009 12:20:36 GMT
Message-Id: <200909011220.n81CKa77067996@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168044 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, 01 Sep 2009 12:20:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=168044

Change 168044 by anchie@anchie_malimis on 2009/09/01 12:19:58

	Copyright and license added to netinet6/send.[ch] files.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#30 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#16 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#30 (text+ko) ====

@@ -1,4 +1,28 @@
-/* send module */
+/*-
+ * Copyright (c) 2009 Ana Kukec  
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ */
 
 #include 
 #include 
@@ -76,11 +100,6 @@
 		case ND_REDIRECT:
 			icmp6_redirect_input(m, sizeof(struct ip6_hdr));
 			break;
-		/* 
-		 * ToDo: Implement functions the outgoing SeND RA/RS packets. 
-		 * Processing routines for outgoing RA/RS packets are implemented
-		 * in rtadvd/rtsol.
-		 */
 		case ND_ROUTER_SOLICIT:
 			nd6_rs_input(m, sizeof(struct ip6_hdr), icmp6len);
 			break;

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#16 (text+ko) ====

@@ -1,10 +1,27 @@
-/* send.c */
-extern int	(*send_input_hook)(struct mbuf *, struct ifnet *, int, int);
-extern int	(*send_output_hook)(struct mbuf *, struct ifnet *, int);
-
-/* Message formats for messages from ND to applications (i.e. sendd) via the 
- * routing socket. These messages are appended to an if_announcemsghdr 
- * structure.
+/*-
+ * Copyright (c) 2009 Ana Kukec  
+ * All rights reserved. 
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
  */
 
 #define	SND_OUT		0	/* Outgoing traffic */ 
@@ -12,3 +29,7 @@
 
 #define RTM_SND_OUT	0	/* Outgoing RTM SeND packet sent to user space */
 #define RTM_SND_IN	1	/* Incoming RTM SeND packet sent to user space */
+
+extern int      (*send_input_hook)(struct mbuf *, struct ifnet *, int, int);
+extern int      (*send_output_hook)(struct mbuf *, struct ifnet *, int);
+

From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 16:12:51 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1195F1065698; Tue,  1 Sep 2009 16:12:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C40C11065696
	for ; Tue,  1 Sep 2009 16:12:50 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B16768FC14
	for ; Tue,  1 Sep 2009 16:12:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n81GCo6R099125
	for ; Tue, 1 Sep 2009 16:12:50 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n81GCoQU099123
	for perforce@freebsd.org; Tue, 1 Sep 2009 16:12:50 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 1 Sep 2009 16:12:50 GMT
Message-Id: <200909011612.n81GCoQU099123@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168051 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, 01 Sep 2009 16:12:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=168051

Change 168051 by trasz@trasz_anger on 2009/09/01 16:12:07

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/ls/print.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ahci.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ip6.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ips.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mfi.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/make.conf.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/ja_JP.UTF-8.src#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/vm_machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_xpt.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ia32/ia32_sysvec.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkfront/blkfront.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/elf_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pmap.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/vesa.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/locore.s#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thread.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/imgact_elf.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_extern.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_glue.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/extern.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/pr_time.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/w.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#8 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#7 (text+ko) ====

@@ -39,7 +39,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.35 2009/07/01 15:52:19 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.36 2009/08/31 20:42:07 trasz Exp $");
 
 #include 
 #include 
@@ -249,4 +249,3 @@
 
 	return (supports_acls);
 }
-

==== //depot/projects/soc2008/trasz_nfs4acl/bin/ls/print.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.79 2009/08/31 20:53:01 trasz Exp $");
 
 #include 
 #include 
@@ -659,6 +659,7 @@
 		return;
 	}
 	if (acl_is_trivial_np(facl, &trivial)) {
+		acl_free(facl);
 		warn("%s", name);
 		return;
 	}

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.60 2009/07/10 17:42:53 scottl Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.62 2009/08/30 16:31:25 mav Exp $");
 
 #include 
 #include 
@@ -206,6 +206,7 @@
 		      struct ccb_trans_settings *cts);
 static void cpi_print(struct ccb_pathinq *cpi);
 static int get_cpi(struct cam_device *device, struct ccb_pathinq *cpi);
+static int get_cgd(struct cam_device *device, struct ccb_getdev *cgd);
 static int get_print_cts(struct cam_device *device, int user_settings,
 			 int quiet, struct ccb_trans_settings *cts);
 static int ratecontrol(struct cam_device *device, int retry_count,
@@ -1015,17 +1016,18 @@
 				((u_int64_t)parm->lba_size48_4 << 48);
 
 	printf("\n");
-	printf("Protocol              ");
+	printf("protocol              ");
+	printf("ATA/ATAPI-%d", ata_version(parm->version_major));
 	if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
 		if (parm->satacapabilities & ATA_SATA_GEN2)
-			printf("SATA revision 2.x\n");
+			printf(" SATA 2.x\n");
 		else if (parm->satacapabilities & ATA_SATA_GEN1)
-			printf("SATA revision 1.x\n");
+			printf(" SATA 1.x\n");
 		else
-			printf("Unknown SATA revision\n");
+			printf(" SATA x.x\n");
 	}
 	else
-		printf("ATA/ATAPI revision %d\n", ata_version(parm->version_major));
+		printf("\n");
 	printf("device model          %.40s\n", parm->model);
 	printf("serial number         %.20s\n", parm->serial);
 	printf("firmware revision     %.8s\n", parm->revision);
@@ -1038,22 +1040,74 @@
 	    (parm->support.command2 & ATA_SUPPORT_CFA))
 		printf("CFA supported\n");
 
-	printf("lba%ssupported         ",
+	printf("LBA%ssupported         ",
 		parm->capabilities1 & ATA_SUPPORT_LBA ? " " : " not ");
 	if (lbasize)
 		printf("%d sectors\n", lbasize);
 	else
 		printf("\n");
 
-	printf("lba48%ssupported       ",
+	printf("LBA48%ssupported       ",
 		parm->support.command2 & ATA_SUPPORT_ADDRESS48 ? " " : " not ");
 	if (lbasize48)
 		printf("%ju sectors\n", (uintmax_t)lbasize48);
 	else
 		printf("\n");
 
-	printf("dma%ssupported\n",
+	printf("PIO supported         PIO");
+	if (parm->atavalid & ATA_FLAG_64_70) {
+		if (parm->apiomodes & 0x02)
+			printf("4");
+		else if (parm->apiomodes & 0x01)
+			printf("3");
+	} else if (parm->mwdmamodes & 0x04)
+		printf("4");
+	else if (parm->mwdmamodes & 0x02)
+		printf("3");
+	else if (parm->mwdmamodes & 0x01)
+		printf("2");
+	else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x200)
+		printf("2");
+	else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x100)
+		printf("1");
+	else
+		printf("0");
+	printf("\n");
+
+	printf("DMA%ssupported         ",
 		parm->capabilities1 & ATA_SUPPORT_DMA ? " " : " not ");
+	if (parm->capabilities1 & ATA_SUPPORT_DMA) {
+		if (parm->mwdmamodes & 0xff) {
+			printf("WDMA");
+			if (parm->mwdmamodes & 0x04)
+				printf("2");
+			else if (parm->mwdmamodes & 0x02)
+				printf("1");
+			else if (parm->mwdmamodes & 0x01)
+				printf("0");
+			printf(" ");
+		}
+		if ((parm->atavalid & ATA_FLAG_88) &&
+		    (parm->udmamodes & 0xff)) {
+			printf("UDMA");
+			if (parm->udmamodes & 0x40)
+				printf("6");
+			else if (parm->udmamodes & 0x20)
+				printf("5");
+			else if (parm->udmamodes & 0x10)
+				printf("4");
+			else if (parm->udmamodes & 0x08)
+				printf("3");
+			else if (parm->udmamodes & 0x04)
+				printf("2");
+			else if (parm->udmamodes & 0x02)
+				printf("1");
+			else if (parm->udmamodes & 0x01)
+				printf("0");
+			printf(" ");
+		}
+	}
+	printf("\n");
 
 	printf("overlap%ssupported\n",
 		parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not ");
@@ -1070,10 +1124,10 @@
 		parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no");
 
 	if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
-		printf("Native Command Queuing (NCQ)   %s	%s"
+		printf("Native Command Queuing (NCQ)   %s	"
 			"	%d/0x%02X\n",
 			parm->satacapabilities & ATA_SUPPORT_NCQ ?
-				"yes" : "no", " -",
+				"yes" : "no",
 			(parm->satacapabilities & ATA_SUPPORT_NCQ) ?
 				ATA_QUEUE_LEN(parm->queue) : 0,
 			(parm->satacapabilities & ATA_SUPPORT_NCQ) ?
@@ -1121,9 +1175,14 @@
 {
 	union ccb *ccb;
 	struct ata_params *ident_buf;
+	struct ccb_getdev cgd;
 	u_int i, error = 0;
 	int16_t *ptr;
-	
+
+	if (get_cgd(device, &cgd) != 0) {
+		warnx("couldn't get CGD");
+		return(1);
+	}
 	ccb = cam_getccb(device);
 
 	if (ccb == NULL) {
@@ -1152,10 +1211,10 @@
 		      /*data_ptr*/(u_int8_t *)ptr,
 		      /*dxfer_len*/sizeof(struct ata_params),
 		      timeout ? timeout : 30 * 1000);
-//	if (periph->path->device->protocol == PROTO_ATA)
-		ata_36bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
-//	else
-//		ata_36bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
+	if (cgd.protocol == PROTO_ATA)
+		ata_28bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
+	else
+		ata_28bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
 
 	/* Disable freezing the device queue */
 	ccb->ccb_h.flags |= CAM_DEV_QFRZDIS;
@@ -2588,46 +2647,71 @@
 	int retval = 0;
 
 	ccb = cam_getccb(device);
-
 	if (ccb == NULL) {
 		warnx("get_cpi: couldn't allocate CCB");
 		return(1);
 	}
-
 	bzero(&(&ccb->ccb_h)[1],
 	      sizeof(struct ccb_pathinq) - sizeof(struct ccb_hdr));
-
 	ccb->ccb_h.func_code = XPT_PATH_INQ;
-
 	if (cam_send_ccb(device, ccb) < 0) {
 		warn("get_cpi: error sending Path Inquiry CCB");
-
 		if (arglist & CAM_ARG_VERBOSE)
 			cam_error_print(device, ccb, CAM_ESF_ALL,
 					CAM_EPF_ALL, stderr);
-
 		retval = 1;
-
 		goto get_cpi_bailout;
 	}
-
 	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-
 		if (arglist & CAM_ARG_VERBOSE)
 			cam_error_print(device, ccb, CAM_ESF_ALL,
 					CAM_EPF_ALL, stderr);
-
 		retval = 1;
-
 		goto get_cpi_bailout;
 	}
-
 	bcopy(&ccb->cpi, cpi, sizeof(struct ccb_pathinq));
 
 get_cpi_bailout:
+	cam_freeccb(ccb);
+	return(retval);
+}
 
+/*
+ * Get a get device CCB for the specified device.  
+ */
+static int
+get_cgd(struct cam_device *device, struct ccb_getdev *cgd)
+{
+	union ccb *ccb;
+	int retval = 0;
+
+	ccb = cam_getccb(device);
+	if (ccb == NULL) {
+		warnx("get_cgd: couldn't allocate CCB");
+		return(1);
+	}
+	bzero(&(&ccb->ccb_h)[1],
+	      sizeof(struct ccb_pathinq) - sizeof(struct ccb_hdr));
+	ccb->ccb_h.func_code = XPT_GDEV_TYPE;
+	if (cam_send_ccb(device, ccb) < 0) {
+		warn("get_cgd: error sending Path Inquiry CCB");
+		if (arglist & CAM_ARG_VERBOSE)
+			cam_error_print(device, ccb, CAM_ESF_ALL,
+					CAM_EPF_ALL, stderr);
+		retval = 1;
+		goto get_cgd_bailout;
+	}
+	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+		if (arglist & CAM_ARG_VERBOSE)
+			cam_error_print(device, ccb, CAM_ESF_ALL,
+					CAM_EPF_ALL, stderr);
+		retval = 1;
+		goto get_cgd_bailout;
+	}
+	bcopy(&ccb->cgd, cgd, sizeof(struct ccb_getdev));
+
+get_cgd_bailout:
 	cam_freeccb(ccb);
-
 	return(retval);
 }
 
@@ -2673,6 +2757,9 @@
 		case PI_SOFT_RST:
 			str = "soft reset alternative";
 			break;
+		case PI_SATAPM:
+			str = "SATA Port Multiplier";
+			break;
 		default:
 			str = "unknown PI bit set";
 			break;
@@ -2702,6 +2789,12 @@
 			str = "user has disabled initial BUS RESET or"
 			      " controller is in target/mixed mode";
 			break;
+		case PIM_NO_6_BYTE:
+			str = "do not send 6-byte commands";
+			break;
+		case PIM_SEQSCAN:
+			str = "scan bus sequentially";
+			break;
 		default:
 			str = "unknown PIM bit set";
 			break;

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ahci.4#3 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.2 2009/07/25 18:19:31 mav Exp $
+.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.3 2009/08/30 15:20:13 mav Exp $
 .\"
-.Dd June 26, 2009
+.Dd August 24, 2009
 .Dt AHCI 4
 .Os
 .Sh NAME
@@ -60,6 +60,13 @@
 .It 2
 multiple MSI vectors used, if supported;
 .El
+.It Va hint.ahci.X.ccc
+controls Command Completion Coalescing (CCC) usage by the specified controller.
+Non-zero value enables CCC and defines maximum time (in ms), request can wait
+for interrupt, if there are some more requests present on controller queue.
+CCC reduces number of context switches on systems with many parallel requests,
+but it can decrease disk performance on some workloads due to additional
+command latency.
 .It Va hint.ahcich.X.pm_level
 controls SATA interface Power Management for specified channel,
 allowing some power to be saved at the cost of additional command
@@ -74,7 +81,15 @@
 host initiates PARTIAL PM state transition every time port becomes idle;
 .It 3
 host initiates SLUMBER PM state transition every time port becomes idle.
+.It 4
+driver initiates PARTIAL PM state transition 1ms after port becomes idle;
+.It 5
+driver initiates SLUMBER PM state transition 125ms after port becomes idle.
 .El
+Some controllers, such as ICH8, do not implement modes 2 and 3 with NCQ used.
+Because of artificial entering latency, performance degradation in modes
+4 and 5 is much smaller then in modes 2 and 3.
+.Pp
 Note that interface Power Management is not compatible with
 device presence detection.
 You will have to reset bus manually on device hot-plug.

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ip6.4#2 (text+ko) ====

@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.23 2008/02/22 21:02:36 bms Exp $
+.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.24 2009/08/30 14:45:09 motoyuki Exp $
 .\"
 .Dd February 21, 2008
 .Dt IP6 4
@@ -692,7 +692,7 @@
 Most of the socket options are defined in RFC 2292 or RFC 2553.
 The
 .Dv IPV6_V6ONLY
-socket option is defined in RFC 3542.
+socket option is defined in RFC 3493 Section 5.3.
 The
 .Dv IPV6_PORTRANGE
 socket option and the conflict resolution rule are not defined in the

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ips.4#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ips.4,v 1.7 2006/11/05 08:55:21 maxim Exp $
+.\" $FreeBSD: src/share/man/man4/ips.4,v 1.8 2009/08/31 16:20:06 trasz Exp $
 .\"
 .Dd November 4, 2006
 .Dt IPS 4
@@ -92,6 +92,10 @@
 .It
 ServeRAID 7t/7k/7M
 .El
+.Pp
+Newer ServeRAID controllers are supported by the
+.Xr aac 4
+driver.
 .Sh DIAGNOSTICS
 Several error codes may be shown when the card initializes the
 .Tn IBM
@@ -180,6 +184,7 @@
 .Tn SCSI
 subsystem.
 .Sh SEE ALSO
+.Xr aac 4 ,
 .Xr ch 4 ,
 .Xr da 4 ,
 .Xr sysctl 8

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mfi.4#3 (text) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.8 2009/08/15 11:47:05 trasz Exp $
+.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.9 2009/08/31 16:19:06 trasz Exp $
 .\"
 .Dd August 15, 2009
 .Dt MFI 4
@@ -102,9 +102,9 @@
 An attempt was made to remove a mounted volume.
 .El
 .Sh SEE ALSO
-.Xr mfiutil 1 ,
 .Xr amr 4 ,
-.Xr pci 4
+.Xr pci 4 ,
+.Xr mfiutil 8
 .Sh HISTORY
 The
 .Nm

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/make.conf.5#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.140 2007/06/15 03:21:20 gshapiro Exp $
+.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.141 2009/09/01 05:55:10 maxim Exp $
 .\"
-.Dd September 5, 2006
+.Dd September 1, 2009
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -466,6 +466,12 @@
 and allow access over FireWire(IEEE1394) using
 .Xr dconschat 8 .
 Currently, only i386 and amd64 are supported.
+.It Va MALLOC_PRODUCTION
+.Pq Vt bool
+Set this to disable assertions and statistics gathering in
+.Xr malloc 3 .
+It also defaults the A and J runtime options to off.
+Disabled by default on -CURRENT.
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.

==== //depot/projects/soc2008/trasz_nfs4acl/share/timedef/ja_JP.UTF-8.src#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.3 2007/12/30 03:08:52 ache Exp $
+# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.4 2009/08/30 10:47:00 ume Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
@@ -68,13 +68,11 @@
 #
 # am
 #
-#午前
-AM
+午前
 #
 # pm
 #
-#午後
-PM
+午後
 #
 # date_fmt
 #

==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#7 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.31 2009/08/24 16:19:47 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.32 2009/08/30 14:38:17 bz Exp $");
 
 #include 
 #include 
@@ -118,7 +118,7 @@
 	.sysvec		= &elf64_freebsd_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &elf64_kfreebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY
 };
 
 SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY,

==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#21 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.669 2009/08/29 16:01:21 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.670 2009/08/31 18:41:13 jhb Exp $");
 
 /*
  *	Manages physical address maps.
@@ -4476,7 +4476,8 @@
 	if (base < DMAP_MIN_ADDRESS)
 		return (EINVAL);
 
-	cache_bits_pde = cache_bits_pte = -1;
+	cache_bits_pde = pmap_cache_bits(mode, 1);
+	cache_bits_pte = pmap_cache_bits(mode, 0);
 	changed = FALSE;
 
 	/*
@@ -4493,8 +4494,6 @@
 			 * memory type, then we need not demote this page. Just
 			 * increment tmpva to the next 1GB page frame.
 			 */
-			if (cache_bits_pde < 0)
-				cache_bits_pde = pmap_cache_bits(mode, 1);
 			if ((*pdpe & PG_PDE_CACHE) == cache_bits_pde) {
 				tmpva = trunc_1gpage(tmpva) + NBPDP;
 				continue;
@@ -4522,8 +4521,6 @@
 			 * memory type, then we need not demote this page. Just
 			 * increment tmpva to the next 2MB page frame.
 			 */
-			if (cache_bits_pde < 0)
-				cache_bits_pde = pmap_cache_bits(mode, 1);
 			if ((*pde & PG_PDE_CACHE) == cache_bits_pde) {
 				tmpva = trunc_2mpage(tmpva) + NBPDR;
 				continue;
@@ -4557,12 +4554,9 @@
 	for (tmpva = base; tmpva < base + size; ) {
 		pdpe = pmap_pdpe(kernel_pmap, tmpva);
 		if (*pdpe & PG_PS) {
-			if (cache_bits_pde < 0)
-				cache_bits_pde = pmap_cache_bits(mode, 1);
 			if ((*pdpe & PG_PDE_CACHE) != cache_bits_pde) {
 				pmap_pde_attr(pdpe, cache_bits_pde);
-				if (!changed)
-					changed = TRUE;
+				changed = TRUE;
 			}
 			if (tmpva >= VM_MIN_KERNEL_ADDRESS) {
 				if (pa_start == pa_end) {
@@ -4588,12 +4582,9 @@
 		}
 		pde = pmap_pdpe_to_pde(pdpe, tmpva);
 		if (*pde & PG_PS) {
-			if (cache_bits_pde < 0)
-				cache_bits_pde = pmap_cache_bits(mode, 1);
 			if ((*pde & PG_PDE_CACHE) != cache_bits_pde) {
 				pmap_pde_attr(pde, cache_bits_pde);
-				if (!changed)
-					changed = TRUE;
+				changed = TRUE;
 			}
 			if (tmpva >= VM_MIN_KERNEL_ADDRESS) {
 				if (pa_start == pa_end) {
@@ -4616,13 +4607,10 @@
 			}
 			tmpva = trunc_2mpage(tmpva) + NBPDR;
 		} else {
-			if (cache_bits_pte < 0)
-				cache_bits_pte = pmap_cache_bits(mode, 0);
 			pte = pmap_pde_to_pte(pde, tmpva);
 			if ((*pte & PG_PTE_CACHE) != cache_bits_pte) {
 				pmap_pte_attr(pte, cache_bits_pte);
-				if (!changed)
-					changed = TRUE;
+				changed = TRUE;
 			}
 			if (tmpva >= VM_MIN_KERNEL_ADDRESS) {
 				if (pa_start == pa_end) {

==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/vm_machdep.c#7 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.42 2009/08/29 21:53:08 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.43 2009/09/01 11:41:51 kib Exp $");
 
 #include 
 #include 
@@ -119,9 +119,6 @@
 #ifdef __XSCALE__
 #ifndef CPU_XSCALE_CORE3
 	pmap_use_minicache(td2->td_kstack, td2->td_kstack_pages * PAGE_SIZE);
-	if (td2->td_altkstack)
-		pmap_use_minicache(td2->td_altkstack, td2->td_altkstack_pages *
-		    PAGE_SIZE);
 #endif
 #endif
 	td2->td_pcb = pcb2;

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.1 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.2 2009/08/30 16:31:25 mav Exp $");
 
 #include 
 
@@ -91,7 +91,7 @@
 }
 
 void
-ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
+ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
     uint32_t lba, uint8_t sector_count)
 {
 	bzero(&ataio->cmd, sizeof(ataio->cmd));

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.1 2009/07/10 08:18:08 scottl Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $
  */
 
 #ifndef	CAM_ATA_ALL_H
@@ -83,7 +83,7 @@
 int	ata_version(int ver);
 void	ata_print_ident(struct ata_params *ident_data);
 
-void	ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
+void	ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
     uint32_t lba, uint8_t sector_count);
 void	ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features,
     uint64_t lba, uint16_t sector_count);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.2 2009/07/17 21:48:08 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.4 2009/08/30 16:31:25 mav Exp $");
 
 #include 
 
@@ -287,7 +287,7 @@
 		if (softc->flags & ADA_FLAG_CAN_48BIT)
 			ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0);
 		else
-			ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0);
+			ata_28bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0);
 		cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0,
 		    /*sense_flags*/SF_RETRY_UA,
 		    softc->disk->d_devstat);
@@ -411,7 +411,7 @@
 			ata_48bit_cmd(&ccb.ataio, ATA_WRITE_DMA48,
 			    0, lba, count);
 		} else {
-			ata_36bit_cmd(&ccb.ataio, ATA_WRITE_DMA,
+			ata_28bit_cmd(&ccb.ataio, ATA_WRITE_DMA,
 			    0, lba, count);
 		}
 		xpt_polled_action(&ccb);
@@ -441,7 +441,7 @@
 		if (softc->flags & ADA_FLAG_CAN_48BIT)
 			ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0);
 		else
-			ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
+			ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
 		xpt_polled_action(&ccb);
 
 		if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
@@ -856,10 +856,10 @@
 					}
 				} else {
 					if (bp->bio_cmd == BIO_READ) {
-						ata_36bit_cmd(ataio, ATA_READ_DMA,
+						ata_28bit_cmd(ataio, ATA_READ_DMA,
 						    0, lba, count);
 					} else {
-						ata_36bit_cmd(ataio, ATA_WRITE_DMA,
+						ata_28bit_cmd(ataio, ATA_WRITE_DMA,
 						    0, lba, count);
 					}
 				}
@@ -878,7 +878,7 @@
 				if (softc->flags & ADA_FLAG_CAN_48BIT)
 					ata_48bit_cmd(ataio, ATA_FLUSHCACHE48, 0, 0, 0);
 				else
-					ata_48bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0);
+					ata_28bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0);
 				break;
 			}
 			start_ccb->ccb_h.ccb_state = ADA_CCB_BUFFER_IO;
@@ -1126,7 +1126,7 @@
 		if (softc->flags & ADA_FLAG_CAN_48BIT)
 			ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0);
 		else
-			ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
+			ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
 		xpt_polled_action(&ccb);
 
 		if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_xpt.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.4 2009/08/18 09:27:17 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.5 2009/08/30 16:31:25 mav Exp $");
 
 #include 
 #include 
@@ -357,9 +357,9 @@
 		      /*dxfer_len*/sizeof(struct ata_params),
 		      30 * 1000);
 		if (periph->path->device->protocol == PROTO_ATA)
-			ata_36bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
+			ata_28bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
 		else
-			ata_36bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
+			ata_28bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
 		break;
 	}
 	case PROBE_SETMODE:
@@ -375,7 +375,7 @@
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
 		      30 * 1000);
-		ata_36bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0,
+		ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0,
 		    ata_max_mode(ident_buf, ATA_UDMA6, ATA_UDMA6));
 		break;
 	}

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 (text+ko) ====

@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -864,10 +864,11 @@
 		/* currently allocated, want to be allocated */
 		dmu_tx_hold_bonus(tx, drro->drr_object);
 		/*
-		 * We may change blocksize, so need to
-		 * hold_write
+		 * We may change blocksize and delete old content,
+		 * so need to hold_write and hold_free.
 		 */
 		dmu_tx_hold_write(tx, drro->drr_object, 0, 1);
+		dmu_tx_hold_free(tx, drro->drr_object, 0, DMU_OBJECT_END);
 		err = dmu_tx_assign(tx, TXG_WAIT);
 		if (err) {
 			dmu_tx_abort(tx);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 (text+ko) ====

@@ -415,7 +415,7 @@
 dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize,
     dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx)
 {
-	int i, old_nblkptr;
+	int i, nblkptr;
 	dmu_buf_impl_t *db = NULL;
 
 	ASSERT3U(blocksize, >=, SPA_MINBLOCKSIZE);
@@ -445,6 +445,8 @@
 		dnode_free_range(dn, 0, -1ULL, tx);
 	}
 
+	nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT);
+
 	/* change blocksize */
 	rw_enter(&dn->dn_struct_rwlock, RW_WRITER);
 	if (blocksize != dn->dn_datablksz &&
@@ -457,6 +459,8 @@
 	dnode_setdirty(dn, tx);
 	dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen;
 	dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize;
+	if (dn->dn_nblkptr != nblkptr)
+		dn->dn_next_nblkptr[tx->tx_txg&TXG_MASK] = nblkptr;
 	rw_exit(&dn->dn_struct_rwlock);
 	if (db)
 		dbuf_rele(db, FTAG);
@@ -466,19 +470,15 @@
 
 	/* change bonus size and type */
 	mutex_enter(&dn->dn_mtx);
-	old_nblkptr = dn->dn_nblkptr;
 	dn->dn_bonustype = bonustype;
 	dn->dn_bonuslen = bonuslen;
-	dn->dn_nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT);
+	dn->dn_nblkptr = nblkptr;
 	dn->dn_checksum = ZIO_CHECKSUM_INHERIT;
 	dn->dn_compress = ZIO_COMPRESS_INHERIT;
 	ASSERT3U(dn->dn_nblkptr, <=, DN_MAX_NBLKPTR);
 
-	/* XXX - for now, we can't make nblkptr smaller */
-	ASSERT3U(dn->dn_nblkptr, >=, old_nblkptr);
-
-	/* fix up the bonus db_size if dn_nblkptr has changed */
-	if (dn->dn_bonus && dn->dn_bonuslen != old_nblkptr) {
+	/* fix up the bonus db_size */
+	if (dn->dn_bonus) {
 		dn->dn_bonus->db.db_size =
 		    DN_MAX_BONUSLEN - (dn->dn_nblkptr-1) * sizeof (blkptr_t);
 		ASSERT(dn->dn_bonuslen <= dn->dn_bonus->db.db_size);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 (text+ko) ====

@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include 
 #include 
 #include 
@@ -534,18 +532,12 @@
 			/* XXX shouldn't the phys already be zeroed? */
 			bzero(dnp, DNODE_CORE_SIZE);
 			dnp->dn_nlevels = 1;
+			dnp->dn_nblkptr = dn->dn_nblkptr;
 		}
 
-		if (dn->dn_nblkptr > dnp->dn_nblkptr) {
-			/* zero the new blkptrs we are gaining */
-			bzero(dnp->dn_blkptr + dnp->dn_nblkptr,
-			    sizeof (blkptr_t) *
-			    (dn->dn_nblkptr - dnp->dn_nblkptr));
-		}
 		dnp->dn_type = dn->dn_type;
 		dnp->dn_bonustype = dn->dn_bonustype;
 		dnp->dn_bonuslen = dn->dn_bonuslen;
-		dnp->dn_nblkptr = dn->dn_nblkptr;
 	}
 
 	ASSERT(dnp->dn_nlevels > 1 ||
@@ -605,6 +597,30 @@
 		return;
 	}
 
+	if (dn->dn_next_nblkptr[txgoff]) {
+		/* this should only happen on a realloc */
+		ASSERT(dn->dn_allocated_txg == tx->tx_txg);
+		if (dn->dn_next_nblkptr[txgoff] > dnp->dn_nblkptr) {
+			/* zero the new blkptrs we are gaining */
+			bzero(dnp->dn_blkptr + dnp->dn_nblkptr,
+			    sizeof (blkptr_t) *
+			    (dn->dn_next_nblkptr[txgoff] - dnp->dn_nblkptr));
+#ifdef ZFS_DEBUG
+		} else {
+			int i;
+			ASSERT(dn->dn_next_nblkptr[txgoff] < dnp->dn_nblkptr);
+			/* the blkptrs we are losing better be unallocated */
+			for (i = dn->dn_next_nblkptr[txgoff];
+			    i < dnp->dn_nblkptr; i++)
+				ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i]));
+#endif
+		}
+		mutex_enter(&dn->dn_mtx);
+		dnp->dn_nblkptr = dn->dn_next_nblkptr[txgoff];
+		dn->dn_next_nblkptr[txgoff] = 0;
+		mutex_exit(&dn->dn_mtx);
+	}
+
 	if (dn->dn_next_nlevels[txgoff]) {
 		dnode_increase_indirection(dn, tx);
 		dn->dn_next_nlevels[txgoff] = 0;

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 (text+ko) ====

@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -160,6 +160,7 @@
 	uint16_t dn_datablkszsec;	/* in 512b sectors */
 	uint32_t dn_datablksz;		/* in bytes */
 	uint64_t dn_maxblkid;
+	uint8_t dn_next_nblkptr[TXG_SIZE];
 	uint8_t dn_next_nlevels[TXG_SIZE];
 	uint8_t dn_next_indblkshift[TXG_SIZE];
 	uint16_t dn_next_bonuslen[TXG_SIZE];

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 (text+ko) ====

@@ -729,7 +729,9 @@
 
 			vattr.va_mask = AT_UID;
 
+			vn_lock(mvp, LK_SHARED | LK_RETRY);
 			if (error = VOP_GETATTR(mvp, &vattr, cr)) {
+				VOP_UNLOCK(mvp, 0);
 				goto out;
 			}
 
@@ -741,12 +743,15 @@
 			}
 #else

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 19:34:32 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4748D106568B; Tue,  1 Sep 2009 19:34:32 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B0EC1065672
	for ; Tue,  1 Sep 2009 19:34:32 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E3A258FC16
	for ; Tue,  1 Sep 2009 19:34:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n81JYViU027822
	for ; Tue, 1 Sep 2009 19:34:31 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n81JYVXB027820
	for perforce@freebsd.org; Tue, 1 Sep 2009 19:34:31 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 1 Sep 2009 19:34:31 GMT
Message-Id: <200909011934.n81JYVXB027820@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168059 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, 01 Sep 2009 19:34:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=168059

Change 168059 by rene@rene_self on 2009/09/01 19:33:47

	IFC (force non-whitespace-corrected version of translations.sgml)	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/custom-gcc/Makefile#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/custom-gcc/article.sgml#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#8 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#8 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/www/en/docproj/translations.sgml#8 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.60 2008/05/31 13:32:19 remko Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.61 2009/09/01 18:01:01 danger Exp $
 
 SUBDIR =
 SUBDIR+= 5-roadmap
@@ -13,6 +13,7 @@
 SUBDIR+= contributing-ports
 SUBDIR+= contributors
 SUBDIR+= cups
+SUBDIR+= custom-gcc
 SUBDIR+= cvs-freebsd
 SUBDIR+= cvsup-advanced
 SUBDIR+= dialup-firewall

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#8 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -2281,11 +2281,12 @@
 	rules for ipfw firewall.  One is
 	by setting firewall_type variable to absolute
 	path of file, which contains firewall rules
-	without any command-line options for &man.ipfw.8; itself.  A
-	simple example of ruleset file can be following:
+	without any command-line options for &man.ipfw.8; itself.
+	The following is a simple example of a ruleset file that blocks
+	all incoming and outgoing traffic:
 
-     add block in  all
-add block out all
+     add deny in
+add deny out
 
      On the other hand, it is possible to set the
 	firewall_script variable to the absolute path of an
@@ -2298,8 +2299,8 @@
 
 ipfw -q flush
 
-ipfw add block in  all
-ipfw add block out all
+ipfw add deny in
+ipfw add deny out
 
       
 	If firewall_type is set to either

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -326,6 +326,24 @@
     
 
     
+      Installing a Random Linux RPM Based Application
+
+      FreeBSD has its own package database and it is used to track
+	all ports (&linux; ports as well).  So the &linux; RPM database is not
+	used (not supported).
+
+      However if you need to install a random &linux; RPM-based
+	application it can be achieved by:
+
+      &prompt.root; cd /compat/linux
+&prompt.root; rpm2cpio -q < /path/to/linux.archive.rpm | cpio -id
+
+      Then brandelf installed ELF binaries (not libraries!).
+	You will not be able to do a clean uninstall, but it may help you
+	to do tests.
+    
+
+    
       Configuring the Hostname Resolver
 
       If DNS does not work or you get this message:

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#8 (text+ko) ====

@@ -1,7 +1,7 @@
 

==== //depot/projects/docproj_nl/www/en/docproj/translations.sgml#8 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -169,7 +169,7 @@
 
Repository of the ongoing work

   
Perforce

 
-
+ 
 
 
The FreeBSD Estonian Documentation Project

 
@@ -198,7 +198,7 @@
 
 
The FreeBSD German Documentation Project

 
-Web: https://doc.bsdgroup.de

+Web: https://doc.bsdgroup.de
 
 E-Mail: de-bsd-translators@de.FreeBSD.org

 IRC: Server: irc.freenode.net, Channel: #FreeBSD-Doc.de

 
@@ -335,10 +335,10 @@
   FreeBSD Tutorials
 
 
-
+    
 
The FreeBSD Korean Documentation Project

 
-Web: http://www.kr.FreeBSD.org/projects/doc-kr/

+Web: http://www.kr.FreeBSD.org/projects/doc-kr/
 
 E-Mail: doc@kr.FreeBSD.org

 
 


From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 20:05:06 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DCF4010656C1; Tue,  1 Sep 2009 20:05:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A12941065672
	for ; Tue,  1 Sep 2009 20:05:05 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 907428FC2A
	for ; Tue,  1 Sep 2009 20:05:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n81K55js030997
	for ; Tue, 1 Sep 2009 20:05:05 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n81K55Fi030995
	for perforce@freebsd.org; Tue, 1 Sep 2009 20:05:05 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 1 Sep 2009 20:05:05 GMT
Message-Id: <200909012005.n81K55Fi030995@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168060 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, 01 Sep 2009 20:05:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=168060

Change 168060 by rene@rene_self on 2009/09/01 20:04:10

	MFen handbook/linux 1.138 -> 1.139

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#9 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#9 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.12 2009/08/27 20:01:58 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
-     %SRCID%	1.138
+     %SRCID%	1.139
 -->
 
 
@@ -365,6 +365,25 @@
     
 
     
+      Een willekeurige toepassing gebaseerd op Linux RPM
+	installeren
+
+      &os; heeft zijn eigen pakketdatabase die wordt gebruikt om alle
+	ports te volgen (ook &linux; ports).  De &linux; RPM-database wordt dus
+	niet gebruikt (noch ondersteund).
+
+      Als u echter een willekeurige toepassing die op &linux; RPM is
+	gebaseerd moet installeren kan dit bereikt worden met:
+
+      &prompt.root; cd /compat/linux
+&prompt.root; rpm2cpio -q < /pad/naar/linux.archief.rpm | cpio -id
+
+      Draai daarna brandelf op de geïnstalleerde ELF-binairen (niet
+	de bibliotheken!).  Een schone deïnstallatie is niet mogelijk, maar
+	het kan helpen met testen.
+    
+
+    
       De hostnaamresolver instellen
 
       resolv+: "bind" is an invalid keyword resolv+:

From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 20:46:51 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 984AC10656A6; Tue,  1 Sep 2009 20:46:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5CFCA1065698
	for ; Tue,  1 Sep 2009 20:46:51 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C41F8FC20
	for ; Tue,  1 Sep 2009 20:46:51 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n81KkpTK034136
	for ; Tue, 1 Sep 2009 20:46:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n81KkpIm034134
	for perforce@freebsd.org; Tue, 1 Sep 2009 20:46:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 1 Sep 2009 20:46:51 GMT
Message-Id: <200909012046.n81KkpIm034134@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168061 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, 01 Sep 2009 20:46:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=168061

Change 168061 by hselasky@hselasky_laptop001 on 2009/09/01 20:46:09

	
	USB serial:
	 - add more device ID's
	 - reported by Mike Tancsa
	
	PR:		usb/138172

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#77 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#20 (text+ko) ====

@@ -180,6 +180,8 @@
 	U3G_DEV(OPTION, GTMAX36, 0),
 	U3G_DEV(OPTION, GTHSDPA, 0),
 	U3G_DEV(OPTION, GTMAXHSUPA, 0),
+	U3G_DEV(OPTION, GTMAXHSUPAE, 0),
+	U3G_DEV(OPTION, GTMAX380HSUPAE, 0),
 	U3G_DEV(OPTION, VODAFONEMC3G, 0),
 	/* OEM: Qualcomm, Inc. */
 	U3G_DEV(QUALCOMMINC, ZTE_STOR, U3GFL_SCSI_EJECT),
@@ -204,6 +206,7 @@
 	U3G_DEV(NOVATEL, X950D, 0),
 	U3G_DEV(NOVATEL, XU870, 0),
 	U3G_DEV(NOVATEL, ZEROCD, U3GFL_SCSI_EJECT),
+	U3G_DEV(NOVATEL, U760, U3GFL_SCSI_EJECT),
 	U3G_DEV(DELL, U740, 0),
 	/* OEM: Merlin */
 	U3G_DEV(MERLIN, V620, 0),

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#77 (text+ko) ====

@@ -1940,6 +1940,8 @@
 product OPTION GTMAX36		0x6701	GlobeTrotter Max 3.6 Modem
 product OPTION GTHSDPA		0x6971	GlobeTrotter HSDPA
 product OPTION GTMAXHSUPA	0x7001	GlobeTrotter HSUPA
+product OPTION GTMAXHSUPAE	0x6901	GlobeTrotter HSUPA PCIe
+product OPTION GTMAX380HSUPAE	0x7211	GlobeTrotter 380HSUPA PCIe
 
 /* OQO */
 product OQO WIFI01		0x0002	model 01 WiFi interface

From owner-p4-projects@FreeBSD.ORG  Tue Sep  1 21:34:44 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 589021065676; Tue,  1 Sep 2009 21:34:44 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 04502106566B
	for ; Tue,  1 Sep 2009 21:34:44 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E6C6D8FC13
	for ; Tue,  1 Sep 2009 21:34:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n81LYhAp048665
	for ; Tue, 1 Sep 2009 21:34:43 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n81LYhJk048663
	for perforce@freebsd.org; Tue, 1 Sep 2009 21:34:43 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 1 Sep 2009 21:34:43 GMT
Message-Id: <200909012134.n81LYhJk048663@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168063 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, 01 Sep 2009 21:34:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=168063

Change 168063 by rene@rene_self on 2009/09/01 21:34:21

	MFen handbook/firewalls up to the new line 2553.
	Also make  and "ruleset" usage more consistent.

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#11 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#11 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.10 2008/12/28 19:42:42 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
-     %SRCID%	1.89
+     %SRCID%	1.89 -> update to 1.90 before submit/commit (small one :-) )
 -->
 
 
@@ -256,14 +256,14 @@
       De laadbare kernelmodule voor PF gebruiken
 
       Sinds de uitgave van &os; 5.3 wordt PF geleverd in de
-	basisinstallatie als een aparte runtime laadbare module.  Het
+	basisinstallatie als een aparte tijdens runtime laadbare module.  Het
 	systeem zal de PF kernelmodule dynamisch laden wanneer het
 	statement pf_enable="YES" voor
 	&man.rc.conf.5; aanwezig is.  De PF module
 	zal echter niet geladen worden als het systeem geen instellingenbestand
-	met een PF ruleset kan vinden.  De
+	met een PF-regelverzameling kan vinden.  De
 	standaardplaats is /etc/pf.conf.  Indien uw
-	PF ruleset ergens anders staat, voeg dan
+	PF-regelverzameling ergens anders staat, voeg dan
 	pf_rules="/pad/pf.rules"
 	aan uw instellingenbestand /etc/rc.conf toe
 	om de plaats te specificeren.
@@ -457,7 +457,7 @@
 	      pfctl  /etc/pf.conf
 
 	      Controleer /etc/pf.conf op
-		fouten, maar laad de ruleset niet
+		fouten, maar laad de regelverzameling niet
 	    
 	  
 	
@@ -600,8 +600,8 @@
 	  pass all ingeschakeld.  IPF hoeft niet in de
 	kernel gecompileerd te worden om het standaardgedrag te
 	wijzigen naar block all.  Dat is mogelijk
-	door op het einde van de ruleset een regel block all
-	toe te voegen die al het verkeer blokkeert.
+	door op het einde van de regelverzameling een regel block
+	  all toe te voegen die al het verkeer blokkeert.
     
 
     
@@ -1159,8 +1159,8 @@
 	gemoderniseerd.
 
       De instructies in dit hoofdstuk zijn gebaseerd op regels
-	die gebruik maken van de optie quick
-	en de stateful optie keep state.  Dit
+	die gebruik maken van de optie quick
+	en de stateful optie keep state.  Dit
 	is het raamwerk waarmee een set van inclusieve firewallregels
 	wordt samengesteld.
 
@@ -1257,8 +1257,8 @@
 	Een verplicht onderdeel voor iedere filterregel waarin
 	  expliciet wordt aangegeven op welke zijde van de in/uit
 	  deze van toepassing is.  Het volgende sleutelwoord moet
-	  in of out
-	  zijn en één van de twee moet gecodeerd wworden, anders
+	  in of out
+	  zijn en één van de twee moet gecodeerd worden, anders
 	  is de regel syntactisch onjuist.
 
 	in betekent dat de regel van
@@ -2161,7 +2161,7 @@
 
 	map dc0 10.0.10.0/29 -> 0/32
 
-	De FTP map regel hoort voor de
+	De FTP map-regel hoort voor de
 	  normale regels te staan.  Alle pakketten worden als eerste
 	  vergeleken met de eerste regel en zo verder.  Eerst wordt
 	  gekeken over de interfacenaam overeenkomt, daarna het
@@ -2207,8 +2207,8 @@
       IPFW
     
 
-    IPFIREWALL (IPFW) is een firewall die binnen &os; wordt
-      ontwikkeld en onderhouden door vrijwilligers, leden van de
+    IPFIREWALL (IPFW) is een firewall die binnen &os;
+      wordt ontwikkeld en onderhouden door vrijwillige leden van de
       staf.  Het maakt gebruik van verouderde staatloze regels en een
       verouderde techniek om te realiseren wat eenvoudige stateful
       logica zou kunnen heten.
@@ -2232,15 +2232,15 @@
       gebruiker veel weten over de verschillende protocollen en
       de wijze waarop pakketten in elkaar zitten.  Het tot op dat
       niveau behandelen van stof valt buiten de doelstellingen van
-      dit boek.
+      dit Handboek.
 
     IPFW bestaat uit zeven componenten: de verwerkingseenheid
       voor de firewallregels, verantwoording, loggen, regels met
-      divert (omleiden) waarmee
+      divert (omleiden) waarmee
       NAT gebruikt kan worden en de speciale
-      gevorderde mogelijkheden voor bandbreedte management DUMMYNET, de
-      'fwd rule' forward-mogelijkheid, de bridge-mogelijkheden en de
-      ipstealth-mogelijkheden.  IPFW ondersteunt zowel IPv4 als
+      gevorderde mogelijkheden voor bandbreedtebeheer met DUMMYNET, de
+      fwd rule forward-mogelijkheid, de bridge-mogelijkheden
+      en de ipstealth-mogelijkheden.  IPFW ondersteunt zowel IPv4 als
       IPv6.
 
     
@@ -2253,8 +2253,8 @@
       
 
       IPFW zit bij de basisinstallatie van &os; als een losse
-	in runtime laadbare module.  Het systeem laadt de kernel
-	module dynamisch als in rc.conf
+	tijdens runtime laadbare module.  Het systeem laadt de kernelmodule
+	dynamisch als in rc.conf de regel
 	firewall_enable="YES" staat.  IPFW hoeft
 	niet in de &os; kernel gecompileerd te worden, tenzij het
 	nodig is dat NAT beschikbaar is.
@@ -2267,11 +2267,13 @@
       ipfw2 initialized, divert disabled, rule-based forwarding disabled, default to deny, logging disabled
 
       In de laadbare module zit de mogelijkheid om te loggen
-	gecompileerd.  In /etc/sysctl.conf kan een
-	instelling gemaakt worden waardoor loggen na volgende herstarts
-	wordt ingeschakeld:
+	gecompileerd.  Er is een knop in /etc/sysctl.conf
+	om loggen aan te zetten en de uitgebreide loglimiet in te stellen.  Door
+	deze regels toe te voegen, staat loggen aan bij toekomstige
+	herstarts:
 
-      net.inet.ip.fw.verbose_limit=5
+      net.inet.ip.fw.verbose=1
+net.inet.ip.fw.verbose_limit=5
     
 
     
@@ -2304,9 +2306,7 @@
       Het is niet verplicht om IPFW in te schakelen door het
 	mee te compileren in de &os; kernel, tenzij de
 	NAT functionaliteit beschikbaar moet zijn.
-	Dit wordt alleen beschreven als achtergrondinformatie.
-	Door IPFW in de kernel te compileren wordt de laadbare module
-	niet gebruikt.
+	Dit wordt alleen beschreven als achtergrondinformatie.
 
       options    IPFIREWALL
 
@@ -2317,8 +2317,8 @@
 
       Met IPFIREWALL_VERBOSE wordt het
 	loggen van pakketten die worden verwerkt met IPFW mogelijk
-	als het sleutelwoord  in een regel
-	staat.
+	die het sleutelwoord log in een regel hebben
+	staan.
 
       options    IPFIREWALL_VERBOSE_LIMIT=5
 
@@ -2326,7 +2326,7 @@
 	via &man.syslogd.8;.  Deze optie kan gebruikt worden in
 	vijandige omgevingen waar de activiteit van een firewall gelogd
 	moet worden.  Hierdoor kan een mogelijke ontzegging van dienst
-	aanval door syslog flooding voorkomen worden.
+	aanval door het vol laten lopen van syslog voorkomen worden.
 
       
 	kernelopties
@@ -2352,12 +2352,12 @@
       Met IPDIVERT wordt de
 	NAT functionaliteit ingeschakeld.
 
-      
-	Als IPFIREWALL_DEFAULT_TO_ACCEPT
-	  niet wordt gebruikt of de regels van de firewall staan geen
-	  verkeer toe, dan worden alle pakketten van en naar de
-	  machine waar dit voor geldt geblokkeerd.
-      
+      
+	De firewall zal alle binnenkomende en uitgaande pakketten
+	  blokkeren als de kerneloptie
+	  IPFIREWALL_DEFAULT_TO_ACCEPT of een regel om deze
+	  verbindingen expliciet toe te staan ontbreekt.
+      
     
 
     
@@ -2378,7 +2378,7 @@
 
       
 	
-	  open — pass all traffic.
+	  open — laat al het verkeer door.
 	
 
 	
@@ -2392,18 +2392,19 @@
 	
 
 	
-	  closed — blokkeert alle IP
-	    verkeer, behalve voor lokaal verkeer.
+	  closed — blokkeert alle IP-verkeer,
+	    behalve voor lokaal verkeer.
 	
 
 	
 	  UNKNOWN — voorkomt het laden
-	    de firewall regels.
+	    de firewall-regels.
 	
 
 	
-	  bestandsnaam — absoluut pad
-	    naar een bestand dat firewall regels bevat.
+	  bestandsnaam
+	    — absoluut pad naar een bestand dat firewall-regels
+	    bevat.
 	
       
 
@@ -2414,17 +2415,17 @@
 	firewall_type variabele naar een absoluut
 	pad van een bestand, welke firewall regels
 	bevat, zonder enige specifieke opties voor &man.ipfw.8;.  Een
-	simpel voorbeeld van een ruleset bestand kan zijn:
+	simpel voorbeeld van een regelverzameling bestand kan zijn:
 
       add block in  all
 add block out all
 
-      Aan de andere kant is het mogelijk om de
-	firewall_script variabele te zetten naar een
-	absoluut pad van een uitvoerbaar bestand, welke inclusief
+      Aan de andere kant is het mogelijk om de variabele
+	firewall_script in te stellen op een
+	absoluut pad van een uitvoerbaar script, welke inclusief
 	ipfw commando's uitgevoerd wordt tijdens het
-	opstarten van het systeem.  Een geldig ruleset script dat
-	gelijkwaardig is aan het ruleset bestand hierboven, zou het
+	opstarten van het systeem.  Een geldig script met regels dat
+	gelijkwaardig is aan het bestand met regels hierboven, zou het
 	volgende zijn:
 
       #!/bin/sh
@@ -2475,10 +2476,10 @@
 
       ipfw
 
-      ipfw wordt gebruikt om met de hand
-	regels toe te voegen of te verwijderen als IPFW actief is.
-	Het probleem met deze methode is dat, als het systeem down
-	wordt gebracht, alle regels die gewijzigd of verwijderd zijn
+      Gewoonlijk wordt ipfw gebruikt om met de hand
+	enkelvoudige regels toe te voegen of te verwijderen als IPFW actief is.
+	Het probleem met deze methode is dat, als het systeem wordt uitgezet
+	alle regels die gewijzigd of verwijderd zijn
 	verloren gaan.  Door alle regels in een bestand op te nemen
 	dat bij het booten wordt geladen of door het bestand waarin
 	de wijzigingen zijn gemaakt als een machine draait te laden
@@ -2488,8 +2489,9 @@
 	de firewall op het scherm getoond worden.  De
 	verantwoordingsmogelijkeden van &man.ipfw.8; maken
 	dynamisch tellers aan voor iedere regel en houden die bij
-	voor alle pakketten die van toepassing zijn op die regel.
-	Dit biedt ook een mogelijkheid om een regel te testen.
+	voor alle pakketten die van toepassing zijn op die regel.  Tijdens het
+	testen van een regel is het afbeelden van de regel met zijn teller
+	een van de manieren om te bepalen of de regel werkt.
 
       Om alle regels in volgorde te tonen:
 
@@ -2523,30 +2525,30 @@
 
       &prompt.root; ipfw zero
 
-      Alleen de tellers voor regel
+      Alleen de tellers voor regel met nummer
 	NUM op nul stellen:
 
-      &prompt.root; ipfw zero NUM
+      &prompt.root; ipfw zero NUM
     
 
     
       Sets van IPFW regels
 
-      Een set regels is een groep &man.ipfw.8; regels die is
+      Een verzameling regels is een groep IPFW-regels die is
 	gemaakt om pakketten toe te staan of te blokkeren op basis
-	van de eigenschappen van dat pakket.  De bi-directionele
+	van de inhoud van dat pakket.  De bi-directionele
 	uitwisseling van pakketten tussen hosts bestaat uit een
-	gesprek dat een sessie heet.  De set van firewallregels
-	beoordeelt pakketten twee keer: als het aankomt van de host
-	op het publieke Internet en als het de host weer verlaat op
-	de weg terug naar de host op het publieke Internet.  Iedere
-	TCP/IP dienst als
-	telnet, www, mail, etc, heeft zijn eigen protocol, bron
-	IP adres en bestemmings
-	IP adres of de bron- en bestemmingspoort.
-	Deze attributen vormen de basis voor het opstellen van
-	regels waarmee diensten toegelaten of geblokkeerd kunnen
-	worden.
+	gesprek dat een sessie heet.  De verzameling van firewallregels
+	beoordeelt zowel de pakketten die aankomen van de host
+	op het publieke Internet als de pakketten die op het systeem ontstaan
+	als antwoord daarop.  Iedere TCP/IP-dienst als
+	telnet, www, mail, etc, heeft zijn eigen protocol en bevoorrechte
+	(luister)poort.  Pakketten bestemd voor een specifieke poort verlaten
+	het bronadres via een onbevoorrechte (hogere) poort en doelen op de
+	specifieke dienstpoort op het bestemmingsadres.  Alle bovenstaande
+	parameters (poorten en addressen) kunnen gebruikt worden als
+	selectiecriteria om regels aan te maken die diensten doorlaten of
+	blokkeren.
 
       
 	IPFW
@@ -2561,8 +2563,8 @@
 	actieveld van de regel uitgevoerd.  Dit wordt de
 	de eerst passende regel wint zoekmethode
 	genoemd.  Als een pakket bij geen enkele regel past, dan
-	wordt de standaardregel 65535 toegepast, die alle pakketten
-	weigert zonder een antwoord terug te sturen naar de
+	wordt de verpichte standaardregel 65535 van IPFW toegepast, die alle
+	pakketten weigert zonder een antwoord terug te sturen naar de
 	verzender.
 
       
@@ -2572,26 +2574,15 @@
       
 
       De instructies in dit onderdeel zijn gebaseerd op regels
-	die gebruik maken van de stateful opties keep
-	  state, limit,
-	in/out en
-	via.  Dit is het raamwerk waarmee een
+	die gebruik maken van de stateful opties keep
+	  state, limit,
+	in, out en
+	via.  Dit is het raamwerk waarmee een
 	set van inclusieve firewallregels wordt samengesteld.
 
-      Een inclusieve firewall staat alleen diensten toe die
-	voldoen aan de regels.  Op die manier kan er in de hand
-	gehouden worden welke diensten van binnen de firewall naar
-	buiten mogen en welke diensten op het private netwerk vanaf
-	het Internet bereikbaar zijn.  Al het andere verkeer wordt
-	vanuit het ontwerp standaard geblokkeerd en gelogd.
-	Inclusieve firewalls zijn veel veiliger dan exclusieve
-	firewalls.  Het is ook de enige wijze voor de opzet van een
-	firewall die in dit hoofdstuk wordt behandeld.
-
       
-	Er wordt aangeraden voorzichtig te zijn als er vanaf
-	  het netwerk aan de firewallregels wordt gewerkt omdat het
-	  gevaar bestaat buitengesloten te worden.
+	Wees voorzichtig tijdens het werken met firewall-regels, het is
+	  gemakkelijk om uzelf uit te sluiten.
       
 
       
@@ -2657,14 +2648,11 @@
 	  Vergelijkt het pakket met de tabel met dynamische
 	    regels.  Als het erin staat, dan wordt de actie van
 	    de dynamisch door deze regel gemaakte regel uitgevoerd.
-	    Anders wordt er verder gezocht door de regels.  Een
-	    regel met check–state heeft
-	    geen selectiecriteria.  Als er geen regel met
-	    check–state in de set met
-	    regels staat, dan wordt de tabel met dynamische regels
-	    bij het eerste voorkomen van
-	    keep–state of
-	    limit gecontroleerd.
+	    Anders wordt er verder gezocht door de regels.  Een regel met
+	    check–state heeft geen selectiecriteria.  Als er geen regel
+	    met check–state in de set met regels staat, dan wordt de
+	    tabel met dynamische regels bij het eerste voorkomen van
+	    keep–state of limit gecontroleerd.
 
 	  deny | drop
 
@@ -2680,21 +2668,19 @@
 	    logamount
 
 	  Als een regel met het sleutelwoord
-	    log van toepassing is op een
+	    log van toepassing is op een
 	    pakket, dan wordt er een bericht naar &man.syslogd.8;
 	    geschreven met de faciliteitsnaam SECURITY.  Er wordt alleen
 	    een bericht geschreven als het aantal voor die regel
-	    gelogde pakketten niet groter is dan de instelling
-	    logamount.  Als
-	    logamount niet is ingesteld, dan
-	    wordt de limiet uit de &man.sysctl.8; variabele
-	    net.inet.ip.fw.verbose_limit gehaald.  In beide gevallen
-	    bestaat er in het geval de waarde nul is geen limiet.
+	    gelogde pakketten niet groter is dan de instelling van de parameter
+	    logamount.  Als er geen logamount is ingesteld,
+	    dan wordt de limiet uit de &man.sysctl.8; variabele
+	    net.inet.ip.fw.verbose_limit gehaald.  In beide
+	    gevallen bestaat er in het geval de waarde nul is geen limiet.
 	    Als de limiet is bereikt, dan kan het loggen weer
 	    ingeschakeld worden door de teller voor het loggen weer
-	    op nul te stellen voor die regel met
-	    ipfw
-	    zero.
+	    op nul te zetten voor die regel met het commando
+	    ipfw reset log.
 
 	  
 	    Er wordt gelogd als een pakket zeker past bij een

From owner-p4-projects@FreeBSD.ORG  Wed Sep  2 14:42:29 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF31A1065696; Wed,  2 Sep 2009 14:42:28 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 78A851065692
	for ; Wed,  2 Sep 2009 14:42:28 +0000 (UTC)
	(envelope-from marinosi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 653D68FC14
	for ; Wed,  2 Sep 2009 14:42:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n82EgS7F084785
	for ; Wed, 2 Sep 2009 14:42:28 GMT
	(envelope-from marinosi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n82EgRos084782
	for perforce@freebsd.org; Wed, 2 Sep 2009 14:42:27 GMT
	(envelope-from marinosi@FreeBSD.org)
Date: Wed, 2 Sep 2009 14:42:27 GMT
Message-Id: <200909021442.n82EgRos084782@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marinosi@FreeBSD.org using -f
From: Ilias Marinos 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168073 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, 02 Sep 2009 14:42:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=168073

Change 168073 by marinosi@marinosi_redrum on 2009/09/02 14:42:12

	Sync with the latest -CURRENT. ( 9-CURRENT)

Affected files ...

.. //depot/projects/soc2009/marinosi_appaudit/src/ObsoleteFiles.inc#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/UPDATING#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/chmod/chmod.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/cp/utils.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/ls/print.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/eval.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/exec.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/exec.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/mknodes.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/nodes.c.pat#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bzip2/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/ee/ee.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/file/magic2mime#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/netcat/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/openpam/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/top/display.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/traceroute/as.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/traceroute/as.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/contrib/traceroute/traceroute.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/apps/md4.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/ssl/d1_both.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/ssl/d1_pkt.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/bftest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/bntest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/casttest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/destest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/dhtest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/dsatest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/ecdhtest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/ecdsatest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/ectest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/enginetest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/evp_test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/exptest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_aesavs.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_desmovs.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_dsatest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_dssvs.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_hmactest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_randtest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_rngvs.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_rsagtest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_rsastest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_rsavtest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_shatest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/fips_test_suite.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/hmactest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/ideatest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/jpaketest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/md2test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/md4test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/md5test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/mdc2test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/randtest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/rc2test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/rc4test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/rc5test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/rmdtest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/rsa_test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/sha1test.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/sha256t.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/sha512t.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/shatest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssl/test/ssltest.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/defaults/rc.conf#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/freebsd-update.conf#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/mtree/BSD.include.dist#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/network.subr#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/ipsec#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/static_arp#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/wpa_supplicant#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/gnu/usr.bin/patch/pch.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/include/Makefile#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/db/hash/hash.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/Makefile.inc#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/acl_calc_mask.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/acl_support.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/acl_to_text.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/mac.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/mac_free.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/mac_get.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/mac_set.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/mac_text.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/posix1e.3#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdlib/ptsname.3#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdtime/strptime.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libkvm/kvm_vnet.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.atom.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.core.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.core2.3#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.iaf.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.k7.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.k8.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.p4.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.p5.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc.p6.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc_capabilities.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc_read.3#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/release/Makefile#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/release/scripts/lib32-make.sh#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/release/scripts/mm-mtree.sh#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/release/svnbranch.awk#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/label/glabel.8#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/part/geom_part.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sbin/route/route.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sbin/savecore/savecore.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sbin/umount/umount.8#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/cvsup/stable-supfile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ahci.4#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ip6.4#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ips.4#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/mfi.4#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/mpt.4#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/polling.4#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/freebsd-update.conf.5#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/make.conf.5#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/tmpfs.5#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man7/release.7#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/Makefile#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_amrr.9#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_beacon.9#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_bmiss.9#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_crypto.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_ddb.9#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_input.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_ioctl.9#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_node.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_output.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_proto.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_radiotap.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_regdomain.9#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_scan.9#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_vap.9#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/kproc.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/kthread.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/sglist.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/taskqueue.9#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/ja_JP.UTF-8.src#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/africa#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/asia#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/australasia#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/europe#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/leapseconds#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/local_apic.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/conf/XENHVM#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/apicvar.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/pmc_mdep.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/smp.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/undefined.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/CAMBRIA#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/SHEEVAPLUG#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/common.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/discovery/db78xxx.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/mv_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/mvreg.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/mvvar.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/linux/linux_ioctl.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files#4 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/newvers.sh#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/options#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/options.amd64#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/options.arm#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/options.i386#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/options.pc98#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/pf/net/pfvar.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_battery.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_dock.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_thermal.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/adb/adb_bus.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/alc/if_alc.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/amdtemp/amdtemp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/amr/amr.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/asmc/asmc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/drm_bufs.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/drm_drv.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/drm_fops.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/drm_sysctl.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/r600_blit.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/radeon_cs.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/radeon_drm.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/drm/radeon_state.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/e1000/if_em.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_core.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/pmc_events.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ixgbe/ixgbe.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/mge/if_mge.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/mlx/mlx.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ppbus/vpo.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/pst/pst-iop.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/pty/pty.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/snp/snp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/sound/usb/uaudio.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/twe/twe.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/txp/if_txp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/controller/usb_controller.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/input/ukbd.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/misc/ufm.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/net/if_aue.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/net/if_cdce.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/net/usb_ethernet.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/serial/uipaq.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/serial/uvisor.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/storage/umass.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/storage/urio.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_busdma.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_compat_linux.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_dev.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_device.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_device.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_handle_request.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_hub.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_process.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_process.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usb_transfer.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/usb/wlan/if_upgt.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/xen/blkback/blkback.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/xen/blkfront/blkfront.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/xen/console/console.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/xen/netback/netback.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/fs/nfsclient/nfs_clvnops.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/bios/smapi.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/bios/smbios.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/bios/vpd.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/include/apicvar.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/include/pmap.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/include/smp.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/isa/vesa.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/xen/locore.s#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/xen/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/xen/pmap.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/isa/isahint.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_cons.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_exit.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_lock.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_poll.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_sx.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_sysctl.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/kern_uuid.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/subr_kdb.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/subr_pcpu.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/subr_sglist.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/subr_smp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/tty_pty.c#2 delete
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/tty_ttydisc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/uipc_domain.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/mips/include/smp.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/modules/Makefile#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/modules/drm/radeon/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/modules/pty/Makefile#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/bpf.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/bpf_buffer.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/bridgestp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/flowtable.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/flowtable.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/if.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/if_bridge.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/if_ef.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/if_llatbl.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/if_llatbl.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/if_var.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/if_vlan.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/vnet.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net/vnet.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netatalk/at_control.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netgraph/ng_gif.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/in.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_divert.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet6/icmp6.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet6/in6.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet6/in6_ifattach.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/nfsclient/bootp_subr.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/pc98/cbus/fdc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/powerpc/include/smp.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/rpc/clnt_dg.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/rpc/clnt_rc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/rpc/svc_dg.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/rpc/svc_generic.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/rpc/svc_vc.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.h#6 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sparc64/include/smp.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sun4v/include/smp.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/bus.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/conf.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/cons.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/imgact_elf.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/jail.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/lock.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/param.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/pcpu.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/sglist.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/smp.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/sysctl.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/systm.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/taskqueue.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/ttydisc.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/types.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/vm/device_pager.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/vm/sg_pager.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/vm/vm.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/vm/vm_extern.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/vm/vm_glue.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/xdr/xdr_mbuf.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/xen/xenbus/xenbus_probe.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/build/options/WITH_BIND_LIBS#3 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Dependencies#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-cam#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-crypto#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-dev_pci#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-dev_sound#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-dev_usb#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-geom#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-kern#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-libkern#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-linux#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-net80211#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-netgraph#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-netinet#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-netinet6#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-netipsec#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-opencrypto#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Doxyfile-vm#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/kerneldoc/subsys/common-Doxyfile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/acltools/tools-posix.test#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/bin/sh/builtins/eval3.0#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/bin/sh/execution/func1.0#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/bin/sh/execution/func2.0#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/poll/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/poll/sockpoll.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/priv/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/priv/main.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/priv/priv_netinet_ipsec.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/tools/ath/athpoke/athpoke.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/tools/vimage/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/tools/vimage/vimage.8#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/tools/tools/vimage/vimage.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/fstat/fstat.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/fstat/zfs.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/look/look.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/w/extern.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/w/pr_time.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.bin/w/w.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/acpi/acpidump/acpi.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/acpi/acpidump/acpidump.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/acpi/acpidump/acpidump.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/arp/arp.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/iostat/iostat.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/jls/jls.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/Makefile#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_cmd.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_config.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_drive.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_evt.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_flash.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_patrol.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_show.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfi_volume.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfiutil.8#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfiutil.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mfiutil/mfiutil.h#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/Makefile#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mpt_cam.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mpt_cmd.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mpt_config.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mpt_drive.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mpt_evt.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mpt_show.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mpt_volume.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mptutil.8#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mptutil.c#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/mptutil/mptutil.h#1 branch
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ntp/scripts/mkver#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/pkg_install/add/main.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/pkg_install/lib/lib.h#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/ether.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/exec.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/exec.h#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/main.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/netgraph.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/physical.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/ppp.8.m4#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/ppp/tty.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/pstat/pstat.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/sysinstall/devices.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/sysinstall/install.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/sysinstall/media.c#3 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/sysinstall/sysinstall.8#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/traceroute6/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/traceroute6/traceroute6.8#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/traceroute6/traceroute6.c#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/wpa/wpa_cli/Makefile#2 integrate
.. //depot/projects/soc2009/marinosi_appaudit/src/usr.sbin/zic/zic.c#3 integrate

Differences ...

==== //depot/projects/soc2009/marinosi_appaudit/src/ObsoleteFiles.inc#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.205 2009/08/01 19:26:27 rwatson Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.206 2009/08/23 18:28:58 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -803,8 +803,6 @@
 OLD_FILES+=rescue/fdisk
 OLD_FILES+=rescue/gpt
 .endif
-# 20071026: kthread(9)/kproc(9) API changes
-OLD_FILES+=usr/share/man/man9/kthread_create.9.gz
 # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd

==== //depot/projects/soc2009/marinosi_appaudit/src/UPDATING#3 (text+ko) ====

@@ -8,8 +8,8 @@
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
-	FreeBSD 8.x has many debugging features turned on, in
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW:
+	FreeBSD 9.x has many debugging features turned on, in
 	both the kernel and userland.  These features attempt to detect
 	incorrect use of system primitives, and encourage loud failure
 	through extra sanity checking and fail stop semantics.  They
@@ -22,6 +22,12 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090813:
+	Remove the option STOP_NMI.  The default action is now to use NMI
+	only for KDB via the newly introduced function stop_cpus_hard()
+	and maintain stop_cpus() to just use a normal IPI_STOP on ia32
+	and amd64.
+
 20090719:
 	Bump the shared library version numbers for all libraries that
 	do not use symbol versioning as part of the 8.0-RELEASE cycle.
@@ -1665,4 +1671,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.632 2009/07/26 20:12:06 kib Exp $
+$FreeBSD: src/UPDATING,v 1.634 2009/08/22 23:44:37 kensmith Exp $

==== //depot/projects/soc2009/marinosi_appaudit/src/bin/chmod/chmod.c#3 (text+ko) ====

@@ -39,9 +39,9 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.35 2009/07/01 15:52:19 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.37 2009/09/02 05:26:59 trasz Exp $");
 
-#include 
+#include 
 #include 
 
 #include 
@@ -54,7 +54,7 @@
 #include 
 
 static void usage(void);
-static int may_have_nfs4acl(const FTSENT *ent);
+static int may_have_nfs4acl(const FTSENT *ent, int hflag);
 
 int
 main(int argc, char *argv[])
@@ -62,11 +62,10 @@
 	FTS *ftsp;
 	FTSENT *p;
 	mode_t *set;
-	int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval;
+	int Hflag, Lflag, Rflag, ch, error, fflag, fts_options, hflag, rval;
 	int vflag;
 	char *mode;
 	mode_t newmode;
-	int (*change_mode)(const char *, mode_t);
 
 	set = NULL;
 	Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
@@ -140,11 +139,6 @@
 	} else
 		fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL;
 
-	if (hflag)
-		change_mode = lchmod;
-	else
-		change_mode = chmod;
-
 	mode = *argv;
 	if ((set = setmode(mode)) == NULL)
 		errx(1, "invalid file mode: %s", mode);
@@ -175,7 +169,6 @@
 			 */
 			if (!hflag)
 				continue;
-			/* else */
 			/* FALLTHROUGH */
 		default:
 			break;
@@ -186,12 +179,18 @@
 		 * identical to the one computed from an ACL will change
 		 * that ACL.
 		 */
-		if (may_have_nfs4acl(p) == 0 &&
+		if (may_have_nfs4acl(p, hflag) == 0 &&
 		    (newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS))
 				continue;
-		if ((*change_mode)(p->fts_accpath, newmode) && !fflag) {
-			warn("%s", p->fts_path);
-			rval = 1;
+		if (hflag)
+			error = lchmod(p->fts_accpath, newmode);
+		else
+			error = chmod(p->fts_accpath, newmode);
+		if (error) {
+			if (!fflag) {
+				warn("%s", p->fts_path);
+				rval = 1;
+			}
 		} else {
 			if (vflag) {
 				(void)printf("%s", p->fts_path);
@@ -202,7 +201,6 @@
 					strmode(p->fts_statp->st_mode, m1);
 					strmode((p->fts_statp->st_mode &
 					    S_IFMT) | newmode, m2);
-
 					(void)printf(": 0%o [%s] -> 0%o [%s]",
 					    p->fts_statp->st_mode, m1,
 					    (p->fts_statp->st_mode & S_IFMT) |
@@ -210,12 +208,10 @@
 				}
 				(void)printf("\n");
 			}
-
 		}
 	}
 	if (errno)
 		err(1, "fts_read");
-	free(set);
 	exit(rval);
 }
 
@@ -228,17 +224,20 @@
 }
 
 static int
-may_have_nfs4acl(const FTSENT *ent)
+may_have_nfs4acl(const FTSENT *ent, int hflag)
 {
 	int ret;
-	static dev_t previous_dev = (dev_t)-1;
+	static dev_t previous_dev = NODEV;
 	static int supports_acls = -1;
 
 	if (previous_dev != ent->fts_statp->st_dev) {
 		previous_dev = ent->fts_statp->st_dev;
 		supports_acls = 0;
 
-		ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4);
+		if (hflag)
+			ret = lpathconf(ent->fts_accpath, _PC_ACL_NFS4);
+		else
+			ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4);
 		if (ret > 0)
 			supports_acls = 1;
 		else if (ret < 0 && errno != EINVAL)

==== //depot/projects/soc2009/marinosi_appaudit/src/bin/cp/utils.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.58 2009/05/30 10:36:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.59 2009/09/02 08:08:57 trasz Exp $");
 
 #include 
 #include 
@@ -377,24 +377,52 @@
 int
 preserve_fd_acls(int source_fd, int dest_fd)
 {
-	struct acl *aclp;
 	acl_t acl;
+	acl_type_t acl_type;
+	int acl_supported = 0, ret, trivial;
 
-	if (fpathconf(source_fd, _PC_ACL_EXTENDED) != 1 ||
-	    fpathconf(dest_fd, _PC_ACL_EXTENDED) != 1)
+	ret = fpathconf(source_fd, _PC_ACL_NFS4);
+	if (ret > 0 ) {
+		acl_supported = 1;
+		acl_type = ACL_TYPE_NFS4;
+	} else if (ret < 0 && errno != EINVAL) {
+		warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", to.p_path);
+		return (1);
+	}
+	if (acl_supported == 0) {
+		ret = fpathconf(source_fd, _PC_ACL_EXTENDED);
+		if (ret > 0 ) {
+			acl_supported = 1;
+			acl_type = ACL_TYPE_ACCESS;
+		} else if (ret < 0 && errno != EINVAL) {
+			warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
+			    to.p_path);
+			return (1);
+		}
+	}
+	if (acl_supported == 0)
 		return (0);
-	acl = acl_get_fd(source_fd);
+
+	acl = acl_get_fd_np(source_fd, acl_type);
 	if (acl == NULL) {
 		warn("failed to get acl entries while setting %s", to.p_path);
 		return (1);
 	}
-	aclp = &acl->ats_acl;
-	if (aclp->acl_cnt == 3)
+	if (acl_is_trivial_np(acl, &trivial)) {
+		warn("acl_is_trivial() failed for %s", to.p_path);
+		acl_free(acl);
+		return (1);
+	}
+	if (trivial) {
+		acl_free(acl);
 		return (0);
-	if (acl_set_fd(dest_fd, acl) < 0) {
+	}
+	if (acl_set_fd_np(dest_fd, acl, acl_type) < 0) {
 		warn("failed to set acl entries for %s", to.p_path);
+		acl_free(acl);
 		return (1);
 	}
+	acl_free(acl);
 	return (0);
 }
 
@@ -405,10 +433,31 @@
 	int (*aclsetf)(const char *, acl_type_t, acl_t);
 	struct acl *aclp;
 	acl_t acl;
+	acl_type_t acl_type;
+	int acl_supported = 0, ret, trivial;
 
-	if (pathconf(source_dir, _PC_ACL_EXTENDED) != 1 ||
-	    pathconf(dest_dir, _PC_ACL_EXTENDED) != 1)
+	ret = pathconf(source_dir, _PC_ACL_NFS4);
+	if (ret > 0) {
+		acl_supported = 1;
+		acl_type = ACL_TYPE_NFS4;
+	} else if (ret < 0 && errno != EINVAL) {
+		warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", source_dir);
+		return (1);
+	}
+	if (acl_supported == 0) {
+		ret = pathconf(source_dir, _PC_ACL_EXTENDED);
+		if (ret > 0) {
+			acl_supported = 1;
+			acl_type = ACL_TYPE_ACCESS;
+		} else if (ret < 0 && errno != EINVAL) {
+			warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
+			    source_dir);
+			return (1);
+		}
+	}
+	if (acl_supported == 0)
 		return (0);
+
 	/*
 	 * If the file is a link we will not follow it
 	 */
@@ -419,34 +468,48 @@
 		aclgetf = acl_get_file;
 		aclsetf = acl_set_file;
 	}
-	/*
-	 * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
-	 * size ACL will be returned. So it is not safe to simply
-	 * check the pointer to see if the default ACL is present.
-	 */
-	acl = aclgetf(source_dir, ACL_TYPE_DEFAULT);
+	if (acl_type == ACL_TYPE_ACCESS) {
+		/*
+		 * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
+		 * size ACL will be returned. So it is not safe to simply
+		 * check the pointer to see if the default ACL is present.
+		 */
+		acl = aclgetf(source_dir, ACL_TYPE_DEFAULT);
+		if (acl == NULL) {
+			warn("failed to get default acl entries on %s",
+			    source_dir);
+			return (1);
+		}
+		aclp = &acl->ats_acl;
+		if (aclp->acl_cnt != 0 && aclsetf(dest_dir,
+		    ACL_TYPE_DEFAULT, acl) < 0) {
+			warn("failed to set default acl entries on %s",
+			    dest_dir);
+			acl_free(acl);
+			return (1);
+		}
+		acl_free(acl);
+	}
+	acl = aclgetf(source_dir, acl_type);
 	if (acl == NULL) {
-		warn("failed to get default acl entries on %s",
-		    source_dir);
+		warn("failed to get acl entries on %s", source_dir);
 		return (1);
 	}
-	aclp = &acl->ats_acl;
-	if (aclp->acl_cnt != 0 && aclsetf(dest_dir,
-	    ACL_TYPE_DEFAULT, acl) < 0) {
-		warn("failed to set default acl entries on %s",
-		    dest_dir);
+	if (acl_is_trivial_np(acl, &trivial)) {
+		warn("acl_is_trivial() failed on %s", source_dir);
+		acl_free(acl);
 		return (1);
 	}
-	acl = aclgetf(source_dir, ACL_TYPE_ACCESS);
-	if (acl == NULL) {
-		warn("failed to get acl entries on %s", source_dir);
-		return (1);
+	if (trivial) {
+		acl_free(acl);
+		return (0);
 	}
-	aclp = &acl->ats_acl;
-	if (aclsetf(dest_dir, ACL_TYPE_ACCESS, acl) < 0) {
+	if (aclsetf(dest_dir, acl_type, acl) < 0) {
 		warn("failed to set acl entries on %s", dest_dir);
+		acl_free(acl);
 		return (1);
 	}
+	acl_free(acl);
 	return (0);
 }
 

==== //depot/projects/soc2009/marinosi_appaudit/src/bin/ls/print.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.79 2009/08/31 20:53:01 trasz Exp $");
 
 #include 
 #include 
@@ -70,7 +70,7 @@
 static void	endcolor(int);
 static int	colortype(mode_t);
 #endif
-static void	aclmode(char *, const FTSENT *, int *);
+static void	aclmode(char *, const FTSENT *);
 
 #define	IS_NOPRINT(p)	((p)->fts_number == NO_PRINT)
 
@@ -139,16 +139,12 @@
 #ifdef COLORLS
 	int color_printed = 0;
 #endif
-	int haveacls;
-	dev_t prevdev;
 
 	if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) &&
 	    (f_longform || f_size)) {
 		(void)printf("total %lu\n", howmany(dp->btotal, blocksize));
 	}
 
-	haveacls = 1;
-	prevdev = (dev_t)-1;
 	for (p = dp->list; p; p = p->fts_link) {
 		if (IS_NOPRINT(p))
 			continue;
@@ -159,14 +155,7 @@
 			(void)printf("%*jd ",
 			    dp->s_block, howmany(sp->st_blocks, blocksize));
 		strmode(sp->st_mode, buf);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Sep  2 15:51:44 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B04FE1065672; Wed,  2 Sep 2009 15:51:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74263106566C
	for ; Wed,  2 Sep 2009 15:51:44 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 612958FC08
	for ; Wed,  2 Sep 2009 15:51:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n82Fpivw095438
	for ; Wed, 2 Sep 2009 15:51:44 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n82FpiEg095436
	for perforce@freebsd.org; Wed, 2 Sep 2009 15:51:44 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 2 Sep 2009 15:51:44 GMT
Message-Id: <200909021551.n82FpiEg095436@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168076 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, 02 Sep 2009 15:51:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=168076

Change 168076 by trasz@trasz_anger on 2009/09/02 15:51:39

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#34 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.local.dist#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.x11-4.dist#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.x11.dist#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_calc_mask.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/strptime.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_core.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/pmc_events.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#27 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac_private.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#9 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#34 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.206 2009/08/23 18:28:58 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.207 2009/09/02 14:56:23 flz Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,10 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
+OLD_FILES+=etc/mtree/BSD.local.dist
+OLD_FILES+=etc/mtree/BSD.x11.dist
+OLD_FILES+=etc/mtree/BSD.x11-4.dist
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20090719: library version bump for 8.0

==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#8 (text+ko) ====

@@ -39,9 +39,8 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.36 2009/08/31 20:42:07 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.37 2009/09/02 05:26:59 trasz Exp $");
 
-#include 
 #include 
 #include 
 
@@ -63,7 +62,7 @@
 	FTS *ftsp;
 	FTSENT *p;
 	mode_t *set;
-	int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval, error;
+	int Hflag, Lflag, Rflag, ch, error, fflag, fts_options, hflag, rval;
 	int vflag;
 	char *mode;
 	mode_t newmode;
@@ -170,7 +169,6 @@
 			 */
 			if (!hflag)
 				continue;
-			/* else */
 			/* FALLTHROUGH */
 		default:
 			break;
@@ -188,9 +186,11 @@
 			error = lchmod(p->fts_accpath, newmode);
 		else
 			error = chmod(p->fts_accpath, newmode);
-		if (error && !fflag) {
-			warn("%s", p->fts_path);
-			rval = 1;
+		if (error) {
+			if (!fflag) {
+				warn("%s", p->fts_path);
+				rval = 1;
+			}
 		} else {
 			if (vflag) {
 				(void)printf("%s", p->fts_path);
@@ -201,7 +201,6 @@
 					strmode(p->fts_statp->st_mode, m1);
 					strmode((p->fts_statp->st_mode &
 					    S_IFMT) | newmode, m2);
-
 					(void)printf(": 0%o [%s] -> 0%o [%s]",
 					    p->fts_statp->st_mode, m1,
 					    (p->fts_statp->st_mode & S_IFMT) |
@@ -209,12 +208,10 @@
 				}
 				(void)printf("\n");
 			}
-
 		}
 	}
 	if (errno)
 		err(1, "fts_read");
-	free(set);
 	exit(rval);
 }
 

==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#11 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.58 2009/05/30 10:36:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.59 2009/09/02 08:08:57 trasz Exp $");
 
 #include 
 #include 
@@ -378,59 +378,51 @@
 preserve_fd_acls(int source_fd, int dest_fd)
 {
 	acl_t acl;
-	acl_type_t source_type, dest_type;
-	int source_acl_supported = 0, dest_acl_supported = 0, trivial;
+	acl_type_t acl_type;
+	int acl_supported = 0, ret, trivial;
 
-	if (fpathconf(source_fd, _PC_ACL_EXTENDED) == 1) {
-		source_acl_supported = 1;
-		source_type = ACL_TYPE_ACCESS;
+	ret = fpathconf(source_fd, _PC_ACL_NFS4);
+	if (ret > 0 ) {
+		acl_supported = 1;
+		acl_type = ACL_TYPE_NFS4;
+	} else if (ret < 0 && errno != EINVAL) {
+		warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", to.p_path);
+		return (1);
 	}
-
-	if (fpathconf(source_fd, _PC_ACL_NFS4) == 1) {
-		source_acl_supported = 1;
-		source_type = ACL_TYPE_NFS4;
+	if (acl_supported == 0) {
+		ret = fpathconf(source_fd, _PC_ACL_EXTENDED);
+		if (ret > 0 ) {
+			acl_supported = 1;
+			acl_type = ACL_TYPE_ACCESS;
+		} else if (ret < 0 && errno != EINVAL) {
+			warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
+			    to.p_path);
+			return (1);
+		}
 	}
-
-	if (fpathconf(dest_fd, _PC_ACL_EXTENDED) == 1) {
-		dest_acl_supported = 1;
-		dest_type = ACL_TYPE_ACCESS;
-	}
-
-	if (fpathconf(dest_fd, _PC_ACL_NFS4) == 1) {
-		dest_acl_supported = 1;
-		dest_type = ACL_TYPE_NFS4;
-	}
-
-	if (!source_acl_supported || !dest_acl_supported)
+	if (acl_supported == 0)
 		return (0);
 
-	acl = acl_get_fd_np(source_fd, source_type);
+	acl = acl_get_fd_np(source_fd, acl_type);
 	if (acl == NULL) {
 		warn("failed to get acl entries while setting %s", to.p_path);
 		return (1);
 	}
-
 	if (acl_is_trivial_np(acl, &trivial)) {
-		warn("acl_is_trivial() failed");
+		warn("acl_is_trivial() failed for %s", to.p_path);
+		acl_free(acl);
 		return (1);
 	}
-
-	if (trivial)
-		return (0);
-
-	if (source_type != dest_type) {
-		warnx("ACL brand of source is %s, but destination is %s; "
-		    "ACL not copied",
-		    source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e",
-		    dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e");
-
+	if (trivial) {
+		acl_free(acl);
 		return (0);
 	}
-
-	if (acl_set_fd_np(dest_fd, acl, dest_type) < 0) {
+	if (acl_set_fd_np(dest_fd, acl, acl_type) < 0) {
 		warn("failed to set acl entries for %s", to.p_path);
+		acl_free(acl);
 		return (1);
 	}
+	acl_free(acl);
 	return (0);
 }
 
@@ -441,41 +433,31 @@
 	int (*aclsetf)(const char *, acl_type_t, acl_t);
 	struct acl *aclp;
 	acl_t acl;
-	acl_type_t source_type, dest_type;
-	int source_acl_supported = 0, dest_acl_supported = 0;
+	acl_type_t acl_type;
+	int acl_supported = 0, ret, trivial;
 
-	if (pathconf(source_dir, _PC_ACL_EXTENDED) == 1) {
-		source_acl_supported = 1;
-		source_type = ACL_TYPE_ACCESS;
+	ret = pathconf(source_dir, _PC_ACL_NFS4);
+	if (ret > 0) {
+		acl_supported = 1;
+		acl_type = ACL_TYPE_NFS4;
+	} else if (ret < 0 && errno != EINVAL) {
+		warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", source_dir);
+		return (1);
 	}
-
-	if (pathconf(source_dir, _PC_ACL_NFS4) == 1) {
-		source_acl_supported = 1;
-		source_type = ACL_TYPE_NFS4;
+	if (acl_supported == 0) {
+		ret = pathconf(source_dir, _PC_ACL_EXTENDED);
+		if (ret > 0) {
+			acl_supported = 1;
+			acl_type = ACL_TYPE_ACCESS;
+		} else if (ret < 0 && errno != EINVAL) {
+			warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
+			    source_dir);
+			return (1);
+		}
 	}
-
-	if (pathconf(dest_dir, _PC_ACL_EXTENDED) == 1) {
-		dest_acl_supported = 1;
-		dest_type = ACL_TYPE_ACCESS;
-	}
-
-	if (pathconf(dest_dir, _PC_ACL_NFS4) == 1) {
-		dest_acl_supported = 1;
-		dest_type = ACL_TYPE_NFS4;
-	}
-
-	if (!source_acl_supported || !dest_acl_supported)
+	if (acl_supported == 0)
 		return (0);
 
-	if (source_type != dest_type) {
-		warnx("ACL brand of source is %s, but destination is %s; "
-		    "ACL not copied",
-		    source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e",
-		    dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e");
-
-		return (0);
-	}
-
 	/*
 	 * If the file is a link we will not follow it
 	 */
@@ -486,8 +468,7 @@
 		aclgetf = acl_get_file;
 		aclsetf = acl_set_file;
 	}
-
-	if (source_type != ACL_TYPE_NFS4) {
+	if (acl_type == ACL_TYPE_ACCESS) {
 		/*
 		 * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
 		 * size ACL will be returned. So it is not safe to simply
@@ -504,20 +485,31 @@
 		    ACL_TYPE_DEFAULT, acl) < 0) {
 			warn("failed to set default acl entries on %s",
 			    dest_dir);
+			acl_free(acl);
 			return (1);
 		}
+		acl_free(acl);
 	}
-
-	acl = aclgetf(source_dir, source_type);
+	acl = aclgetf(source_dir, acl_type);
 	if (acl == NULL) {
 		warn("failed to get acl entries on %s", source_dir);
 		return (1);
 	}
-	aclp = &acl->ats_acl;
-	if (aclsetf(dest_dir, dest_type, acl) < 0) {
+	if (acl_is_trivial_np(acl, &trivial)) {
+		warn("acl_is_trivial() failed on %s", source_dir);
+		acl_free(acl);
+		return (1);
+	}
+	if (trivial) {
+		acl_free(acl);
+		return (0);
+	}
+	if (aclsetf(dest_dir, acl_type, acl) < 0) {
 		warn("failed to set acl entries on %s", dest_dir);
+		acl_free(acl);
 		return (1);
 	}
+	acl_free(acl);
 	return (0);
 }
 

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.c#2 (text+ko) ====

@@ -55,7 +55,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.4 2009/05/28 04:25:38 marcel Exp $");
+__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.6 2009/09/02 04:43:46 ache Exp $");
 
 char *ee_copyright_message = 
 "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon ";
@@ -83,6 +83,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef HAS_SYS_WAIT
 #include 
@@ -100,9 +101,7 @@
 #include 
 #endif
 
-
 #ifndef NO_CATGETS
-#include 
 #include 
 
 nl_catd catalog;
@@ -726,7 +725,7 @@
 	}
 	*point = character;	/* insert new character			*/
 	wclrtoeol(text_win);
-	if (((character >= 0) && (character < ' ')) || (character >= 127)) /* check for TAB character*/
+	if (!isprint((unsigned char)character)) /* check for TAB character*/
 	{
 		scr_pos = scr_horz += out_char(text_win, character, scr_horz);
 		point++;
@@ -734,7 +733,7 @@
 	}
 	else
 	{
-		waddch(text_win, character);
+		waddch(text_win, (unsigned char)character);
 		scr_pos = ++scr_horz;
 		point++;
 		position ++;
@@ -969,17 +968,17 @@
 		}
 		else
 		{
-			waddch(window, (char)character );
+			waddch(window, (unsigned char)character );
 			return(1);
 		}
 	}
 	else
 	{
-		waddch(window, (char)character);
+		waddch(window, (unsigned char)character);
 		return(1);
 	}
 	for (i2 = 0; (string[i2] != '\0') && (((column+i2+1)-horiz_offset) < last_col); i2++)
-		waddch(window, string[i2]);
+		waddch(window, (unsigned char)string[i2]);
 	return(strlen(string));
 }
 
@@ -1044,7 +1043,7 @@
 	wclrtoeol(text_win);
 	while ((posit < length) && (column <= last_col))
 	{
-		if ((*temp < 32) || (*temp >= 127))
+		if (!isprint(*temp))
 		{
 			column += len_char(*temp, abs_column);
 			abs_column += out_char(text_win, *temp, abs_column);
@@ -1923,13 +1922,13 @@
 			}
 			*nam_str = in;
 			g_pos++;
-			if (((in < ' ') || (in > 126)) && (g_horz < (last_col - 1)))
+			if (!isprint((unsigned char)in) && (g_horz < (last_col - 1)))
 				g_horz += out_char(com_win, in, g_horz);
 			else
 			{
 				g_horz++;
 				if (g_horz < (last_col - 1))
-					waddch(com_win, in);
+					waddch(com_win, (unsigned char)in);
 			}
 			nam_str++;
 		}
@@ -5085,8 +5084,8 @@
 {
 	int counter;
 
+	setlocale(LC_ALL, "");
 #ifndef NO_CATGETS
-	setlocale(LC_ALL, "");
 	catalog = catopen("ee", NL_CAT_LOCALE);
 #endif /* NO_CATGETS */
 

==== //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.375 2009/06/07 13:26:57 edwin Exp $
+# $FreeBSD: src/etc/Makefile,v 1.376 2009/09/02 14:54:47 flz Exp $
 
 .include 
 
@@ -99,8 +99,7 @@
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
-MTREE=	BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
-	BSD.var.dist BSD.x11.dist BSD.x11-4.dist
+MTREE=	BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
 .if ${MK_SENDMAIL} != "no"
 MTREE+=	BSD.sendmail.dist
 .endif

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_calc_mask.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_calc_mask.c,v 1.10 2009/06/25 12:46:59 trasz Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_calc_mask.c,v 1.11 2009/09/01 18:30:17 trasz Exp $");
 
 #include 
 #include "namespace.h"
@@ -50,12 +50,6 @@
 	acl_t		acl_new;
 	int		i, mask_mode, mask_num;
 
-	if (!_acl_brand_may_be(*acl_p, ACL_BRAND_POSIX)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	_acl_brand_as(*acl_p, ACL_BRAND_POSIX);
-
 	/*
 	 * (23.4.2.4) requires acl_p to point to a pointer to a valid ACL.
 	 * Since one of the primary reasons to use this function would be
@@ -67,6 +61,13 @@
 		errno = EINVAL;
 		return (-1);
 	}
+
+	if (!_acl_brand_may_be(*acl_p, ACL_BRAND_POSIX)) {
+		errno = EINVAL;
+		return (-1);
+	}
+	_acl_brand_as(*acl_p, ACL_BRAND_POSIX);
+
 	acl_int = &(*acl_p)->ats_acl;
 	if ((acl_int->acl_cnt < 3) || (acl_int->acl_cnt > ACL_MAX_ENTRIES)) {
 		errno = EINVAL;

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#11 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.12 2009/06/25 12:46:59 trasz Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.13 2009/09/01 18:30:17 trasz Exp $");
 
 #include 
 #include "namespace.h"
@@ -70,11 +70,6 @@
 	if (buf == NULL)
 		return(NULL);
 
-	if (acl == NULL) {
-		errno = EINVAL;
-		return(NULL);
-	}
-
 	acl_int = &acl->ats_acl;
 
 	mask_perm = ACL_PERM_BITS;	/* effective is regular if no mask */
@@ -243,6 +238,11 @@
 acl_to_text_np(acl_t acl, ssize_t *len_p, int flags)
 {
 
+	if (acl == NULL) {
+		errno = EINVAL;
+		return(NULL);
+	}
+
 	switch (_acl_brand(acl)) {
 	case ACL_BRAND_POSIX:
 		return (_posix1e_acl_to_text(acl, len_p, flags));

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/strptime.c#3 (text+ko) ====

@@ -59,7 +59,7 @@
 static char sccsid[] __unused = "@(#)strptime.c	0.1 (Powerdog) 94/03/27";
 #endif /* !defined NOID */
 #endif /* not lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.36 2009/06/25 23:59:23 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.37 2009/09/02 04:56:30 ache Exp $");
 
 #include "namespace.h"
 #include 
@@ -529,7 +529,7 @@
 			buf++;
 			i = 0;
 			for (len = 4; len > 0; len--) {
-				if (isdigit((int)*buf)) {
+				if (isdigit((unsigned char)*buf)) {
 					i *= 10;
 					i += *buf - '0';
 					buf++;

==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#13 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.60 2009/08/14 21:05:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.61 2009/09/02 00:39:59 jhb Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -990,18 +990,21 @@
 	 * we don't lose an interrupt delivery race.
 	 */
 	td = curthread;
-	thread_lock(td);
-	if (sched_is_bound(td))
-		panic("apic_free_vector: Thread already bound.\n");
-	sched_bind(td, apic_cpuid(apic_id));
-	thread_unlock(td);
+	if (!rebooting) {
+		thread_lock(td);
+		if (sched_is_bound(td))
+			panic("apic_free_vector: Thread already bound.\n");
+		sched_bind(td, apic_cpuid(apic_id));
+		thread_unlock(td);
+	}
 	mtx_lock_spin(&icu_lock);
 	lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1;
 	mtx_unlock_spin(&icu_lock);
-	thread_lock(td);
-	sched_unbind(td);
-	thread_unlock(td);
-
+	if (!rebooting) {
+		thread_lock(td);
+		sched_unbind(td);
+		thread_unlock(td);
+	}
 }
 
 /* Map an IDT vector (APIC) to an IRQ (interrupt source). */

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_core.c#5 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_core.c,v 1.5 2009/08/14 21:05:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_core.c,v 1.6 2009/09/01 17:55:37 gnn Exp $");
 
 #include 
 #include 
@@ -1182,6 +1182,29 @@
     IAPDESCR(DBH_01H, 0xDB, 0x01, IAP_F_FM | IAP_F_I7),
     IAPDESCR(E4H_01H, 0xE4, 0x01, IAP_F_FM | IAP_F_I7),
     IAPDESCR(E5H_01H, 0xE5, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(E6H_01H, 0xE6, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(E6H_02H, 0xE6, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(E8H_01H, 0xE8, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(E8H_02H, 0xE8, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(E8H_03H, 0xE8, 0x03, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_01H, 0xF0, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_02H, 0xF0, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_04H, 0xF0, 0x04, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_08H, 0xF0, 0x08, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_10H, 0xF0, 0x10, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_20H, 0xF0, 0x20, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_40H, 0xF0, 0x40, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F0H_80H, 0xF0, 0x80, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F1H_02H, 0xF1, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F1H_04H, 0xF1, 0x04, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F1H_07H, 0xF1, 0x07, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F2H_01H, 0xF2, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F2H_02H, 0xF2, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F2H_04H, 0xF2, 0x04, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F2H_08H, 0xF2, 0x08, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F2H_0FH, 0xF2, 0x0F, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F3H_01H, 0xF3, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(F3H_02H, 0xF3, 0x02, IAP_F_FM | IAP_F_I7),
     IAPDESCR(F3H_04H, 0xF3, 0x04, IAP_F_FM | IAP_F_I7),
     IAPDESCR(F3H_08H, 0xF3, 0x08, IAP_F_FM | IAP_F_I7),
     IAPDESCR(F3H_10H, 0xF3, 0x10, IAP_F_FM | IAP_F_I7),

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/pmc_events.h#6 (text+ko) ====

@@ -23,14 +23,24 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/hwpmc/pmc_events.h,v 1.9 2009/01/27 07:29:37 jeff Exp $
+ * $FreeBSD: src/sys/dev/hwpmc/pmc_events.h,v 1.10 2009/09/01 17:55:37 gnn Exp $
  */
 
 #ifndef _DEV_HWPMC_PMC_EVENTS_H_
 #define	_DEV_HWPMC_PMC_EVENTS_H_
 
-/*
- * PMC event codes.
+/* 
+ * Note: Documentation on adding events can be found both in
+ * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms
+ * as well as on-line at:
+ *
+ * http://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
+ *
+ * Please refer to those resources before you attempt to modify
+ * this file or the hwpmc driver/subsystem.
+ */
+
+/* * PMC event codes.
  *
  * __PMC_EV(CLASS, SYMBOLIC-NAME)
  *
@@ -973,7 +983,30 @@
 __PMC_EV(IAP, EVENT_FDH_08H)			\
 __PMC_EV(IAP, EVENT_FDH_10H)			\
 __PMC_EV(IAP, EVENT_FDH_20H)			\
-__PMC_EV(IAP, EVENT_FDH_40H)
+__PMC_EV(IAP, EVENT_FDH_40H)			\
+__PMC_EV(IAP, EVENT_E6H_02H)			\
+__PMC_EV(IAP, EVENT_E8H_01H)			\
+__PMC_EV(IAP, EVENT_E8H_02H)			\
+__PMC_EV(IAP, EVENT_E8H_03H)			\
+__PMC_EV(IAP, EVENT_F0H_01H)			\
+__PMC_EV(IAP, EVENT_F0H_02H)			\
+__PMC_EV(IAP, EVENT_F0H_04H)			\
+__PMC_EV(IAP, EVENT_F0H_08H)			\
+__PMC_EV(IAP, EVENT_F0H_10H)			\
+__PMC_EV(IAP, EVENT_F0H_20H)			\
+__PMC_EV(IAP, EVENT_F0H_40H)			\
+__PMC_EV(IAP, EVENT_F0H_80H)			\
+__PMC_EV(IAP, EVENT_F1H_02H)			\
+__PMC_EV(IAP, EVENT_F1H_04H)			\
+__PMC_EV(IAP, EVENT_F1H_07H)			\
+__PMC_EV(IAP, EVENT_F2H_01H)			\
+__PMC_EV(IAP, EVENT_F2H_02H)			\
+__PMC_EV(IAP, EVENT_F2H_04H)			\
+__PMC_EV(IAP, EVENT_F2H_08H)			\
+__PMC_EV(IAP, EVENT_F2H_0FH)			\
+__PMC_EV(IAP, EVENT_F3H_01H)			\
+__PMC_EV(IAP, EVENT_F3H_02H)			
+
 
 #define	PMC_EV_IAP_FIRST	PMC_EV_IAP_EVENT_02H_81H
 #define	PMC_EV_IAP_LAST		PMC_EV_IAP_EVENT_FDH_40H
@@ -1894,6 +1927,29 @@
 __PMC_EV_ALIAS("BR_INST_DECODED",			IAP_EVENT_E0H_01H) \
 __PMC_EV_ALIAS("BOGUS_BR",				IAP_EVENT_E4H_01H) \
 __PMC_EV_ALIAS("BPU_MISSED_CALL_RET",			IAP_EVENT_E5H_01H) \
+__PMC_EV_ALIAS("BACLEAR.CLEAR",				IAP_EVENT_E6H_01H) \
+__PMC_EV_ALIAS("BACLEAR.BAD_TARGET",			IAP_EVENT_E6H_02H) \
+__PMC_EV_ALIAS("BPU_CLEARS.EARLY",			IAP_EVENT_E8H_01H) \
+__PMC_EV_ALIAS("BPU_CLEARS.LATE",			IAP_EVENT_E8H_02H) \
+__PMC_EV_ALIAS("BPU_CLEARS.ANY",			IAP_EVENT_E8H_03H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.LOAD",			IAP_EVENT_F0H_01H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.RFO",			IAP_EVENT_F0H_02H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.IFETCH",		IAP_EVENT_F0H_04H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.PREFETCH",		IAP_EVENT_F0H_08H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.L1D_WB",		IAP_EVENT_F0H_10H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.FILL",			IAP_EVENT_F0H_20H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.WB",			IAP_EVENT_F0H_40H) \
+__PMC_EV_ALIAS("L2_TRANSACTIONS.ANY",			IAP_EVENT_F0H_80H) \
+__PMC_EV_ALIAS("L2_LINES_IN.S_STATE",			IAP_EVENT_F1H_02H) \
+__PMC_EV_ALIAS("L2_LINES_IN.E_STATE",			IAP_EVENT_F1H_04H) \
+__PMC_EV_ALIAS("L2_LINES_IN.ANY",			IAP_EVENT_F1H_07H) \
+__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN",		IAP_EVENT_F2H_01H) \
+__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY",		IAP_EVENT_F2H_02H) \
+__PMC_EV_ALIAS("L2_LINES_OUT.PREFETCH_CLEAN",		IAP_EVENT_F2H_04H) \
+__PMC_EV_ALIAS("L2_LINES_OUT.PREFETCH_DIRTY",		IAP_EVENT_F2H_08H) \
+__PMC_EV_ALIAS("L2_LINES_OUT.ANY",			IAP_EVENT_F2H_0FH) \
+__PMC_EV_ALIAS("L2_HW_PREFETCH.HIT",			IAP_EVENT_F3H_01H) \
+__PMC_EV_ALIAS("L2_HW_PREFETCH.ALLOC",			IAP_EVENT_F3H_02H) \
 __PMC_EV_ALIAS("L2_HW_PREFETCH.DATA_TRIGGER",		IAP_EVENT_F3H_04H) \
 __PMC_EV_ALIAS("L2_HW_PREFETCH.CODE_TRIGGER",		IAP_EVENT_F3H_08H) \
 __PMC_EV_ALIAS("L2_HW_PREFETCH.DCA_TRIGGER",		IAP_EVENT_F3H_10H) \

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#27 (text+ko) ====

@@ -89,7 +89,7 @@
 
 #define HDA_DRV_TEST_REV	"20090624_0136"
 
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.110 2009/08/20 19:17:53 jhb Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.111 2009/09/02 11:39:19 mav Exp $");
 
 #define HDA_BOOTVERBOSE(stmt)	do {			\
 	if (bootverbose != 0 || snd_verbose > 3) {	\
@@ -1520,7 +1520,7 @@
 	sc->num_iss = HDAC_GCAP_ISS(gcap);
 	sc->num_oss = HDAC_GCAP_OSS(gcap);
 	sc->num_bss = HDAC_GCAP_BSS(gcap);
-
+	sc->num_sdo = HDAC_GCAP_NSDO(gcap);
 	sc->support_64bit = HDA_FLAG_MATCH(gcap, HDAC_GCAP_64OK);
 
 	corbsize = HDAC_READ_1(&sc->mem, HDAC_CORBSIZE);
@@ -1555,11 +1555,12 @@
 		return (ENXIO);
 	}
 
-	HDA_BOOTHVERBOSE(
-		device_printf(sc->dev, "    CORB size: %d\n", sc->corb_size);
-		device_printf(sc->dev, "    RIRB size: %d\n", sc->rirb_size);
-		device_printf(sc->dev, "      Streams: ISS=%d OSS=%d BSS=%d\n",
-		    sc->num_iss, sc->num_oss, sc->num_bss);
+	HDA_BOOTVERBOSE(
+		device_printf(sc->dev, "Caps: OSS %d, ISS %d, BSS %d, "
+		    "NSDO %d%s, CORB %d, RIRB %d\n",
+		    sc->num_oss, sc->num_iss, sc->num_bss, 1 << sc->num_sdo,
+		    sc->support_64bit ? ", 64bit" : "",
+		    sc->corb_size, sc->rirb_size);
 	);
 
 	return (0);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac_private.h#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/sys/dev/sound/pci/hda/hdac_private.h,v 1.10 2008/11/23 20:03:58 mav Exp $
+ * $FreeBSD: src/sys/dev/sound/pci/hda/hdac_private.h,v 1.11 2009/09/02 11:39:19 mav Exp $
  */
 
 #ifndef _HDAC_PRIVATE_H_
@@ -339,6 +339,7 @@
 	int		num_iss;
 	int		num_oss;
 	int		num_bss;
+	int		num_sdo;
 	int		support_64bit;
 	int		streamcnt;
 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac_reg.h#2 (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/sound/pci/hda/hdac_reg.h,v 1.1 2006/10/01 11:12:59 ariff Exp $
+ * $FreeBSD: src/sys/dev/sound/pci/hda/hdac_reg.h,v 1.2 2009/09/02 11:39:19 mav Exp $
  */
 
 #ifndef _HDAC_REG_H_
@@ -136,6 +136,8 @@
 	(((gcap) & HDAC_GCAP_ISS_MASK) >> HDAC_GCAP_ISS_SHIFT)
 #define HDAC_GCAP_OSS(gcap)						\
 	(((gcap) & HDAC_GCAP_OSS_MASK) >> HDAC_GCAP_OSS_SHIFT)
+#define HDAC_GCAP_NSDO(gcap)						\
+	(((gcap) & HDAC_GCAP_NSDO_MASK) >> HDAC_GCAP_NSDO_SHIFT)
 
 /* GCTL - Global Control */
 #define HDAC_GCTL_CRST			0x00000001

==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#14 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.63 2009/08/14 21:05:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.64 2009/09/02 00:39:59 jhb Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -994,18 +994,21 @@
 	 * we don't lose an interrupt delivery race.
 	 */
 	td = curthread;
-	thread_lock(td);
-	if (sched_is_bound(td))
-		panic("apic_free_vector: Thread already bound.\n");
-	sched_bind(td, apic_cpuid(apic_id));
-	thread_unlock(td);
+	if (!rebooting) {
+		thread_lock(td);
+		if (sched_is_bound(td))
+			panic("apic_free_vector: Thread already bound.\n");
+		sched_bind(td, apic_cpuid(apic_id));
+		thread_unlock(td);
+	}
 	mtx_lock_spin(&icu_lock);
 	lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1;
 	mtx_unlock_spin(&icu_lock);
-	thread_lock(td);
-	sched_unbind(td);
-	thread_unlock(td);
-
+	if (!rebooting) {
+		thread_lock(td);
+		sched_unbind(td);
+		thread_unlock(td);
+	}
 }
 
 /* Map an IDT vector (APIC) to an IRQ (interrupt source). */

==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#22 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.208 2009/08/01 19:26:27 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.209 2009/09/01 17:53:01 bz Exp $");
 
 #include "opt_inet.h"
 #include "opt_carp.h"
@@ -462,11 +462,11 @@
 	struct rtentry *rt;
 	struct ifaddr *ifa;
 	struct in_ifaddr *ia;
+	struct mbuf *hold;
 	struct sockaddr sa;
 	struct in_addr isaddr, itaddr, myaddr;
 	u_int8_t *enaddr = NULL;
 	int op, flags;
-	struct mbuf *m0;
 	int req_len;
 	int bridged = 0, is_bridge = 0;
 #ifdef DEV_CARP
@@ -631,11 +631,13 @@
 				    la->lle_tbl->llt_ifp->if_xname,
 				    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
 				    ifp->if_xname);
+			LLE_WUNLOCK(la);
 			goto reply;
 		}
 		if ((la->la_flags & LLE_VALID) &&
 		    bcmp(ar_sha(ah), &la->ll_addr, ifp->if_addrlen)) {
 			if (la->la_flags & LLE_STATIC) {
+				LLE_WUNLOCK(la);
 				log(LOG_ERR,
 				    "arp: %*D attempts to modify permanent "
 				    "entry for %s on %s\n",
@@ -655,6 +657,7 @@
 		}
 		    
 		if (ifp->if_addrlen != ah->ar_hln) {
+			LLE_WUNLOCK(la);
 			log(LOG_WARNING,
 			    "arp from %*D: addr len: new %d, i/f %d (ignored)",
 			    ifp->if_addrlen, (u_char *) ar_sha(ah), ":",
@@ -671,15 +674,14 @@
 		}
 		la->la_asked = 0;
 		la->la_preempt = V_arp_maxtries;
-		if (la->la_hold != NULL) {
-			m0 = la->la_hold;
-			la->la_hold = 0;
+		hold = la->la_hold;
+		if (hold != NULL) {
+			la->la_hold = NULL;
 			memcpy(&sa, L3_ADDR(la), sizeof(sa));
-			LLE_WUNLOCK(la);
-			
-			(*ifp->if_output)(ifp, m0, &sa, NULL);
-			return;
 		}
+		LLE_WUNLOCK(la);
+		if (hold != NULL)
+			(*ifp->if_output)(ifp, hold, &sa, NULL);
 	}
 reply:
 	if (op != ARPOP_REQUEST)
@@ -750,8 +752,6 @@
 #endif
 	}
 
-	if (la != NULL)
-		LLE_WUNLOCK(la);
 	if (itaddr.s_addr == myaddr.s_addr &&
 	    IN_LINKLOCAL(ntohl(itaddr.s_addr))) {
 		/* RFC 3927 link-local IPv4; always reply by broadcast. */
@@ -777,8 +777,6 @@
 	return;
 
 drop:
-	if (la != NULL)
-		LLE_WUNLOCK(la);
 	m_freem(m);
 }
 #endif

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#11 (text+ko) ====

@@ -5,7 +5,7 @@
 #
 # WARNING: Creates files in unsafe way.
 #
-# $FreeBSD: src/tools/regression/acltools/tools-posix.test,v 1.4 2009/08/31 20:11:35 trasz Exp $
+# $FreeBSD: src/tools/regression/acltools/tools-posix.test,v 1.5 2009/09/01 15:51:36 trasz Exp $
 
 $ whoami
 > root

==== //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.75 2009/08/31 17:50:33 dougb Exp $ */
+/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.76 2009/09/02 13:58:15 flz Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -102,10 +102,10 @@
 #define PKG_PREFIX_VNAME	"PKG_PREFIX"
 
 /*
- * Version of the package tools - increase only when some
- * functionality used by bsd.port.mk is changed, added or removed
+ * Version of the package tools - increase whenever you make a change
+ * in the code that is not cosmetic only.
  */
-#define PKG_INSTALL_VERSION	20090519
+#define PKG_INSTALL_VERSION	20090902
 
 #define PKG_WRAPCONF_FNAME	"/var/db/pkg_install.conf"
 #define main(argc, argv)	real_main(argc, argv)

From owner-p4-projects@FreeBSD.ORG  Wed Sep  2 18:28:37 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8F121065672; Wed,  2 Sep 2009 18:28:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD8331065670
	for ; Wed,  2 Sep 2009 18:28:36 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 829EB8FC1C
	for ; Wed,  2 Sep 2009 18:28:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n82ISaXr021679
	for ; Wed, 2 Sep 2009 18:28:36 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n82ISapx021677
	for perforce@freebsd.org; Wed, 2 Sep 2009 18:28:36 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 2 Sep 2009 18:28:36 GMT
Message-Id: <200909021828.n82ISapx021677@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168082 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, 02 Sep 2009 18:28:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=168082

Change 168082 by rene@rene_self on 2009/09/02 18:27:50

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/www/en/docs/books.sgml#2 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -1070,8 +1070,7 @@
       Other Virtualization Options
 
       There is ongoing work in getting &xen;
-	to work as a host environment on &os;.  An experimental version of
-	this will appear in &os; 8.0.
+	to work as a host environment on &os;.
     
   
 

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#10 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -1104,8 +1104,7 @@
       Andere mogelijkheden voor virtualisatie
 
       Er wordt gewerkt om &xen; als een
-	gastheer-omgeving op &os; te laten draaien.  Een experimentele versie
-	zal verschijnen in &os; 8.0.
+	gastheer-omgeving op &os; te laten draaien.
     
   
 

From owner-p4-projects@FreeBSD.ORG  Wed Sep  2 18:55:06 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D01671065695; Wed,  2 Sep 2009 18:55:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 946401065693
	for ; Wed,  2 Sep 2009 18:55:05 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 631678FC16
	for ; Wed,  2 Sep 2009 18:55:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n82It5gV023612
	for ; Wed, 2 Sep 2009 18:55:05 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n82It5EF023610
	for perforce@freebsd.org; Wed, 2 Sep 2009 18:55:05 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 2 Sep 2009 18:55:05 GMT
Message-Id: <200909021855.n82It5EF023610@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168084 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, 02 Sep 2009 18:55:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=168084

Change 168084 by mav@mav_mavbook on 2009/09/02 18:54:19

	Revert rtc change. Lock need to be spinning as it is called in
	interrupt filter context. while it would be good to split locks,
	left it for later.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#29 edit
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#27 edit
.. //depot/projects/scottl-camlock/src/sys/isa/atrtc.c#4 edit
.. //depot/projects/scottl-camlock/src/sys/isa/rtc.h#6 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#29 (text+ko) ====

@@ -1592,7 +1592,6 @@
 	 * initialization can use DELAY().
 	 */
 	i8254_init();
-	atrtc_init();
 
 	/*
 	 * Initialize the console before we print anything out.

==== //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#27 (text+ko) ====

@@ -2580,7 +2580,6 @@
 	 * initialization can use DELAY().
 	 */
 	i8254_init();
-	atrtc_init();
 #endif
 	
 	/*
@@ -2835,7 +2834,6 @@
 	 * initialization can use DELAY().
 	 */
 	i8254_init();
-	atrtc_init();
 
 	/*
 	 * Initialize the console before we print anything out.

==== //depot/projects/scottl-camlock/src/sys/isa/atrtc.c#4 (text+ko) ====

@@ -46,14 +46,11 @@
 #include 
 #endif
 
-#define	RTC_LOCK_INIT						\
-	mtx_init(&rtc_lock, "rtc", NULL, MTX_NOPROFILE)
-#define	RTC_LOCK	mtx_lock(&rtc_lock)
-#define	RTC_UNLOCK	mtx_unlock(&rtc_lock)
+#define	RTC_LOCK	mtx_lock_spin(&clock_lock)
+#define	RTC_UNLOCK	mtx_unlock_spin(&clock_lock)
 
 int	atrtcclock_disable = 0;
 
-static  struct mtx rtc_lock;
 static	int	rtc_reg = -1;
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
 static	u_char	rtc_statusb = RTCSB_24HR;
@@ -62,12 +59,6 @@
  * RTC support routines
  */
 
-void
-atrtc_init(void)
-{
-	RTC_LOCK_INIT;
-}
-
 int
 rtcin(int reg)
 {

==== //depot/projects/scottl-camlock/src/sys/isa/rtc.h#6 (text+ko) ====

@@ -112,9 +112,9 @@
 #define	RTC_CENTURY	0x32	/* current century */
 
 #ifdef _KERNEL
+extern  struct mtx clock_lock;
 extern	int atrtcclock_disable;
 int	atrtc_setup_clock(void);
-void	atrtc_init(void);
 int	rtcin(int reg);
 void	atrtc_start(void);
 void	atrtc_rate(unsigned rate);

From owner-p4-projects@FreeBSD.ORG  Wed Sep  2 20:58:06 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6FF681065676; Wed,  2 Sep 2009 20:58:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 636021065670
	for ; Wed,  2 Sep 2009 20:58:05 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 52FD68FC0C
	for ; Wed,  2 Sep 2009 20:58:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n82Kw53T044522
	for ; Wed, 2 Sep 2009 20:58:05 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n82Kw5MR044520
	for perforce@freebsd.org; Wed, 2 Sep 2009 20:58:05 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 2 Sep 2009 20:58:05 GMT
Message-Id: <200909022058.n82Kw5MR044520@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168090 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, 02 Sep 2009 20:58:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=168090

Change 168090 by trasz@trasz_anger on 2009/09/02 20:57:21

	Adapt to recent error message changes in cp(1).

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#3 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#3 (text+ko) ====

@@ -119,7 +119,7 @@
 # mv from POSIX.1e to NFSv4.
 $ rm -f nfs4/xxx
 $ cp -p posix/xxx nfs4/xxx
-> cp: ACL brand of source is POSIX.1e, but destination is NFSv4; ACL not copied
+> cp: failed to set acl entries for nfs4/xxx: Operation not supported
 $ ls -l nfs4/xxx | cut -d' ' -f1
 > -rw-rwxr--
 
@@ -137,12 +137,13 @@
 >          everyone@:-wxp---A-W-Co-:------:deny
 >          everyone@:r-----a-R-c--s:------:allow
 
-# mv from NFSv4 to POSIX.1e.
+# cp from NFSv4 to POSIX.1e.
 $ rm -f posix/xxx
 $ cp -p nfs4/xxx posix/xxx
-> cp: ACL brand of source is NFSv4, but destination is POSIX.1e; ACL not copied
+> cp: failed to set acl entries for posix/xxx: Operation not supported
 $ ls -l posix/xxx | cut -d' ' -f1
 > -rw-rwxr--
 
 $ cp -p nfs4/yyy none/xxx
+> cp: failed to set acl entries for none/xxx: Operation not supported
 

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 11:22:50 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 35D1D1065676; Thu,  3 Sep 2009 11:22:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D671F1065670
	for ; Thu,  3 Sep 2009 11:22:49 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C50918FC14
	for ; Thu,  3 Sep 2009 11:22:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83BMnCx052458
	for ; Thu, 3 Sep 2009 11:22:49 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83BMnP5052456
	for perforce@freebsd.org; Thu, 3 Sep 2009 11:22:49 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Thu, 3 Sep 2009 11:22:49 GMT
Message-Id: <200909031122.n83BMnP5052456@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168098 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, 03 Sep 2009 11:22:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=168098

Change 168098 by anchie@anchie_malimis on 2009/09/03 11:21:58

	Deleting unrelated noise.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#20 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#11 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#19 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#11 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#20 (text+ko) ====

@@ -1,4 +1,4 @@
-/*
+/*- 
  * Copyright (c) 1988, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *

==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#11 (text+ko) ====

@@ -127,9 +127,6 @@
 #define ICMP6_NI_REPLY			140	/* node information reply */
 #define MLDV2_LISTENER_REPORT		143	/* RFC3810 listener report */
 
-#define SEND_CERT_PATH_SOLICIT		148	/* cert path solicitation */
-#define SEND_CERT_PATH_ADVERT		149	/* cert path advertisement */
-
 /* The definitions below are experimental. TBA */
 #define MLD_MTRACE_RESP			200	/* mtrace resp (to sender) */
 #define MLD_MTRACE			201	/* mtrace messages */
@@ -618,7 +615,6 @@
 	kmod_icmp6stat_inc(offsetof(struct icmp6stat, name) / sizeof(u_quad_t))
 #endif
 
-
 /*
  * Names for ICMP sysctl objects
  */

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#19 (text+ko) ====

@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
  *
@@ -1871,7 +1871,6 @@
 		
 		nd6_llinfo_settimer(ln,
 		    (long)ND_IFINFO(ifp)->retrans * hz / 1000);
-
 		nd6_ns_output(ifp, NULL, &dst->sin6_addr, ln, 0);
 	}
 	return (0);
@@ -1918,7 +1917,9 @@
 	 * after the lock is dropped
 	 */
 
-	/* This will be done in the input hook. */
+	/* XXX-AK: In case of SeND loaded, this should be added to 
+	 * the input hook. 
+	 */
 	if (lle != NULL) {
 		if (*chain == NULL)
 			*chain = m;
@@ -1936,8 +1937,9 @@
 	}
 
 	/* 
-	 * In case of NS and NA, we end-up here after calling nd6_ns_output() 
-	 * or nd6_na_output(). RS, RA, and Redirect do not have such output 
+	 * In case of NS, NA and Redirect, we end-up here after calling 
+	 * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output(). 
+	 * RS and RA do not have such output 
 	 * routines. They are handled instead by rtadvd and rtsol daemons. 
 	 *
 	 * if_output() routines together with previous chaining will be called 
@@ -1949,7 +1951,6 @@
 		    NULL));
 	}
 	error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, NULL);
-
 	return (error);
 
   bad:
@@ -2090,11 +2091,9 @@
 	IF_AFDATA_LOCK(ifp);
 	ln = lla_lookup(LLTABLE6(ifp), 0, dst);
 	IF_AFDATA_UNLOCK(ifp);
-	/* ToFix: ln == NULL! lla_lookup -> generic link layer lookup func. */
 	if ((ln == NULL) || !(ln->la_flags & LLE_VALID)) {
-		if (ln != NULL) {
+		if (ln != NULL)
 			LLE_RUNLOCK(ln);
-		}
 		/* this could happen, if we could not allocate memory */
 		m_freem(m);
 		return (1);

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
  *

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 12:34:08 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 26E0C1065676; Thu,  3 Sep 2009 12:34:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DFA23106566C
	for ; Thu,  3 Sep 2009 12:34:07 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CF3C98FC1F
	for ; Thu,  3 Sep 2009 12:34:07 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83CY71Z058639
	for ; Thu, 3 Sep 2009 12:34:07 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83CY7Nl058637
	for perforce@freebsd.org; Thu, 3 Sep 2009 12:34:07 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 3 Sep 2009 12:34:07 GMT
Message-Id: <200909031234.n83CY7Nl058637@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168100 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, 03 Sep 2009 12:34:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=168100

Change 168100 by mav@mav_mavbook on 2009/09/03 12:34:06

	ATI SB600 can't handle 256 sectors transfers with FPDMA (NCQ).

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#59 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#59 (text+ko) ====

@@ -1942,6 +1942,9 @@
 		cpi->protocol = PROTO_ATA;
 		cpi->protocol_version = PROTO_VERSION_UNSPECIFIED;
 		cpi->maxio = MAXPHYS;
+		/* ATI SB600 can't handle 256 sectors with FPDMA (NCQ). */
+		if (pci_get_devid(device_get_parent(dev)) == 0x43801002)
+			cpi->maxio = min(cpi->maxio, 255 * 512);
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 13:18:57 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B193B1065670; Thu,  3 Sep 2009 13:18:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5CEA3106566B
	for ; Thu,  3 Sep 2009 13:18:57 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4ACA38FC12
	for ; Thu,  3 Sep 2009 13:18:57 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83DIvZk073096
	for ; Thu, 3 Sep 2009 13:18:57 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83DIuEx073094
	for perforce@freebsd.org; Thu, 3 Sep 2009 13:18:56 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 3 Sep 2009 13:18:56 GMT
Message-Id: <200909031318.n83DIuEx073094@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168102 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, 03 Sep 2009 13:18:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=168102

Change 168102 by mav@mav_mavtest on 2009/09/03 13:18:30

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#13 integrate
.. //depot/projects/scottl-camlock/src/bin/chmod/chmod.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/cp/utils.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/ls/print.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/ee/ee.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.local.dist#4 delete
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.x11-4.dist#3 delete
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.x11.dist#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/locale/ctype.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/digittoint.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isalnum.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isalpha.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isascii.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/iscntrl.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isdigit.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isideogram.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/islower.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isphonogram.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isprint.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/ispunct.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isrune.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isspace.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isspecial.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isupper.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isxdigit.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/toascii.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/tolower.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/toupper.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_calc_mask.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_to_text.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdtime/strptime.c#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ips.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/make.conf.5#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#45 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#21 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.i386#21 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#15 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#19 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#60 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/pmc_events.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac_private.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/Makefile#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/gensequences#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/sequences#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken.c#4 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken_demo.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken_scs.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken_stress.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken_subr.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken_subr_compat.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken_wcwidth.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/txp/if_txp.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/blkfront/blkfront.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/vesa.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/locore.s#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#26 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/gensequences#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/sequences#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken_demo.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken_scs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken_stress.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken_subr_compat.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/teken/teken_wcwidth.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#16 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-posix.test#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#5 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.206 2009/08/23 18:28:58 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.207 2009/09/02 14:56:23 flz Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,10 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
+OLD_FILES+=etc/mtree/BSD.local.dist
+OLD_FILES+=etc/mtree/BSD.x11.dist
+OLD_FILES+=etc/mtree/BSD.x11-4.dist
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20090719: library version bump for 8.0

==== //depot/projects/scottl-camlock/src/bin/chmod/chmod.c#4 (text+ko) ====

@@ -39,9 +39,9 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.35 2009/07/01 15:52:19 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.37 2009/09/02 05:26:59 trasz Exp $");
 
-#include 
+#include 
 #include 
 
 #include 
@@ -54,7 +54,7 @@
 #include 
 
 static void usage(void);
-static int may_have_nfs4acl(const FTSENT *ent);
+static int may_have_nfs4acl(const FTSENT *ent, int hflag);
 
 int
 main(int argc, char *argv[])
@@ -62,11 +62,10 @@
 	FTS *ftsp;
 	FTSENT *p;
 	mode_t *set;
-	int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval;
+	int Hflag, Lflag, Rflag, ch, error, fflag, fts_options, hflag, rval;
 	int vflag;
 	char *mode;
 	mode_t newmode;
-	int (*change_mode)(const char *, mode_t);
 
 	set = NULL;
 	Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
@@ -140,11 +139,6 @@
 	} else
 		fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL;
 
-	if (hflag)
-		change_mode = lchmod;
-	else
-		change_mode = chmod;
-
 	mode = *argv;
 	if ((set = setmode(mode)) == NULL)
 		errx(1, "invalid file mode: %s", mode);
@@ -175,7 +169,6 @@
 			 */
 			if (!hflag)
 				continue;
-			/* else */
 			/* FALLTHROUGH */
 		default:
 			break;
@@ -186,12 +179,18 @@
 		 * identical to the one computed from an ACL will change
 		 * that ACL.
 		 */
-		if (may_have_nfs4acl(p) == 0 &&
+		if (may_have_nfs4acl(p, hflag) == 0 &&
 		    (newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS))
 				continue;
-		if ((*change_mode)(p->fts_accpath, newmode) && !fflag) {
-			warn("%s", p->fts_path);
-			rval = 1;
+		if (hflag)
+			error = lchmod(p->fts_accpath, newmode);
+		else
+			error = chmod(p->fts_accpath, newmode);
+		if (error) {
+			if (!fflag) {
+				warn("%s", p->fts_path);
+				rval = 1;
+			}
 		} else {
 			if (vflag) {
 				(void)printf("%s", p->fts_path);
@@ -202,7 +201,6 @@
 					strmode(p->fts_statp->st_mode, m1);
 					strmode((p->fts_statp->st_mode &
 					    S_IFMT) | newmode, m2);
-
 					(void)printf(": 0%o [%s] -> 0%o [%s]",
 					    p->fts_statp->st_mode, m1,
 					    (p->fts_statp->st_mode & S_IFMT) |
@@ -210,12 +208,10 @@
 				}
 				(void)printf("\n");
 			}
-
 		}
 	}
 	if (errno)
 		err(1, "fts_read");
-	free(set);
 	exit(rval);
 }
 
@@ -228,17 +224,20 @@
 }
 
 static int
-may_have_nfs4acl(const FTSENT *ent)
+may_have_nfs4acl(const FTSENT *ent, int hflag)
 {
 	int ret;
-	static dev_t previous_dev = (dev_t)-1;
+	static dev_t previous_dev = NODEV;
 	static int supports_acls = -1;
 
 	if (previous_dev != ent->fts_statp->st_dev) {
 		previous_dev = ent->fts_statp->st_dev;
 		supports_acls = 0;
 
-		ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4);
+		if (hflag)
+			ret = lpathconf(ent->fts_accpath, _PC_ACL_NFS4);
+		else
+			ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4);
 		if (ret > 0)
 			supports_acls = 1;
 		else if (ret < 0 && errno != EINVAL)

==== //depot/projects/scottl-camlock/src/bin/cp/utils.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.58 2009/05/30 10:36:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.59 2009/09/02 08:08:57 trasz Exp $");
 
 #include 
 #include 
@@ -377,24 +377,52 @@
 int
 preserve_fd_acls(int source_fd, int dest_fd)
 {
-	struct acl *aclp;
 	acl_t acl;
+	acl_type_t acl_type;
+	int acl_supported = 0, ret, trivial;
 
-	if (fpathconf(source_fd, _PC_ACL_EXTENDED) != 1 ||
-	    fpathconf(dest_fd, _PC_ACL_EXTENDED) != 1)
+	ret = fpathconf(source_fd, _PC_ACL_NFS4);
+	if (ret > 0 ) {
+		acl_supported = 1;
+		acl_type = ACL_TYPE_NFS4;
+	} else if (ret < 0 && errno != EINVAL) {
+		warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", to.p_path);
+		return (1);
+	}
+	if (acl_supported == 0) {
+		ret = fpathconf(source_fd, _PC_ACL_EXTENDED);
+		if (ret > 0 ) {
+			acl_supported = 1;
+			acl_type = ACL_TYPE_ACCESS;
+		} else if (ret < 0 && errno != EINVAL) {
+			warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
+			    to.p_path);
+			return (1);
+		}
+	}
+	if (acl_supported == 0)
 		return (0);
-	acl = acl_get_fd(source_fd);
+
+	acl = acl_get_fd_np(source_fd, acl_type);
 	if (acl == NULL) {
 		warn("failed to get acl entries while setting %s", to.p_path);
 		return (1);
 	}
-	aclp = &acl->ats_acl;
-	if (aclp->acl_cnt == 3)
+	if (acl_is_trivial_np(acl, &trivial)) {
+		warn("acl_is_trivial() failed for %s", to.p_path);
+		acl_free(acl);
+		return (1);
+	}
+	if (trivial) {
+		acl_free(acl);
 		return (0);
-	if (acl_set_fd(dest_fd, acl) < 0) {
+	}
+	if (acl_set_fd_np(dest_fd, acl, acl_type) < 0) {
 		warn("failed to set acl entries for %s", to.p_path);
+		acl_free(acl);
 		return (1);
 	}
+	acl_free(acl);
 	return (0);
 }
 
@@ -405,10 +433,31 @@
 	int (*aclsetf)(const char *, acl_type_t, acl_t);
 	struct acl *aclp;
 	acl_t acl;
+	acl_type_t acl_type;
+	int acl_supported = 0, ret, trivial;
 
-	if (pathconf(source_dir, _PC_ACL_EXTENDED) != 1 ||
-	    pathconf(dest_dir, _PC_ACL_EXTENDED) != 1)
+	ret = pathconf(source_dir, _PC_ACL_NFS4);
+	if (ret > 0) {
+		acl_supported = 1;
+		acl_type = ACL_TYPE_NFS4;
+	} else if (ret < 0 && errno != EINVAL) {
+		warn("fpathconf(..., _PC_ACL_NFS4) failed for %s", source_dir);
+		return (1);
+	}
+	if (acl_supported == 0) {
+		ret = pathconf(source_dir, _PC_ACL_EXTENDED);
+		if (ret > 0) {
+			acl_supported = 1;
+			acl_type = ACL_TYPE_ACCESS;
+		} else if (ret < 0 && errno != EINVAL) {
+			warn("fpathconf(..., _PC_ACL_EXTENDED) failed for %s",
+			    source_dir);
+			return (1);
+		}
+	}
+	if (acl_supported == 0)
 		return (0);
+
 	/*
 	 * If the file is a link we will not follow it
 	 */
@@ -419,34 +468,48 @@
 		aclgetf = acl_get_file;
 		aclsetf = acl_set_file;
 	}
-	/*
-	 * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
-	 * size ACL will be returned. So it is not safe to simply
-	 * check the pointer to see if the default ACL is present.
-	 */
-	acl = aclgetf(source_dir, ACL_TYPE_DEFAULT);
+	if (acl_type == ACL_TYPE_ACCESS) {
+		/*
+		 * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
+		 * size ACL will be returned. So it is not safe to simply
+		 * check the pointer to see if the default ACL is present.
+		 */
+		acl = aclgetf(source_dir, ACL_TYPE_DEFAULT);
+		if (acl == NULL) {
+			warn("failed to get default acl entries on %s",
+			    source_dir);
+			return (1);
+		}
+		aclp = &acl->ats_acl;
+		if (aclp->acl_cnt != 0 && aclsetf(dest_dir,
+		    ACL_TYPE_DEFAULT, acl) < 0) {
+			warn("failed to set default acl entries on %s",
+			    dest_dir);
+			acl_free(acl);
+			return (1);
+		}
+		acl_free(acl);
+	}
+	acl = aclgetf(source_dir, acl_type);
 	if (acl == NULL) {
-		warn("failed to get default acl entries on %s",
-		    source_dir);
+		warn("failed to get acl entries on %s", source_dir);
 		return (1);
 	}
-	aclp = &acl->ats_acl;
-	if (aclp->acl_cnt != 0 && aclsetf(dest_dir,
-	    ACL_TYPE_DEFAULT, acl) < 0) {
-		warn("failed to set default acl entries on %s",
-		    dest_dir);
+	if (acl_is_trivial_np(acl, &trivial)) {
+		warn("acl_is_trivial() failed on %s", source_dir);
+		acl_free(acl);
 		return (1);
 	}
-	acl = aclgetf(source_dir, ACL_TYPE_ACCESS);
-	if (acl == NULL) {
-		warn("failed to get acl entries on %s", source_dir);
-		return (1);
+	if (trivial) {
+		acl_free(acl);
+		return (0);
 	}
-	aclp = &acl->ats_acl;
-	if (aclsetf(dest_dir, ACL_TYPE_ACCESS, acl) < 0) {
+	if (aclsetf(dest_dir, acl_type, acl) < 0) {
 		warn("failed to set acl entries on %s", dest_dir);
+		acl_free(acl);
 		return (1);
 	}
+	acl_free(acl);
 	return (0);
 }
 

==== //depot/projects/scottl-camlock/src/bin/ls/print.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.80 2009/09/02 20:50:39 trasz Exp $");
 
 #include 
 #include 
@@ -70,7 +70,7 @@
 static void	endcolor(int);
 static int	colortype(mode_t);
 #endif
-static void	aclmode(char *, const FTSENT *, int *);
+static void	aclmode(char *, const FTSENT *);
 
 #define	IS_NOPRINT(p)	((p)->fts_number == NO_PRINT)
 
@@ -139,16 +139,12 @@
 #ifdef COLORLS
 	int color_printed = 0;
 #endif
-	int haveacls;
-	dev_t prevdev;
 
 	if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) &&
 	    (f_longform || f_size)) {
 		(void)printf("total %lu\n", howmany(dp->btotal, blocksize));
 	}
 
-	haveacls = 1;
-	prevdev = (dev_t)-1;
 	for (p = dp->list; p; p = p->fts_link) {
 		if (IS_NOPRINT(p))
 			continue;
@@ -159,14 +155,7 @@
 			(void)printf("%*jd ",
 			    dp->s_block, howmany(sp->st_blocks, blocksize));
 		strmode(sp->st_mode, buf);
-		/*
-		 * Cache whether or not the filesystem supports ACL's to
-		 * avoid expensive syscalls. Try again when we change devices.
-		 */
-		if (haveacls || sp->st_dev != prevdev) {
-			aclmode(buf, p, &haveacls);
-			prevdev = sp->st_dev;
-		}
+		aclmode(buf, p);
 		np = p->fts_pointer;
 		(void)printf("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
 		    sp->st_nlink, dp->s_user, np->user, dp->s_group,
@@ -612,56 +601,73 @@
 		(void)printf("%*jd ", (u_int)width, bytes);
 }
 
+/*
+ * Add a + after the standard rwxrwxrwx mode if the file has an
+ * ACL. strmode() reserves space at the end of the string.
+ */
 static void
-aclmode(char *buf, const FTSENT *p, int *haveacls)
+aclmode(char *buf, const FTSENT *p)
 {
 	char name[MAXPATHLEN + 1];
-	int entries, ret;
+	int ret, trivial;
+	static dev_t previous_dev = NODEV;
+	static int supports_acls = -1;
+	static int type = ACL_TYPE_ACCESS;
 	acl_t facl;
-	acl_entry_t ae;
 
 	/*
-	 * Add a + after the standard rwxrwxrwx mode if the file has an
-	 * extended ACL. strmode() reserves space at the end of the string.
+	 * XXX: ACLs are not supported on whiteouts and device files
+	 * residing on UFS.
 	 */
+	if (S_ISCHR(p->fts_statp->st_mode) || S_ISBLK(p->fts_statp->st_mode) ||
+	    S_ISWHT(p->fts_statp->st_mode))
+		return;
+
+	if (previous_dev == p->fts_statp->st_dev && supports_acls == 0)
+		return;
+
 	if (p->fts_level == FTS_ROOTLEVEL)
 		snprintf(name, sizeof(name), "%s", p->fts_name);
 	else
 		snprintf(name, sizeof(name), "%s/%s",
 		    p->fts_parent->fts_accpath, p->fts_name);
-	/*
-	 * We have no way to tell whether a symbolic link has an ACL since
-	 * pathconf() and acl_get_file() both follow them.  They also don't
-	 * support whiteouts.
-	 */
-	if (S_ISLNK(p->fts_statp->st_mode) || S_ISWHT(p->fts_statp->st_mode)) {
-		*haveacls = 1;
+
+	if (previous_dev != p->fts_statp->st_dev) {
+		previous_dev = p->fts_statp->st_dev;
+		supports_acls = 0;
+
+		ret = lpathconf(name, _PC_ACL_NFS4);
+		if (ret > 0) {
+			type = ACL_TYPE_NFS4;
+			supports_acls = 1;
+		} else if (ret < 0 && errno != EINVAL) {
+			warn("%s", name);
+			return;
+		}
+		if (supports_acls == 0) {
+			ret = lpathconf(name, _PC_ACL_EXTENDED);
+			if (ret > 0) {
+				type = ACL_TYPE_ACCESS;
+				supports_acls = 1;
+			} else if (ret < 0 && errno != EINVAL) {
+				warn("%s", name);
+				return;
+			}
+		}
+	}
+	if (supports_acls == 0)
 		return;
-	}
-	if ((ret = pathconf(name, _PC_ACL_EXTENDED)) <= 0) {
-		if (ret < 0 && errno != EINVAL)
-			warn("%s", name);
-		else
-			*haveacls = 0;
+	facl = acl_get_link_np(name, type);
+	if (facl == NULL) {
+		warn("%s", name);
 		return;
 	}
-	*haveacls = 1;
-	if ((facl = acl_get_file(name, ACL_TYPE_ACCESS)) != NULL) {
-		if (acl_get_entry(facl, ACL_FIRST_ENTRY, &ae) == 1) {
-			entries = 1;
-			while (acl_get_entry(facl, ACL_NEXT_ENTRY, &ae) == 1)
-				if (++entries > 3)
-					break;
-			/*
-			 * POSIX.1e requires that ACLs of type ACL_TYPE_ACCESS
-			 * must have at least three entries (owner, group,
-			 * and other). So anything with more than 3 ACLs looks
-			 * interesting to us.
-			 */
-			if (entries > 3)
-				buf[10] = '+';
-		}
+	if (acl_is_trivial_np(facl, &trivial)) {
 		acl_free(facl);
-	} else
 		warn("%s", name);
+		return;
+	}
+	if (!trivial)
+		buf[10] = '+';
+	acl_free(facl);
 }

==== //depot/projects/scottl-camlock/src/contrib/ee/ee.c#2 (text+ko) ====

@@ -55,7 +55,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.4 2009/05/28 04:25:38 marcel Exp $");
+__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.6 2009/09/02 04:43:46 ache Exp $");
 
 char *ee_copyright_message = 
 "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon ";
@@ -83,6 +83,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef HAS_SYS_WAIT
 #include 
@@ -100,9 +101,7 @@
 #include 
 #endif
 
-
 #ifndef NO_CATGETS
-#include 
 #include 
 
 nl_catd catalog;
@@ -726,7 +725,7 @@
 	}
 	*point = character;	/* insert new character			*/
 	wclrtoeol(text_win);
-	if (((character >= 0) && (character < ' ')) || (character >= 127)) /* check for TAB character*/
+	if (!isprint((unsigned char)character)) /* check for TAB character*/
 	{
 		scr_pos = scr_horz += out_char(text_win, character, scr_horz);
 		point++;
@@ -734,7 +733,7 @@
 	}
 	else
 	{
-		waddch(text_win, character);
+		waddch(text_win, (unsigned char)character);
 		scr_pos = ++scr_horz;
 		point++;
 		position ++;
@@ -969,17 +968,17 @@
 		}
 		else
 		{
-			waddch(window, (char)character );
+			waddch(window, (unsigned char)character );
 			return(1);
 		}
 	}
 	else
 	{
-		waddch(window, (char)character);
+		waddch(window, (unsigned char)character);
 		return(1);
 	}
 	for (i2 = 0; (string[i2] != '\0') && (((column+i2+1)-horiz_offset) < last_col); i2++)
-		waddch(window, string[i2]);
+		waddch(window, (unsigned char)string[i2]);
 	return(strlen(string));
 }
 
@@ -1044,7 +1043,7 @@
 	wclrtoeol(text_win);
 	while ((posit < length) && (column <= last_col))
 	{
-		if ((*temp < 32) || (*temp >= 127))
+		if (!isprint(*temp))
 		{
 			column += len_char(*temp, abs_column);
 			abs_column += out_char(text_win, *temp, abs_column);
@@ -1923,13 +1922,13 @@
 			}
 			*nam_str = in;
 			g_pos++;
-			if (((in < ' ') || (in > 126)) && (g_horz < (last_col - 1)))
+			if (!isprint((unsigned char)in) && (g_horz < (last_col - 1)))
 				g_horz += out_char(com_win, in, g_horz);
 			else
 			{
 				g_horz++;
 				if (g_horz < (last_col - 1))
-					waddch(com_win, in);
+					waddch(com_win, (unsigned char)in);
 			}
 			nam_str++;
 		}
@@ -5085,8 +5084,8 @@
 {
 	int counter;
 
+	setlocale(LC_ALL, "");
 #ifndef NO_CATGETS
-	setlocale(LC_ALL, "");
 	catalog = catopen("ee", NL_CAT_LOCALE);
 #endif /* NO_CATGETS */
 

==== //depot/projects/scottl-camlock/src/etc/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.375 2009/06/07 13:26:57 edwin Exp $
+# $FreeBSD: src/etc/Makefile,v 1.376 2009/09/02 14:54:47 flz Exp $
 
 .include 
 
@@ -99,8 +99,7 @@
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
-MTREE=	BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
-	BSD.var.dist BSD.x11.dist BSD.x11-4.dist
+MTREE=	BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
 .if ${MK_SENDMAIL} != "no"
 MTREE+=	BSD.sendmail.dist
 .endif

==== //depot/projects/scottl-camlock/src/lib/libc/locale/ctype.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctype.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/ctype.3,v 1.16 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/ctype.3,v 1.17 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd March 30, 2004
+.Dd September 3, 2009
 .Dt CTYPE 3
 .Os
 .Sh NAME
@@ -111,6 +111,13 @@
 .In ctype.h ,
 or as true functions in the C library.
 See the specific manual pages for more information.
+.Pp
+.Em NOTE :
+if the value passed to one of these functions is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh SEE ALSO
 .Xr digittoint 3 ,
 .Xr isalnum 3 ,

==== //depot/projects/scottl-camlock/src/lib/libc/locale/digittoint.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)digittoint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/digittoint.3,v 1.4 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/digittoint.3,v 1.5 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd April 6, 2001
+.Dd September 3, 2009
 .Dt DIGITTOINT 3
 .Os
 .Sh NAME
@@ -46,6 +46,15 @@
 function converts a numeric character to its corresponding integer value.
 The character can be any decimal digit or hexadecimal digit.
 With hexadecimal characters, the case of the values does not matter.
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn digittoint
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh RETURN VALUES
 The
 .Fn digittoint

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isalnum.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalnum.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.22 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.23 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd July 17, 2005
+.Dd September 3, 2009
 .Dt ISALNUM 3
 .Os
 .Sh NAME
@@ -75,6 +75,15 @@
 .It "\&164\ ``t'' \t165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x''"
 .It "\&171\ ``y'' \t172\ ``z''"
 .El
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn isalnum
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh RETURN VALUES
 The
 .Fn isalnum

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isalpha.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalpha.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.21 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.22 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd July 17, 2005
+.Dd September 3, 2009
 .Dt ISALPHA 3
 .Os
 .Sh NAME
@@ -73,6 +73,15 @@
 .It "\&164\ ``t'' \t165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x''"
 .It "\&171\ ``y'' \t172\ ``z''"
 .El
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn isalpha
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh RETURN VALUES
 The
 .Fn isalpha

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isascii.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isascii.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/locale/isascii.3,v 1.14 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/isascii.3,v 1.15 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd October 6, 2002
+.Dd September 3, 2009
 .Dt ISASCII 3
 .Os
 .Sh NAME
@@ -47,6 +47,15 @@
 .Tn ASCII
 character, which is any character
 between 0 and octal 0177 inclusive.
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn isascii
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh SEE ALSO
 .Xr ctype 3 ,
 .Xr iswascii 3 ,

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isblank.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.23 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.24 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd July 17, 2005
+.Dd September 3, 2009
 .Dt ISBLANK 3
 .Os
 .Sh NAME
@@ -57,6 +57,15 @@
 .Vt "unsigned char"
 or the value of
 .Dv EOF .
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn isblank
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh RETURN VALUES
 The
 .Fn isblank

==== //depot/projects/scottl-camlock/src/lib/libc/locale/iscntrl.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)iscntrl.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.20 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.21 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd July 17, 2005
+.Dd September 3, 2009
 .Dt ISCNTRL 3
 .Os
 .Sh NAME
@@ -65,6 +65,15 @@
 .It "\&031\ EM \t032\ SUB \t033\ ESC \t034\ FS \t035\ GS"
 .It "\&036\ RS \t037\ US \t177\ DEL"
 .El
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn iscntrl
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh RETURN VALUES
 The
 .Fn iscntrl

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isdigit.3#3 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isdigit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.23 2007/05/04 16:01:07 gabor Exp $
+.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.24 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd May 4, 2007
+.Dd September 3, 2009
 .Dt ISDIGIT 3
 .Os
 .Sh NAME
@@ -68,6 +68,15 @@
 .Vt "unsigned char"
 or the value of
 .Dv EOF .
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn isdigit
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh RETURN VALUES
 The
 .Fn isdigit

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isgraph.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.22 2007/01/09 00:28:00 imp Exp $
+.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.23 2009/09/03 10:06:37 des Exp $
 .\"
-.Dd July 17, 2005
+.Dd September 3, 2009
 .Dt ISGRAPH 3
 .Os
 .Sh NAME
@@ -80,6 +80,15 @@
 .It "\&166\ ``v'' \t167\ ``w'' \t170\ ``x'' \t171\ ``y'' \t172\ ``z''"
 .It "\&173\ ``{'' \t174\ ``|'' \t175\ ``}'' \t176\ ``~''"
 .El
+.Pp
+.Em NOTE :
+if the value passed to the
+.Fn isgraph
+function is a
+.Vt signed char ,
+as is usually the case, it must be cast to an
+.Vt unsigned char
+to avoid sign-extension errors.
 .Sh RETURN VALUES
 The
 .Fn isgraph

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isideogram.3#2 (text+ko) ====

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 15:33:25 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA8161065696; Thu,  3 Sep 2009 15:33:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 864681065672
	for ; Thu,  3 Sep 2009 15:33:24 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7452C8FC1A
	for ; Thu,  3 Sep 2009 15:33:24 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83FXOUW085193
	for ; Thu, 3 Sep 2009 15:33:24 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83FXOJZ085191
	for perforce@freebsd.org; Thu, 3 Sep 2009 15:33:24 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 3 Sep 2009 15:33:24 GMT
Message-Id: <200909031533.n83FXOJZ085191@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168108 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, 03 Sep 2009 15:33:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=168108

Change 168108 by truncs@aditya on 2009/09/03 15:33:20

	Cleanup.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_fs.h#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#5 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_readwrite.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_subr.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#2 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#4 (text+ko) ====

@@ -45,11 +45,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 static daddr_t	ext2_alloccg(struct inode *, int, daddr_t, int);
 static u_long	ext2_dirpref(struct m_ext2fs *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#2 (text+ko) ====

@@ -44,10 +44,10 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 /*
  * Balloc defines the structure of file system storage
@@ -70,10 +70,7 @@
 	struct indir indirs[NIADDR + 2];
 	int32_t newb, lbn, *bap, pref;
 	int osize, nsize, num, i, error;
-/*
-ext2_debug("ext2_balloc called (%d, %d, %d)\n", 
-	ip->i_number, (int)bn, (int)size);
-*/
+
 	*bpp = NULL;
 	if (bn < 0)
 		return (EFBIG);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#2 (text+ko) ====

@@ -45,10 +45,10 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 /*
  * Bmap converts a the logical block number of a file to its physical block

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#2 (text+ko) ====

@@ -26,8 +26,8 @@
  * 
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_DINODE_H_
-#define _SYS_GNU_EXT2FS_EXT2_DINODE_H_
+#ifndef _FS_EXT2FS_EXT2_DINODE_H_
+#define _FS_EXT2FS_EXT2_DINODE_H_
 
 #define e2di_size_high	e2di_dacl
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#2 (text+ko) ====

@@ -26,8 +26,8 @@
  * 
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_DIR_H_
-#define _SYS_GNU_EXT2FS_EXT2_DIR_H_
+#ifndef _FS_EXT2FS_EXT2_DIR_H_
+#define _FS_EXT2FS_EXT2_DIR_H_
 
 /*
  * Structure of a directory entry

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#2 (text+ko) ====

@@ -36,8 +36,8 @@
  * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_extern.h,v 1.35 2005/03/14 13:30:05 phk Exp $
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_EXTERN_H_
-#define	_SYS_GNU_EXT2FS_EXT2_EXTERN_H_
+#ifndef _FS_EXT2FS_EXT2_EXTERN_H_
+#define	_FS_EXT2FS_EXT2_EXTERN_H_
 
 struct ext2fs_dinode;
 struct indir;

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_fs.h#4 (text+ko) ====

@@ -34,8 +34,8 @@
  * 
  */
 
-#ifndef _LINUX_EXT2_FS_H
-#define _LINUX_EXT2_FS_H
+#ifndef _FS_EXT2FS_EXT2_FS_H
+#define _FS_EXT2FS_EXT2_FS_H
 
 #include 
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#5 (text+ko) ====

@@ -47,11 +47,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int,
 	    long *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#2 (text+ko) ====

@@ -31,10 +31,10 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 void
 ext2_print_inode( in )

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#2 (text+ko) ====

@@ -55,11 +55,11 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #ifdef DIAGNOSTIC
 static int dirchk = 1;

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#2 (text+ko) ====

@@ -30,8 +30,8 @@
  * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_mount.h,v 1.31 2005/01/06 18:27:30 imp Exp $
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
-#define _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
+#ifndef _FS_EXT2FS_EXT2_MOUNT_H_
+#define _FS_EXT2FS_EXT2_MOUNT_H_
 
 #ifdef _KERNEL
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_readwrite.c#3 (text+ko) ====


==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_subr.c#2 (text+ko) ====

@@ -46,10 +46,10 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #ifdef KDB
 void	ext2_checkoverlap(struct buf *, struct inode *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#3 (text+ko) ====

@@ -55,12 +55,12 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 static int	ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
 static int	ext2_mountfs(struct vnode *, struct mount *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#2 (text+ko) ====

@@ -74,12 +74,12 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *);
 
@@ -160,7 +160,7 @@
 	.vop_vptofh =		ext2_vptofh,
 };
 
-#include 
+#include 
 
 /*
  * A virgin directory (no blushing please).

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#2 (text+ko) ====


==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#2 (text+ko) ====

@@ -35,8 +35,8 @@
  * $FreeBSD: src/sys/gnu/fs/ext2fs/inode.h,v 1.45 2008/04/16 11:33:30 kib Exp $
  */
 
-#ifndef _SYS_GNU_EXT2FS_INODE_H_
-#define	_SYS_GNU_EXT2FS_INODE_H_
+#ifndef _FS_EXT2FS_INODE_H_
+#define	_FS_EXT2FS_INODE_H_
 
 #include 
 #include 

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 15:46:39 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F3831065697; Thu,  3 Sep 2009 15:46:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03249106568D
	for ; Thu,  3 Sep 2009 15:46:39 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E55058FC22
	for ; Thu,  3 Sep 2009 15:46:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83FkcPx086259
	for ; Thu, 3 Sep 2009 15:46:38 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83FkcM2086257
	for perforce@freebsd.org; Thu, 3 Sep 2009 15:46:38 GMT
	(envelope-from stas@freebsd.org)
Date: Thu, 3 Sep 2009 15:46:38 GMT
Message-Id: <200909031546.n83FkcM2086257@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168109 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, 03 Sep 2009 15:46:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=168109

Change 168109 by stas@stas_yandex on 2009/09/03 15:46:07

	- Fix x86 support (I have not checked signals yet, though).
	- Rework the elf loader algotihm to match what rtld does:
	         map a chunk of anonymous memory on top of entire object's
	         address space and then map sections above it.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#8 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#9 edit
.. //depot/projects/valgrind/coregrind/m_ume/elf.c#3 edit
.. //depot/projects/valgrind/coregrind/pub_core_aspacemgr.h#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#8 (text+ko) ====

@@ -176,8 +176,8 @@
 #  elif defined(VGP_x86_freebsd)
    if (flags & VKI_MAP_ANONYMOUS && fd == 0)
       fd = -1;
-   res = VG_(do_syscall8)(__NR_mmap, (UWord)start, length,
-			  prot, flags, fd, 0, offset, offset >> 32ul);
+   res = VG_(do_syscall7)(__NR_mmap, (UWord)start, length,
+			  prot, flags, fd, offset, offset >> 32ul);
 #  elif defined(VGP_amd64_freebsd)
    if (flags & VKI_MAP_ANONYMOUS && fd == 0)
       fd = -1;
@@ -189,8 +189,7 @@
    return res;
 }
 
-static
-SysRes local_do_mprotect_NO_NOTIFY(Addr start, SizeT length, UInt prot)
+SysRes VG_(am_do_mprotect_NO_NOTIFY)(Addr start, SizeT length, UInt prot)
 {
    return VG_(do_syscall3)(__NR_mprotect, (UWord)start, length, prot );
 }
@@ -438,7 +437,7 @@
    aspacem_assert(VG_IS_PAGE_ALIGNED(stack));
 
    /* Protect the guard areas. */
-   sres = local_do_mprotect_NO_NOTIFY( 
+   sres = VG_(am_do_mprotect_NO_NOTIFY)( 
              (Addr) &stack[0], 
              VG_STACK_GUARD_SZB, VKI_PROT_NONE 
           );
@@ -448,7 +447,7 @@
       VG_STACK_GUARD_SZB, VKI_PROT_NONE 
    );
 
-   sres = local_do_mprotect_NO_NOTIFY( 
+   sres = VG_(am_do_mprotect_NO_NOTIFY)( 
              (Addr) &stack->bytes[VG_STACK_GUARD_SZB + VG_STACK_ACTIVE_SZB], 
              VG_STACK_GUARD_SZB, VKI_PROT_NONE 
           );

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#9 (text+ko) ====

@@ -1,13 +1,13 @@
 
 /*--------------------------------------------------------------------*/
-/*--- Support for doing system calls.          syscall-x86-linux.S ---*/
+/*--- Support for doing system calls.        syscall-x86-freebsd.S ---*/
 /*--------------------------------------------------------------------*/
 
 /*
   This file is part of Valgrind, a dynamic binary instrumentation
   framework.
 
-  Copyright (C) 2000-2008 Julian Seward 
+  Copyright (C) 2000-2007 Julian Seward 
      jseward@acm.org
 
   This program is free software; you can redistribute it and/or
@@ -53,10 +53,9 @@
 	back to regs->m_eax on completion.
 	
 	Returns 0 if the syscall was successfully called (even if the
-	syscall itself failed), or a nonzero error code in the lowest
-        8 bits if one of the sigprocmasks failed (there's no way to
-        determine which one failed).  And there's no obvious way to
-        recover from that either, but nevertheless we want to know.
+	syscall itself failed), or a -ve error code if one of the
+	sigprocmasks failed (there's no way to determine which one
+	failed).
 
 	VG_(fixup_guest_state_after_syscall_interrupted) does the
 	thread state fixup in the case where we were interrupted by a
@@ -64,153 +63,135 @@
 	
 	Prototype:
 
-	UWord ML_(do_syscall_for_client_WRK)(
-	                          Int syscallno,		// 0
-				  void* guest_state,		// 4
-				  const vki_sigset_t *sysmask,	// 8
-				  const vki_sigset_t *postmask,	// 12
-				  Int nsigwords,		// 16
-				  SyscallArgs *args)		// 20
+	Int ML_(do_syscall_for_client_WRK)(
+	                          Int syscallno,		// ebp+8
+				  void* guest_state,		// ebp+12
+				  const vki_sigset_t *sysmask,	// ebp+16
+				  const vki_sigset_t *postmask,	// ebp+20
+				  Int sigsetSzB)		// ebp+24
 
-See priv_types_n_macros.h for SyscallArgs layout:
-      UWord sysno;		// 0
-      UWord arg1;		// 4
-      UWord arg2;		// 8
-      UWord arg3;		// 12
-      UWord arg4;		// 16
-      UWord arg5;		// 20
-      UWord arg6;		// 24
-      UWord arg7;		// 28
-      UWord arg8;		// 32
-				   
+        Note that sigsetSzB is totally ignored (and irrelevant).
 */
 
-/* from vki_arch.h */	
+/* from vki-darwin.h, checked at startup by m_vki.c */	
 #define VKI_SIG_SETMASK	3
-	
-/* QQQ translate syscall abi conventions */
+
 .globl ML_(do_syscall_for_client_WRK)
 ML_(do_syscall_for_client_WRK):
-	/* save callee-saved regs */
-	push	%esi
-	push	%edi
-	push	%ebx
+	/* establish stack frame */
 	push	%ebp
-	subl	$(9*4), %esp		/* space for 8 args plus fake ret addr */
-#define FSZ	((9+4+1)*4)	/* 4 args + ret addr */
-
-1:	/* Even though we can't take a signal until the sigprocmask completes,
-	   start the range early.
+	mov	%esp, %ebp
+	subl	$8, %esp	/* 16-byte align stack */
+	
+1:	/* Even though we can't take a signal until the
+           sigprocmask completes, start the range early.
 	   If eip is in the range [1,2), the syscall hasn't been started yet */
 
 	/* Set the signal mask which should be current during the syscall. */
-	movl	$__NR_sigprocmask, %eax
-	movl	$VKI_SIG_SETMASK, %ecx
-	movl	%ecx, 4(%esp)
-	movl	8+FSZ(%esp), %ecx
-	movl	%ecx, 8(%esp)
-	movl	12+FSZ(%esp), %ecx
-	movl	%ecx, 12(%esp)
-	int	$0x80
-	jb	7f	/* sigprocmask failed */
-	
-	/* We have already collapsed the stupid FreeBSD/i386 indirect syscalls */
-	movl     20+FSZ(%esp), %ebx
-	movl	 0+FSZ(%esp), %eax	/* use syscallno argument rather than thread EAX */
-	/* copy 8 args */
-	movl     4(%ebx), %ecx
-	movl     8(%ebx), %edx
-	movl     12(%ebx), %esi
-	movl     16(%ebx), %edi
-	movl     %ecx, 4(%esp)
-	movl     %edx, 8(%esp)
-	movl     %esi, 12(%esp)
-	movl     %edi, 16(%esp)
-	movl     20(%ebx), %ecx
-	movl     24(%ebx), %edx
-	movl     28(%ebx), %esi
-	movl     32(%ebx), %edi
-	movl     %ecx, 20(%esp)
-	movl     %edx, 24(%esp)
-	movl     %esi, 28(%esp)
-	movl     %edi, 32(%esp)
+        pushl   20(%ebp)
+        pushl   16(%ebp)
+        pushl   $VKI_SIG_SETMASK
+        pushl   $0xcafebabe    /* totally fake return address */
+        movl    $__NR_sigprocmask, %eax
+        int     $0x80
+        jc      7f  /* sigprocmask failed */
+        addl    $16,%esp
+
+	/* Copy syscall parameters to the stack - assume no more than 8 
+	 * plus the return address */
+	/* do_syscall8 */
+	/* stack is currently aligned assuming 8 parameters */
+	movl	12(%ebp), %edx			
+	movl	OFFSET_x86_ESP(%edx), %edx	/* edx = simulated ESP */
+	movl	28+4(%edx), %eax
+	pushl	%eax
+	movl	24+4(%edx), %eax
+	pushl	%eax
+	movl	20+4(%edx), %eax
+	pushl	%eax
+	movl	16+4(%edx), %eax
+	pushl	%eax
+	movl	12+4(%edx), %eax
+	pushl	%eax
+	movl	8+4(%edx), %eax
+	pushl	%eax
+	movl	4+4(%edx), %eax
+	pushl	%eax
+	movl	0+4(%edx), %eax
+	pushl	%eax
+	/* return address */
+	movl	0(%edx), %eax
+	pushl	%eax
+
+	/* Put syscall number in eax */
+	movl	8(%ebp), %eax
 
 	/* If eip==2, then the syscall was either just about to start, 
 	   or was interrupted and the kernel was restarting it. */
-2:	int	$0x80
-3:	/* In the range [3, 4), the syscall result is in %eax/%edx/eflags,
-	   but hasn't been committed to EAX/EDX. */
-	pushf
-	popl	%edi				/* copy flags to %edi */
-	movl	4+FSZ(%esp), %ebx
-	movl	%eax, OFFSET_x86_EAX(%ebx)	/* save back to EAX */
-	movl	%edx, OFFSET_x86_EDX(%ebx)	/* save back to EDX */
-	/* QQQ Race here.  We aren't really "committed" until we have called
-	   LibVEX_GuestX86_put_eflag_c() to store the carry bit.  Unfortunately
-	   we cannot test for %eip in that range. It might be that the syscall
-	   result extraction code needs to be widened from ending at
-	   blksys_complete to blksys_finished instead.  Note that on FreeBSD,
-	   %edi is saved across a syscall so we don't have to worry about
-	   it getting trashed by the sigprocmask below. */
+2:	int	$0x80		/* UNIX (GrP fixme should be sysenter?) */
 
-4:	/* Re-block signals.  If eip is in [4,5), then the syscall is complete and 
-	   we needn't worry about it. */
-	/* QQQ: However, on FreeBSD, the trap handler has to export just carry */
-	movl	$__NR_sigprocmask, %eax
-	movl	$VKI_SIG_SETMASK, %ecx
+3:	/* In the range [3, 4), the syscall result is in %eax and %edx and C,
+           but hasn't been committed to the thread state. */
+	setc	0(%esp)				/* stash returned carry flag */
+	movl	12(%ebp), %ecx
+	movl	%eax, OFFSET_x86_EAX(%ecx)	/* save EAX to vex */
+	movl	%edx, OFFSET_x86_EDX(%ecx)	/* save EDX to vex */
+	/* save carry flag to vex */
+	subl	$12, %esp
 	movl	%ecx, 4(%esp)
-	movl	12+FSZ(%esp), %ecx
-	movl	%ecx, 8(%esp)
-	xorl	%ecx, %ecx
-	movl	%ecx, 12(%esp)
-	int	$0x80
-	jb	7f	/* sigprocmask failed */
+	movl	$0, 0(%esp)
+	movb	12(%esp), %al
+	movb	%al, 0(%esp)
+	call	LibVEX_GuestX86_put_eflag_c
+	addl	$12, %esp
+
+4:	/* Re-block signals.  If eip is in [4,5), then the syscall is
+           complete and we needn't worry about it. */
+        /* Set up for __pthread_sigmask(SIG_SETMASK, postmask, NULL) */
+        pushl   $0
+        pushl   20(%ebp)
+        pushl   $VKI_SIG_SETMASK
+        pushl   $0xcafef00d    /* totally fake return address */
+        movl    $__NR_sigprocmask, %eax
+        int     $0x80  /* should be sysenter? */
+        jc      7f  /* sigprocmask failed */
+        addl    $16,%esp
 
 5:	/* now safe from signals */
-
-	/* Export carry state */
-	movl	%edi, %eax
-	andl	$1, %eax	/* SUCCESS */
-	addl	$(9*4), %esp	/* args + fake return address */
+	movl	$0, %eax       /* SUCCESS */
+	movl	%ebp, %esp
 	popl	%ebp
-	popl	%ebx
-	popl	%edi
-	popl	%esi
 	ret
 
-7:	/* failure: return 0x8000 | error code */
-	orl	$0x8000, %eax
-	addl	$(9*4), %esp	/* args + fake return address */
+7:      /* failure: return 0x8000 | error code */
+        /* Note that we enter here with %esp being 16 too low
+           (4 extra words on the stack).  But because we're nuking
+           the stack frame now, that doesn't matter. */
+        andl    $0x7FFF, %eax
+        orl     $0x8000, %eax
+	movl	%ebp, %esp
 	popl	%ebp
-	popl	%ebx
-	popl	%edi
-	popl	%esi
 	ret
-#undef FSZ
 
-	
 .section .rodata
 /* export the ranges so that
    VG_(fixup_guest_state_after_syscall_interrupted) can do the
    right thing */
-	
+        
 .globl ML_(blksys_setup)
 .globl ML_(blksys_restart)
 .globl ML_(blksys_complete)
 .globl ML_(blksys_committed)
 .globl ML_(blksys_finished)
-ML_(blksys_setup):	.long 1b
-ML_(blksys_restart):	.long 2b
-ML_(blksys_complete):	.long 3b
-ML_(blksys_committed):	.long 4b
-ML_(blksys_finished):	.long 5b
+ML_(blksys_setup):      .long 1b
+ML_(blksys_restart):    .long 2b
+ML_(blksys_complete):   .long 3b
+ML_(blksys_committed):  .long 4b
+ML_(blksys_finished):   .long 5b
 .previous
-	
-/* Let the linker know we don't need an executable stack */
-.section .note.GNU-stack,"",@progbits
-
-#endif /* defined(VGP_x86_freebsd) */
-
+        
+#endif // defined(VGP_x86_freebsd)
+ 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/

==== //depot/projects/valgrind/coregrind/m_ume/elf.c#3 (text+ko) ====

@@ -41,6 +41,7 @@
 #include "pub_core_libcfile.h"      // VG_(open) et al
 #include "pub_core_machine.h"       // VG_ELF_CLASS (XXX: which should be moved)
 #include "pub_core_mallocfree.h"    // VG_(malloc), VG_(free)
+#include "pub_core_vkiscnums.h"
 #include "pub_core_syscall.h"       // VG_(strerror)
 #include "pub_core_ume.h"           // self
 
@@ -160,22 +161,38 @@
    Int    i;
    SysRes res;
    ESZ(Addr) elfbrk = 0;
+   ESZ(Word) mapsize;
+   ESZ(Addr) base_offset, base_vaddr, base_vlimit, baseaddr;
+   ESZ(Phdr) *ph0, *phlast;
+
+   if (e->e.e_phnum < 1) {
+      VG_(printf)("valgrind: m_ume.c: too few sections\n");
+      return 1;
+   }
 
-   for (i = 0; i < e->e.e_phnum; i++) {
+   /* Map the entire address space of the object. */
+   ph0 = NULL;
+   phlast = NULL;
+   for (i = 1; i < e->e.e_phnum; i++) {
       ESZ(Phdr) *ph = &e->p[i];
-      ESZ(Addr) addr, brkaddr;
-      ESZ(Word) memsz;
-
       if (ph->p_type != PT_LOAD)
          continue;
-
-      addr    = ph->p_vaddr+base;
-      memsz   = ph->p_memsz;
-      brkaddr = addr+memsz;
-
-      if (brkaddr > elfbrk)
-         elfbrk = brkaddr;
+      if (ph0 == NULL)
+         ph0 = ph;
+      if (phlast == NULL || ph->p_vaddr > phlast->p_vaddr)
+         phlast = &e->p[i];
+   }
+   if (ph0 == NULL || phlast == NULL) {
+      VG_(printf)("valgrind: m_ume.c: too few loadable sections\n");
+      return 1;
    }
+   base_offset = VG_PGROUNDDN(ph0->p_offset);
+   base_vaddr = VG_PGROUNDDN(ph0->p_vaddr);
+   base_vlimit = VG_PGROUNDUP(phlast->p_vaddr + phlast->p_memsz);
+   mapsize = base_vlimit - base_vaddr;
+   baseaddr = VG_PGROUNDDN(ph0->p_vaddr + base);
+   res = VG_(am_mmap_anon_fixed_client)(baseaddr, mapsize, VKI_PROT_NONE);
+   check_mmap(res, baseaddr, mapsize);
 
    for (i = 0; i < e->e.e_phnum; i++) {
       ESZ(Phdr) *ph = &e->p[i];
@@ -199,12 +216,9 @@
       memsz   = ph->p_memsz;
       brkaddr = addr+memsz;
 
-      // Tom says: In the following, do what the Linux kernel does and only
-      // map the pages that are required instead of rounding everything to
-      // the specified alignment (ph->p_align).  (AMD64 doesn't work if you
-      // use ph->p_align -- part of stage2's memory gets trashed somehow.)
-      //
-      // The condition handles the case of a zero-length segment.
+      if (brkaddr > elfbrk)
+         elfbrk = brkaddr;
+
       if (VG_PGROUNDUP(bss)-VG_PGROUNDDN(addr) > 0) {
          if (0) VG_(debugLog)(0,"ume","mmap_file_fixed_client #1\n");
          res = VG_(am_mmap_file_fixed_client)(
@@ -222,23 +236,38 @@
       if (memsz > filesz) {
          UInt bytes;
 
-         bytes = VG_PGROUNDUP(brkaddr)-VG_PGROUNDUP(bss);
+         bytes = VG_PGROUNDUP(bss) - bss;
          if (bytes > 0) {
-            if (0) VG_(debugLog)(0,"ume","mmap_anon_fixed_client #2\n");
-            res = VG_(am_mmap_anon_fixed_client)(
-                     VG_PGROUNDUP(bss), bytes,
-                     prot
-                  );
-            if (0) VG_(am_show_nsegments)(0,"after #2");
-            check_mmap(res, VG_PGROUNDUP(bss), bytes);
+            /* Make sure the end of the segment is writable */
+            if ((prot & VKI_PROT_WRITE) == 0) {
+               res = VG_(am_do_mprotect_NO_NOTIFY)((UWord)VG_PGROUNDDN(bss), VKI_PAGE_SIZE,
+                  prot|VKI_PROT_WRITE);
+               if (sr_isError(res)) {
+                  VG_(printf)("valgrind: m_ume.c: mprotect failed\n");
+                  return (1);
+               }
+            }
+            VG_(memset)((char *)bss, 0, bytes);
+            /* Reset the data protection back */
+            if ((prot & VKI_PROT_WRITE) == 0) {
+               res = VG_(am_do_mprotect_NO_NOTIFY)((UWord)VG_PGROUNDDN(bss), VKI_PAGE_SIZE,
+                  prot);
+               if (sr_isError(res)) {
+                  VG_(printf)("valgrind: m_ume.c: mprotect failed\n");
+                  return (1);
+               }
+            }
          }
 
-         bytes = bss & (VKI_PAGE_SIZE - 1);
-
-         // The 'prot' condition allows for a read-only bss
-         if ((prot & VKI_PROT_WRITE) && (bytes > 0)) {
-            bytes = VKI_PAGE_SIZE - bytes;
-            VG_(memset)((char *)bss, 0, bytes);
+         /* Overlay the BSS segment onto the proper region. */
+         if (VG_PGROUNDUP(brkaddr) > VG_PGROUNDUP(bss)) {
+            res = VG_(am_do_mprotect_NO_NOTIFY)((UWord)VG_PGROUNDUP(bss),
+               VG_PGROUNDUP(brkaddr) - VG_PGROUNDUP(bss), prot);
+            if (sr_isError(res)) {
+               VG_(printf)("valgrind: m_ume.c: mprotect failed\n");
+               return (1);
+            }
+            VG_(am_notify_mprotect)((Addr)VG_PGROUNDUP(bss), VG_PGROUNDUP(brkaddr) - VG_PGROUNDUP(bss), prot);
          }
       }
    }

==== //depot/projects/valgrind/coregrind/pub_core_aspacemgr.h#4 (text+ko) ====

@@ -164,6 +164,9 @@
    specified address range. */
 extern Bool VG_(am_notify_client_shmat)( Addr a, SizeT len, UInt prot );
 
+extern SysRes VG_(am_do_mprotect_NO_NOTIFY)
+   ( Addr start, SizeT length, UInt prot);
+
 /* Notifies aspacem that an mprotect was completed successfully.  The
    segment array is updated accordingly.  Note, as with
    VG_(am_notify_munmap), it is not the job of this function to reject
@@ -191,7 +194,6 @@
 extern SysRes VG_(am_do_mmap_NO_NOTIFY)
    ( Addr start, SizeT length, UInt prot, UInt flags, Int fd, Off64T offset);
 
-
 //--------------------------------------------------------------
 // Functions pertaining to AIX5-specific notifications.
 

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 15:50:44 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E3F9E1065692; Thu,  3 Sep 2009 15:50:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FAEF1065698
	for ; Thu,  3 Sep 2009 15:50:43 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 751F28FC18
	for ; Thu,  3 Sep 2009 15:50:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83Foh6G086540
	for ; Thu, 3 Sep 2009 15:50:43 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83FohUC086538
	for perforce@freebsd.org; Thu, 3 Sep 2009 15:50:43 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 3 Sep 2009 15:50:43 GMT
Message-Id: <200909031550.n83FohUC086538@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168110 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, 03 Sep 2009 15:50:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=168110

Change 168110 by truncs@aditya on 2009/09/03 15:50:29

	Remove unnecessary variable.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#4 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#3 (text+ko) ====

@@ -55,7 +55,7 @@
  * the inode and the logical block number in a file.
  */
 int
-ext2_balloc(ip, bn, size, cred, bpp, flags)
+ext2_balloc(ip, lbn, size, cred, bpp, flags)
 	struct inode *ip;
 	int32_t bn;
 	int size;
@@ -72,10 +72,9 @@
 	int osize, nsize, num, i, error;
 
 	*bpp = NULL;
-	if (bn < 0)
+	if (lbn < 0)
 		return (EFBIG);
 	fs = ip->i_e2fs;
-	lbn = bn;
 
 	/*
 	 * check if this is a sequential block allocation. 
@@ -90,12 +89,12 @@
 	/*
 	 * The first NDADDR blocks are direct blocks
 	 */
-	if (bn < NDADDR) {
-		nb = ip->i_db[bn];
+	if (lbn < NDADDR) {
+		nb = ip->i_db[lbn];
 		/* no new block is to be allocated, and no need to expand
 		   the file */
-		if (nb != 0 && ip->i_size >= (bn + 1) * fs->e2fs_bsize) {
-			error = bread(vp, bn, fs->e2fs_bsize, NOCRED, &bp);
+		if (nb != 0 && ip->i_size >= (lbn + 1) * fs->e2fs_bsize) {
+			error = bread(vp, lbn, fs->e2fs_bsize, NOCRED, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
@@ -111,7 +110,7 @@
 			osize = fragroundup(fs, blkoff(fs, ip->i_size));
 			nsize = fragroundup(fs, size);
 			if (nsize <= osize) {
-				error = bread(vp, bn, osize, NOCRED, &bp);
+				error = bread(vp, lbn, osize, NOCRED, &bp);
 				if (error) {
 					brelse(bp);
 					return (error);
@@ -134,17 +133,17 @@
 				nsize = fragroundup(fs, size);
 			else
 				nsize = fs->e2fs_bsize;
-			error = ext2_alloc(ip, bn,
-			    ext2_blkpref(ip, bn, (int)bn, &ip->i_db[0], 0),
+			error = ext2_alloc(ip, lbn,
+			    ext2_blkpref(ip, bn, (int)lbn, &ip->i_db[0], 0),
 			    nsize, cred, &newb);
 			if (error)
 				return (error);
-			bp = getblk(vp, bn, nsize, 0, 0, 0);
+			bp = getblk(vp, lbn, nsize, 0, 0, 0);
 			bp->b_blkno = fsbtodb(fs, newb);
 			if (flags & B_CLRBUF)
 				vfs_bio_clrbuf(bp);
 		}
-		ip->i_db[bn] = dbtofsb(fs, bp->b_blkno);
+		ip->i_db[lbn] = dbtofsb(fs, bp->b_blkno);
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
 		*bpp = bp;
 		return (0);
@@ -153,7 +152,7 @@
 	 * Determine the number of levels of indirection.
 	 */
 	pref = 0;
-	if ((error = ext2_getlbns(vp, bn, indirs, &num)) != 0)
+	if ((error = ext2_getlbns(vp, lbn, indirs, &num)) != 0)
 		return(error);
 #ifdef DIAGNOSTIC
 	if (num < 1)
@@ -182,8 +181,8 @@
 		pref = ext2_blkpref(ip, lbn, indirs[0].in_off + 
 					     EXT2_NDIR_BLOCKS, &ip->i_db[0], 0);
 #endif
-	        if ((error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize,
-		    cred, &newb)) != 0)
+	        if (error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize,
+		    cred, &newb)
 			return (error);
 		nb = newb;
 		bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0, 0);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#4 (text+ko) ====

@@ -401,6 +401,7 @@
  *	4) invalidate all inactive vnodes.
  *	5) invalidate all cached file data.
  *	6) re-read inode data for all active vnodes.
+ * XXX we are missing some steps, in particular # 3, this has to be reviewed.
  */
 static int
 ext2_reload(struct mount *mp, struct thread *td)

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 16:27:24 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EFAD106566C; Thu,  3 Sep 2009 16:27:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF2001065676
	for ; Thu,  3 Sep 2009 16:27:23 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ADA5B8FC19
	for ; Thu,  3 Sep 2009 16:27:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83GRNEr090124
	for ; Thu, 3 Sep 2009 16:27:23 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83GRNwm090122
	for perforce@freebsd.org; Thu, 3 Sep 2009 16:27:23 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 3 Sep 2009 16:27:23 GMT
Message-Id: <200909031627.n83GRNwm090122@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168113 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, 03 Sep 2009 16:27:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=168113

Change 168113 by truncs@aditya on 2009/09/03 16:27:15

	Rename ext2_fs.h to ext2fs.h

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#5 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_fs.h#5 delete
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#6 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_readwrite.c#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_subr.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#5 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#1 add

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#5 (text+ko) ====

@@ -47,7 +47,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#4 (text+ko) ====

@@ -45,7 +45,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#3 (text+ko) ====

@@ -46,7 +46,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#6 (text+ko) ====

@@ -49,7 +49,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#3 (text+ko) ====

@@ -58,7 +58,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #ifdef DIAGNOSTIC

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_readwrite.c#4 (text+ko) ====


==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_subr.c#3 (text+ko) ====

@@ -48,7 +48,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #ifdef KDB

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#5 (text+ko) ====

@@ -60,7 +60,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 static int	ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
 static int	ext2_mountfs(struct vnode *, struct mount *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#3 (text+ko) ====

@@ -78,7 +78,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *);

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 16:52:53 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AB07E106568D; Thu,  3 Sep 2009 16:52:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6FABE1065670
	for ; Thu,  3 Sep 2009 16:52:52 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E5118FC0A
	for ; Thu,  3 Sep 2009 16:52:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83Gqq9Z002315
	for ; Thu, 3 Sep 2009 16:52:52 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83GqqBI002313
	for perforce@freebsd.org; Thu, 3 Sep 2009 16:52:52 GMT
	(envelope-from stas@freebsd.org)
Date: Thu, 3 Sep 2009 16:52:52 GMT
Message-Id: <200909031652.n83GqqBI002313@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168118 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, 03 Sep 2009 16:52:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=168118

Change 168118 by stas@stas_yandex on 2009/09/03 16:52:15

	- Use correct syscall handler for lseek.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#39 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#39 (text+ko) ====

@@ -3755,7 +3755,7 @@
 
    BSDX_(__NR_pwrite7,			sys_pwrite7),			// 476
    BSDX_(__NR_mmap,			sys_mmap7),			// 477
-   BSDX_(__NR_lseek,			sys_lseek),			// 478
+   BSDX_(__NR_lseek,			sys_lseek7),			// 478
    BSDX_(__NR_truncate7,		sys_truncate7),			// 479
 
    BSDX_(__NR_ftruncate7,		sys_ftruncate7),		// 480

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 17:34:38 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 68EC91065676; Thu,  3 Sep 2009 17:34:38 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14E4C106566C
	for ; Thu,  3 Sep 2009 17:34:38 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 027AC8FC08
	for ; Thu,  3 Sep 2009 17:34:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83HYbdf006380
	for ; Thu, 3 Sep 2009 17:34:37 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83HYbMX006378
	for perforce@freebsd.org; Thu, 3 Sep 2009 17:34:37 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 3 Sep 2009 17:34:37 GMT
Message-Id: <200909031734.n83HYbMX006378@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168120 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, 03 Sep 2009 17:34:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=168120

Change 168120 by truncs@aditya on 2009/09/03 17:33:57

	Build fixes.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#5 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#7 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#5 (text+ko) ====

@@ -57,7 +57,7 @@
 int
 ext2_balloc(ip, lbn, size, cred, bpp, flags)
 	struct inode *ip;
-	int32_t bn;
+	int32_t lbn;
 	int size;
 	struct ucred *cred;
 	struct buf **bpp;
@@ -68,7 +68,7 @@
 	struct buf *bp, *nbp;
 	struct vnode *vp = ITOV(ip);
 	struct indir indirs[NIADDR + 2];
-	int32_t newb, lbn, *bap, pref;
+	int32_t newb, *bap, pref;
 	int osize, nsize, num, i, error;
 
 	*bpp = NULL;
@@ -129,12 +129,12 @@
  */
 			}
 		} else {
-			if (ip->i_size < (bn + 1) * fs->e2fs_bsize)
+			if (ip->i_size < (lbn + 1) * fs->e2fs_bsize)
 				nsize = fragroundup(fs, size);
 			else
 				nsize = fs->e2fs_bsize;
 			error = ext2_alloc(ip, lbn,
-			    ext2_blkpref(ip, bn, (int)lbn, &ip->i_db[0], 0),
+			    ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0),
 			    nsize, cred, &newb);
 			if (error)
 				return (error);
@@ -181,8 +181,8 @@
 		pref = ext2_blkpref(ip, lbn, indirs[0].in_off + 
 					     EXT2_NDIR_BLOCKS, &ip->i_db[0], 0);
 #endif
-	        if (error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize,
-		    cred, &newb)
+	        if ((error = ext2_alloc(ip, lbn, pref, 
+			(int)fs->e2fs_bsize, cred, &newb)))
 			return (error);
 		nb = newb;
 		bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0, 0);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#7 (text+ko) ====

@@ -155,20 +155,24 @@
 	if (osize < length) {
 		if (length > oip->i_e2fs->e2fs_maxfilesize)
 			return (EFBIG);
+		vnode_pager_setsize(ovp, length);
 		offset = blkoff(fs, length - 1);
 		lbn = lblkno(fs, length - 1);
 		aflags = B_CLRBUF;
 		if (flags & IO_SYNC)
 			aflags |= B_SYNC;
-		vnode_pager_setsize(ovp, length);
 		error = ext2_balloc(oip, lbn, offset + 1, cred, &bp, aflags);
 		if (error) {
 			vnode_pager_setsize(vp, osize);
 			return (error);
 		}
 		oip->i_size = length;
+		if (bp->b_bufsize == fs->e2fs_bsize)
+			bp->b_flags |= B_CLUSTEROK;
 		if (aflags & B_SYNC)
 			bwrite(bp);
+		else if (ovp->v_mount->mnt_flag & MNT_ASYNC)
+			bdwrite(bp);
 		else
 			bawrite(bp);
 		oip->i_flag |= IN_CHANGE | IN_UPDATE;
@@ -191,15 +195,18 @@
 		if (flags & IO_SYNC)
 			aflags |= B_SYNC;
 		error = ext2_balloc(oip, lbn, offset, cred, &bp, aflags);
-		if (error) {
+		if (error)
 			return (error);
-		}
 		oip->i_size = length;
 		size = blksize(fs, oip, lbn);
 		bzero((char *)bp->b_data + offset, (u_int)(size - offset));
 		allocbuf(bp, size);
+		if (bp->b_bufsize == fs->e2fs_bsize)
+			bp->b_flags |= B_CLUSTEROK;
 		if (aflags & B_SYNC)
 			bwrite(bp);
+		else if (ovp->v_mount->mnt_flag & MNT_ASYNC)
+			bdwrite(bp);
 		else
 			bawrite(bp);
 	}
@@ -243,7 +250,8 @@
 	error = vtruncbuf(ovp, cred, td, length, (int)fs->e2fs_bsize);
 	if (error && (allerror == 0))
 		allerror = error;
-
+	vnode_pager_setsize(ovp, length);
+	
 	/*
 	 * Indirect blocks first.
 	 */

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 17:48:54 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5CC5A1065670; Thu,  3 Sep 2009 17:48:54 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 05DED1065695
	for ; Thu,  3 Sep 2009 17:48:54 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DD1808FC18
	for ; Thu,  3 Sep 2009 17:48:53 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83Hmrcx007416
	for ; Thu, 3 Sep 2009 17:48:53 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83HmrQE007414
	for perforce@freebsd.org; Thu, 3 Sep 2009 17:48:53 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 3 Sep 2009 17:48:53 GMT
Message-Id: <200909031748.n83HmrQE007414@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168122 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, 03 Sep 2009 17:48:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=168122

Change 168122 by pgj@beehive on 2009/09/03 17:48:23

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#9 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#15 integrate
.. //depot/projects/docproj_hu/www/en/docs/books.sgml#4 integrate
.. //depot/projects/docproj_hu/www/share/sgml/press.xml#22 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 
 
 
@@ -193,6 +193,16 @@
       rendszereken.

 
     
A GCC és binutils újabb változatának használata a &os; Portgyûjteményével
+      (custom-gcc)

+      Hogyan használjuk a &os;
+      Portgyûjteményében található GCC
+      fordítót és a hozzátartozó
+      binutils újabb változatait.  Emellett még
+      szó esik a saját GCC
+      használatáról.

+
+    
CVS repository létrehozása — A FreeBSD módszere
       (cvs-freebsd)

       Hogyan hozzunk létre egy CVS repositryt, amely ugyanazt a

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 22:00:32 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E236610656A3; Thu,  3 Sep 2009 22:00:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A781E1065697
	for ; Thu,  3 Sep 2009 22:00:31 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 96A518FC1B
	for ; Thu,  3 Sep 2009 22:00:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83M0Vqh040803
	for ; Thu, 3 Sep 2009 22:00:31 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83M0VUh040800
	for perforce@freebsd.org; Thu, 3 Sep 2009 22:00:31 GMT
	(envelope-from stas@freebsd.org)
Date: Thu, 3 Sep 2009 22:00:31 GMT
Message-Id: <200909032200.n83M0VUh040800@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168130 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, 03 Sep 2009 22:00:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=168130

Change 168130 by stas@stas_orion on 2009/09/03 21:59:37

	- Track changes in the address space by implementing mprotect(2) handler.
	  This fixes excessive FP in memchek on HEAD.

Affected files ...

.. //depot/projects/valgrind/memcheck/mc_main.c#4 edit

Differences ...

==== //depot/projects/valgrind/memcheck/mc_main.c#4 (text+ko) ====

@@ -1606,7 +1606,6 @@
    make_mem_undefined_w_tid_and_okind ( a, len, tid, MC_OKIND_UNKNOWN );
 }
 
-
 void MC_(make_mem_defined) ( Addr a, SizeT len )
 {
    PROF_EVENT(42, "MC_(make_mem_defined)");
@@ -1636,6 +1635,15 @@
    }
 }
 
+/* Track changes in the virtual memory space. */
+static void track_perms_change( Addr a, SizeT len,
+                      Bool rr, Bool ww, Bool xx )
+{
+   if (!(rr || ww))
+      MC_(make_mem_noaccess) ( a, len );
+   MC_(make_mem_defined) ( a, len );
+}
+
 
 /* --- Block-copy permissions (needed for implementing realloc() and
        sys_mremap). --- */
@@ -5806,7 +5814,7 @@
    // happen if the program catches the signal, though, which is bad.  If we
    // had two A bits (for readability and writability) that were completely
    // distinct from V bits, then we could handle all this properly.
-   VG_(track_change_mem_mprotect) ( NULL );
+   VG_(track_change_mem_mprotect) ( track_perms_change );
       
    VG_(track_die_mem_stack_signal)( MC_(make_mem_noaccess) ); 
    VG_(track_die_mem_brk)         ( MC_(make_mem_noaccess) );

From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 22:04:36 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8D9451065676; Thu,  3 Sep 2009 22:04:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 523F9106566B
	for ; Thu,  3 Sep 2009 22:04:36 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 281618FC0C
	for ; Thu,  3 Sep 2009 22:04:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83M4abJ042062
	for ; Thu, 3 Sep 2009 22:04:36 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83M4a6N042060
	for perforce@freebsd.org; Thu, 3 Sep 2009 22:04:36 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 3 Sep 2009 22:04:36 GMT
Message-Id: <200909032204.n83M4a6N042060@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168131 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, 03 Sep 2009 22:04:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=168131

Change 168131 by pgj@beehive on 2009/09/03 22:03:41

	Add a link for the Hungarian translation of articles/cups

Affected files ...

.. //depot/projects/docproj_hu/www/hu/docs/books.sgml#22 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#22 (text+ko) ====

@@ -188,7 +188,7 @@
 
     
A CUPS használata &os; alatt
-      (cups)

+      (cups) [magyarul]

       Hogyan állítsuk be a CUPS rendszert &os;
       rendszereken.

 

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 09:01:38 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 95E9A1065670; Fri,  4 Sep 2009 09:01:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57BD1106566B
	for ; Fri,  4 Sep 2009 09:01:38 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 466718FC0A
	for ; Fri,  4 Sep 2009 09:01:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8491cNn031367
	for ; Fri, 4 Sep 2009 09:01:38 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8491cqv031365
	for perforce@freebsd.org; Fri, 4 Sep 2009 09:01:38 GMT
	(envelope-from mav@freebsd.org)
Date: Fri, 4 Sep 2009 09:01:38 GMT
Message-Id: <200909040901.n8491cqv031365@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168142 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, 04 Sep 2009 09:01:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=168142

Change 168142 by mav@mav_mavbook on 2009/09/04 09:00:49

	Add `camcontrol cmd` support for sending ATA commands.

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#19 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#19 (text+ko) ====

@@ -120,7 +120,7 @@
 };
 
 #ifndef MINIMALISTIC
-static const char scsicmd_opts[] = "c:i:o:";
+static const char scsicmd_opts[] = "a:c:i:o:r";
 static const char readdefect_opts[] = "f:GP";
 static const char negotiate_opts[] = "acD:O:qR:T:UW:";
 #endif
@@ -2078,9 +2078,12 @@
 	u_int32_t flags = CAM_DIR_NONE;
 	u_int8_t *data_ptr = NULL;
 	u_int8_t cdb[20];
+	u_int8_t atacmd[12];
 	struct get_hook hook;
 	int c, data_bytes = 0;
 	int cdb_len = 0;
+	int atacmd_len = 0;
+	int need_res = 0;
 	char *datastr = NULL, *tstr;
 	int error = 0;
 	int fd_data = 0;
@@ -2094,10 +2097,32 @@
 	}
 
 	bzero(&(&ccb->ccb_h)[1],
-	      sizeof(struct ccb_scsiio) - sizeof(struct ccb_hdr));
+	      sizeof(union ccb) - sizeof(struct ccb_hdr));
 
 	while ((c = getopt(argc, argv, combinedopt)) != -1) {
 		switch(c) {
+		case 'a':
+			tstr = optarg;
+			while (isspace(*tstr) && (*tstr != '\0'))
+				tstr++;
+			hook.argc = argc - optind;
+			hook.argv = argv + optind;
+			hook.got = 0;
+			atacmd_len = buff_encode_visit(atacmd, sizeof(atacmd), tstr,
+						    iget, &hook);
+			/*
+			 * Increment optind by the number of arguments the
+			 * encoding routine processed.  After each call to
+			 * getopt(3), optind points to the argument that
+			 * getopt should process _next_.  In this case,
+			 * that means it points to the first command string
+			 * argument, if there is one.  Once we increment
+			 * this, it should point to either the next command
+			 * line argument, or it should be past the end of
+			 * the list.
+			 */
+			optind += hook.got;
+			break;
 		case 'c':
 			tstr = optarg;
 			while (isspace(*tstr) && (*tstr != '\0'))
@@ -2194,6 +2219,9 @@
 						  iget, &hook);
 			optind += hook.got;
 			break;
+		case 'r':
+			need_res = 1;
+			break;
 		default:
 			break;
 		}
@@ -2226,50 +2254,51 @@
 	/* Disable freezing the device queue */
 	flags |= CAM_DEV_QFRZDIS;
 
-	/*
-	 * This is taken from the SCSI-3 draft spec.
-	 * (T10/1157D revision 0.3)
-	 * The top 3 bits of an opcode are the group code.  The next 5 bits
-	 * are the command code.
-	 * Group 0:  six byte commands
-	 * Group 1:  ten byte commands
-	 * Group 2:  ten byte commands
-	 * Group 3:  reserved
-	 * Group 4:  sixteen byte commands
-	 * Group 5:  twelve byte commands
-	 * Group 6:  vendor specific
-	 * Group 7:  vendor specific
-	 */
-	switch((cdb[0] >> 5) & 0x7) {
-		case 0:
-			cdb_len = 6;
-			break;
-		case 1:
-		case 2:
-			cdb_len = 10;
-			break;
-		case 3:
-		case 6:
-		case 7:
-		        /* computed by buff_encode_visit */
-			break;
-		case 4:
-			cdb_len = 16;
-			break;
-		case 5:
-			cdb_len = 12;
-			break;
-	}
+	if (cdb_len) {
+		/*
+		 * This is taken from the SCSI-3 draft spec.
+		 * (T10/1157D revision 0.3)
+		 * The top 3 bits of an opcode are the group code.
+		 * The next 5 bits are the command code.
+		 * Group 0:  six byte commands
+		 * Group 1:  ten byte commands
+		 * Group 2:  ten byte commands
+		 * Group 3:  reserved
+		 * Group 4:  sixteen byte commands
+		 * Group 5:  twelve byte commands
+		 * Group 6:  vendor specific
+		 * Group 7:  vendor specific
+		 */
+		switch((cdb[0] >> 5) & 0x7) {
+			case 0:
+				cdb_len = 6;
+				break;
+			case 1:
+			case 2:
+				cdb_len = 10;
+				break;
+			case 3:
+			case 6:
+			case 7:
+			        /* computed by buff_encode_visit */
+				break;
+			case 4:
+				cdb_len = 16;
+				break;
+			case 5:
+				cdb_len = 12;
+				break;
+		}
 
-	/*
-	 * We should probably use csio_build_visit or something like that
-	 * here, but it's easier to encode arguments as you go.  The
-	 * alternative would be skipping the CDB argument and then encoding
-	 * it here, since we've got the data buffer argument by now.
-	 */
-	bcopy(cdb, &ccb->csio.cdb_io.cdb_bytes, cdb_len);
+		/*
+		 * We should probably use csio_build_visit or something like that
+		 * here, but it's easier to encode arguments as you go.  The
+		 * alternative would be skipping the CDB argument and then encoding
+		 * it here, since we've got the data buffer argument by now.
+		 */
+		bcopy(cdb, &ccb->csio.cdb_io.cdb_bytes, cdb_len);
 
-	cam_fill_csio(&ccb->csio,
+		cam_fill_csio(&ccb->csio,
 		      /*retries*/ retry_count,
 		      /*cbfcnp*/ NULL,
 		      /*flags*/ flags,
@@ -2279,7 +2308,22 @@
 		      /*sense_len*/ SSD_FULL_SIZE,
 		      /*cdb_len*/ cdb_len,
 		      /*timeout*/ timeout ? timeout : 5000);
+	} else {
+		atacmd_len = 12;
+		bcopy(atacmd, &ccb->ataio.cmd.command, atacmd_len);
+		if (need_res)
+			ccb->ataio.cmd.flags |= CAM_ATAIO_NEEDRESULT;
 
+		cam_fill_ataio(&ccb->ataio,
+		      /*retries*/ retry_count,
+		      /*cbfcnp*/ NULL,
+		      /*flags*/ flags,
+		      /*tag_action*/ 0,
+		      /*data_ptr*/ data_ptr,
+		      /*dxfer_len*/ data_bytes,
+		      /*timeout*/ timeout ? timeout : 5000);
+	}
+
 	if (((retval = cam_send_ccb(device, ccb)) < 0)
 	 || ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)) {
 		if (retval < 0)
@@ -2296,6 +2340,22 @@
 		goto scsicmd_bailout;
 	}
 
+	if (atacmd_len && need_res) {
+		fprintf(stdout,
+		    "%02X %02X %02X %02X %02X %02X %02X %02X %02X 00 %02X %02X\n",
+		    ccb->ataio.res.status,
+		    ccb->ataio.res.error,
+		    ccb->ataio.res.lba_low,
+		    ccb->ataio.res.lba_mid,
+		    ccb->ataio.res.lba_high,
+		    ccb->ataio.res.device,
+		    ccb->ataio.res.lba_low_exp,
+		    ccb->ataio.res.lba_mid_exp,
+		    ccb->ataio.res.lba_high_exp,
+		    ccb->ataio.res.sector_count,
+		    ccb->ataio.res.sector_count_exp);
+		fflush(stdout);
+	}
 
 	if (((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP)
 	 && (arglist & CAM_ARG_CMD_IN)
@@ -4029,8 +4089,9 @@
 "        camcontrol defects    [dev_id][generic args] <-f format> [-P][-G]\n"
 "        camcontrol modepage   [dev_id][generic args] <-m page | -l>\n"
 "                              [-P pagectl][-e | -b][-d]\n"
-"        camcontrol cmd        [dev_id][generic args] <-c cmd [args]>\n"
-"                              [-i len fmt|-o len fmt [args]]\n"
+"        camcontrol cmd        [dev_id][generic args]\n"
+"                              <-a cmd [args] | -c cmd [args]>\n"
+"                              [-i len fmt|-o len fmt [args]] [-r]\n"
 "        camcontrol debug      [-I][-P][-T][-S][-X][-c]\n"
 "                              \n"
 "        camcontrol tags       [dev_id][generic args] [-N tags] [-q] [-v]\n"

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 10:20:05 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E24861065670; Fri,  4 Sep 2009 10:20:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A8F34106566B
	for ; Fri,  4 Sep 2009 10:20:04 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9882F8FC20
	for ; Fri,  4 Sep 2009 10:20:04 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84AK4gj039315
	for ; Fri, 4 Sep 2009 10:20:04 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84AK4Re039312
	for perforce@freebsd.org; Fri, 4 Sep 2009 10:20:04 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 4 Sep 2009 10:20:04 GMT
Message-Id: <200909041020.n84AK4Re039312@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168149 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, 04 Sep 2009 10:20:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=168149

Change 168149 by pgj@beehive on 2009/09/04 10:19:33

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/hu/docs/books.sgml#23 integrate

Differences ...

==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#23 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
-
+
 
 

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 10:38:25 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F5A91065679; Fri,  4 Sep 2009 10:38:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E85821065676
	for ; Fri,  4 Sep 2009 10:38:24 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D7C2D8FC19
	for ; Fri,  4 Sep 2009 10:38:24 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84AcOLa040730
	for ; Fri, 4 Sep 2009 10:38:24 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84AcOYA040728
	for perforce@freebsd.org; Fri, 4 Sep 2009 10:38:24 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 4 Sep 2009 10:38:24 GMT
Message-Id: <200909041038.n84AcOYA040728@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168151 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, 04 Sep 2009 10:38:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=168151

Change 168151 by pgj@beehive on 2009/09/04 10:38:22

	MFen (www):
		1.87       -> 1.88       hu/share/sgml/press.xml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#23 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#23 (text+ko) ====

@@ -5,7 +5,7 @@
 
 
 
@@ -41,6 +41,19 @@
 	  és ezáltal hatékonyabbá
 	  tétele.

       
+
+      
+	FreeNAS: Adattárolás egyszerûen
+	http://www.radioworld.com/article/85170
+	Radio World
+	http://www.radioworld.com/
+	2009. augusztus 11.
+	Todd Dixon
+	
A szerzõ lenyûgözötten méltatja a
+	  &os; alapokon üzemelõ FreeNAS sebességét
+	  és alacsony
+	  erõforrásigényét.

+      
     
 
     

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 11:19:10 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B44461065676; Fri,  4 Sep 2009 11:19:10 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 775401065670
	for ; Fri,  4 Sep 2009 11:19:10 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 64BB08FC1B
	for ; Fri,  4 Sep 2009 11:19:10 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84BJAPV044707
	for ; Fri, 4 Sep 2009 11:19:10 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84BJ9va044705
	for perforce@freebsd.org; Fri, 4 Sep 2009 11:19:09 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Fri, 4 Sep 2009 11:19:09 GMT
Message-Id: <200909041119.n84BJ9va044705@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168152 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, 04 Sep 2009 11:19:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=168152

Change 168152 by anchie@anchie_malimis on 2009/09/04 11:19:01

	Update.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/XENHVM#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/apicvar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmc_mdep.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/undefined.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/CAMBRIA#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/SHEEVAPLUG#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/common.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/discovery/db78xxx.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mvreg.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mvvar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/NOTES#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.i386#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.ia64#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/newvers.sh#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.amd64#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.arm#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.i386#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.pc98#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/altq/altq/altq_subr.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/pf/net/pf_if.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/contrib/pf/net/pfvar.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_battery.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_dock.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_thermal.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/adb/adb_bus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/alc/if_alc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/amdtemp/amdtemp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/amr/amr.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/asmc/asmc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_bufs.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_drv.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_fops.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/drm_sysctl.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/r600_blit.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/r600_cp.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_cs.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_drm.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/radeon_state.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/pmc_events.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mge/if_mge.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mlx/mlx.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ppbus/vpo.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/pst/pst-iop.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/pty/pty.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/hda/hdac.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/scterm-teken.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/Makefile#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/gensequences#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/sequences#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken_demo.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken_scs.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken_stress.c#3 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken_subr.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken_subr_compat.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/syscons/teken/teken_wcwidth.h#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/dev/twe/twe.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/txp/if_txp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/usb_controller.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/ukbd.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/misc/ufm.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_aue.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/if_cdce.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/usb_ethernet.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uipaq.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uvisor.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/storage/umass.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/storage/urio.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_busdma.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_compat_linux.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_dev.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_handle_request.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_hub.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_process.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_process.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_upgt.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_zyd.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/xen/blkback/blkback.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/xen/blkfront/blkfront.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/xen/console/console.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/xen/netback/netback.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clvnops.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/bios/smapi.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/bios/smbios.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/bios/vpd.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/apicvar.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/pmap.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/vesa.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/locore.s#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/pmap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/isa/isahint.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_cons.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_jail.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_lock.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_poll.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_proc.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_sx.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_uuid.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_sglist.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/tty_pts.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/tty_pty.c#2 delete
.. //depot/projects/soc2009/anchie_send/src/sys/kern/tty_ttydisc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_domain.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_cache.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/drm/radeon/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/pty/Makefile#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/bridgestp.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/flowtable.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/flowtable.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_arp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_ef.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_llatbl.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_llatbl.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_var.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/if_vlan.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#21 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/vnet.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net/vnet.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_dfs.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_sta.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_gif.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_divert.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_divert.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_fw.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw2.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#24 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#20 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_rtr.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netipsec/xform_ipip.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/bootp_subr.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/pc98/cbus/fdc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/clnt_dg.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/clnt_rc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/clnt_vc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/svc_dg.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/svc_generic.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/rpc/svc_vc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/bus.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/conf.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/cons.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/imgact_elf.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/lock.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/param.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/proc.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/sglist.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/smp.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/systm.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/taskqueue.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/ttydisc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/types.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/teken/Makefile#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/gensequences#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/sequences#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken_demo.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken_scs.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken_stress.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken_subr.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken_subr_compat.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/teken/teken_wcwidth.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/device_pager.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/sg_pager.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/vm.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_extern.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_glue.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/xen/xenbus/xenbus_probe.c#3 integrate

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.30 2009/04/05 09:27:19 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.32 2009/08/30 14:38:17 bz Exp $");
 
 #include 
 #include 
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -108,6 +109,22 @@
 	(sysinit_cfunc_t) elf64_insert_brand_entry,
 	&freebsd_brand_oinfo);
 
+static Elf64_Brandinfo kfreebsd_brand_info = {
+	.brand		= ELFOSABI_FREEBSD,
+	.machine	= EM_X86_64,
+	.compat_3_brand	= "FreeBSD",
+	.emul_path	= NULL,
+	.interp_path	= "/lib/ld-kfreebsd-x86-64.so.1",
+	.sysvec		= &elf64_freebsd_sysvec,
+	.interp_newpath	= NULL,
+	.brand_note	= &elf64_kfreebsd_brandnote,
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY
+};
+
+SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY,
+	(sysinit_cfunc_t) elf64_insert_brand_entry,
+	&kfreebsd_brand_info);
+
 
 void
 elf64_dump_thread(struct thread *td __unused, void *dst __unused,

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/local_apic.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.58 2009/07/01 17:20:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.61 2009/09/02 00:39:59 jhb Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -123,7 +123,7 @@
 	{ 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 },	/* LINT1: NMI */
 	{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT },	/* Timer */
 	{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT },	/* Error */
-	{ 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 },	/* PMC */
+	{ 1, 1, 1, 1, APIC_LVT_DM_NMI, 0 },	/* PMC */
 	{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT },	/* Thermal */
 };
 
@@ -305,11 +305,9 @@
 	lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0);
 	lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1);
 
-#ifdef	HWPMC_HOOKS
 	/* Program the PMC LVT entry if present. */
 	if (maxlvt >= LVT_PMC)
 		lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint);
-#endif
 
 	/* Program timer LVT and setup handler. */
 	lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer);
@@ -332,6 +330,88 @@
 	intr_restore(eflags);
 }
 
+void
+lapic_reenable_pmc(void)
+{
+#ifdef HWPMC_HOOKS
+	uint32_t value;
+
+	value =  lapic->lvt_pcint;
+	value &= ~APIC_LVT_M;
+	lapic->lvt_pcint = value;
+#endif
+}
+
+#ifdef HWPMC_HOOKS
+static void
+lapic_update_pmc(void *dummy)
+{
+	struct lapic *la;
+
+	la = &lapics[lapic_id()];
+	lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint);
+}
+#endif
+
+int
+lapic_enable_pmc(void)
+{
+#ifdef HWPMC_HOOKS
+	u_int32_t maxlvt;
+
+	/* Fail if the local APIC is not present. */
+	if (lapic == NULL)
+		return (0);
+
+	/* Fail if the PMC LVT is not present. */
+	maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT;
+	if (maxlvt < LVT_PMC)
+		return (0);
+
+	lvts[LVT_PMC].lvt_masked = 0;
+
+#ifdef SMP
+	/*
+	 * If hwpmc was loaded at boot time then the APs may not be
+	 * started yet.  In that case, don't forward the request to
+	 * them as they will program the lvt when they start.
+	 */
+	if (smp_started)
+		smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL);
+	else
+#endif
+		lapic_update_pmc(NULL);
+	return (1);
+#else
+	return (0);
+#endif
+}
+
+void
+lapic_disable_pmc(void)
+{
+#ifdef HWPMC_HOOKS
+	u_int32_t maxlvt;
+
+	/* Fail if the local APIC is not present. */
+	if (lapic == NULL)
+		return;
+
+	/* Fail if the PMC LVT is not present. */
+	maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT;
+	if (maxlvt < LVT_PMC)
+		return;
+
+	lvts[LVT_PMC].lvt_masked = 1;
+
+#ifdef SMP
+	/* The APs should always be started when hwpmc is unloaded. */
+	KASSERT(mp_ncpus == 1 || smp_started, ("hwpmc unloaded too early"));
+#endif
+	smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL);
+#endif
+}
+
 /*
  * Called by cpu_initclocks() on the BSP to setup the local APIC timer so
  * that it can drive hardclock, statclock, and profclock.  This function
@@ -910,18 +990,21 @@
 	 * we don't lose an interrupt delivery race.
 	 */
 	td = curthread;
-	thread_lock(td);
-	if (sched_is_bound(td))
-		panic("apic_free_vector: Thread already bound.\n");
-	sched_bind(td, apic_cpuid(apic_id));
-	thread_unlock(td);
+	if (!rebooting) {
+		thread_lock(td);
+		if (sched_is_bound(td))
+			panic("apic_free_vector: Thread already bound.\n");
+		sched_bind(td, apic_cpuid(apic_id));
+		thread_unlock(td);
+	}
 	mtx_lock_spin(&icu_lock);
 	lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1;
 	mtx_unlock_spin(&icu_lock);
-	thread_lock(td);
-	sched_unbind(td);
-	thread_unlock(td);
-
+	if (!rebooting) {
+		thread_lock(td);
+		sched_unbind(td);
+		thread_unlock(td);
+	}
 }
 
 /* Map an IDT vector (APIC) to an IRQ (interrupt source). */
@@ -1238,8 +1321,17 @@
 	KASSERT((vector & ~APIC_VECTOR_MASK) == 0,
 	    ("%s: invalid vector %d", __func__, vector));
 
-	icrlo = vector | APIC_DELMODE_FIXED | APIC_DESTMODE_PHY |
-	    APIC_LEVEL_DEASSERT | APIC_TRIGMOD_EDGE;
+	icrlo = APIC_DESTMODE_PHY | APIC_TRIGMOD_EDGE;
+
+	/*
+	 * IPI_STOP_HARD is just a "fake" vector used to send a NMI.
+	 * Use special rules regard NMI if passed, otherwise specify
+	 * the vector.
+	 */
+	if (vector == IPI_STOP_HARD)
+		icrlo |= APIC_DELMODE_NMI | APIC_LEVEL_ASSERT;
+	else
+		icrlo |= vector | APIC_DELMODE_FIXED | APIC_LEVEL_DEASSERT;
 	destfield = 0;
 	switch (dest) {
 	case APIC_IPI_DEST_SELF:

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/machdep.c#4 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.707 2009/08/02 11:26:23 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.709 2009/08/20 22:58:05 jkim Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -217,6 +217,7 @@
 		    strncmp(sysenv, "MacBook3,1", 10) == 0 ||
 		    strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
 		    strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+		    strncmp(sysenv, "MacBookPro3,1", 13) == 0 ||
 		    strncmp(sysenv, "Macmini1,1", 10) == 0) {
 			if (bootverbose)
 				printf("Disabling LEGACY_USB_EN bit on "
@@ -235,19 +236,21 @@
 #ifdef PERFMON
 	perfmon_init();
 #endif
+	realmem = Maxmem;
+
+	/*
+	 * Display physical memory if SMBIOS reports reasonable amount.
+	 */
+	memsize = 0;
 	sysenv = getenv("smbios.memory.enabled");
 	if (sysenv != NULL) {
-		memsize = (uintmax_t)strtoul(sysenv, (char **)NULL, 10);
+		memsize = (uintmax_t)strtoul(sysenv, (char **)NULL, 10) << 10;
 		freeenv(sysenv);
-	} else
-		memsize = 0;
-	if (memsize > 0)
-		printf("real memory  = %ju (%ju MB)\n", memsize << 10,
-		    memsize >> 10);
-	else
-		printf("real memory  = %ju (%ju MB)\n", ptoa((uintmax_t)Maxmem),
-		    ptoa((uintmax_t)Maxmem) / 1048576);
-	realmem = Maxmem;
+	}
+	if (memsize < ptoa((uintmax_t)cnt.v_free_count))
+		memsize = ptoa((uintmax_t)Maxmem);
+	printf("real memory  = %ju (%ju MB)\n", memsize, memsize >> 20);
+
 	/*
 	 * Display any holes after the first chunk of extended memory.
 	 */

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.309 2009/06/23 22:42:39 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.310 2009/08/13 17:09:45 attilio Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -114,31 +114,12 @@
 
 extern inthand_t IDTVEC(fast_syscall), IDTVEC(fast_syscall32);
 
-#ifdef STOP_NMI
-static volatile cpumask_t ipi_nmi_pending;
-
-static void	ipi_nmi_selected(cpumask_t cpus);
-#endif 
-
 /*
  * Local data and functions.
  */
 
-#ifdef STOP_NMI
-/* 
- * Provide an alternate method of stopping other CPUs. If another CPU has
- * disabled interrupts the conventional STOP IPI will be blocked. This 
- * NMI-based stop should get through in that case.
- */
-static int stop_cpus_with_nmi = 1;
-SYSCTL_INT(_debug, OID_AUTO, stop_cpus_with_nmi, CTLTYPE_INT | CTLFLAG_RW,
-    &stop_cpus_with_nmi, 0, "");
-TUNABLE_INT("debug.stop_cpus_with_nmi", &stop_cpus_with_nmi);
-#else
-#define	stop_cpus_with_nmi	0
-#endif
-
 static u_int logical_cpus;
+static volatile cpumask_t ipi_nmi_pending;
 
 /* used to hold the AP's until we are ready to release them */
 static struct mtx ap_boot_mtx;
@@ -1158,12 +1139,14 @@
 		ipi = IPI_BITMAP_VECTOR;
 	}
 
-#ifdef STOP_NMI
-	if (ipi == IPI_STOP && stop_cpus_with_nmi) {
-		ipi_nmi_selected(cpus);
-		return;
-	}
-#endif
+	/*
+	 * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit
+	 * of help in order to understand what is the source.
+	 * Set the mask of receiving CPUs for this purpose.
+	 */
+	if (ipi == IPI_STOP_HARD)
+		atomic_set_int(&ipi_nmi_pending, cpus);
+
 	CTR3(KTR_SMP, "%s: cpus: %x ipi: %x", __func__, cpus, ipi);
 	while ((cpu = ffs(cpus)) != 0) {
 		cpu--;
@@ -1194,64 +1177,43 @@
 ipi_all_but_self(u_int ipi)
 {
 
-	if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) {
+	if (IPI_IS_BITMAPED(ipi)) {
 		ipi_selected(PCPU_GET(other_cpus), ipi);
 		return;
 	}
+
+	/*
+	 * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit
+	 * of help in order to understand what is the source.
+	 * Set the mask of receiving CPUs for this purpose.
+	 */
+	if (ipi == IPI_STOP_HARD)
+		atomic_set_int(&ipi_nmi_pending, PCPU_GET(other_cpus));
+
 	CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi);
 	lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS);
 }
 
-#ifdef STOP_NMI
-/*
- * send NMI IPI to selected CPUs
- */
-
-#define	BEFORE_SPIN	1000000
-
-static void
-ipi_nmi_selected(cpumask_t cpus)
-{
-	int cpu;
-	register_t icrlo;
-
-	icrlo = APIC_DELMODE_NMI | APIC_DESTMODE_PHY | APIC_LEVEL_ASSERT 
-		| APIC_TRIGMOD_EDGE; 
-	
-	CTR2(KTR_SMP, "%s: cpus: %x nmi", __func__, cpus);
-
-	atomic_set_int(&ipi_nmi_pending, cpus);
-
-	while ((cpu = ffs(cpus)) != 0) {
-		cpu--;
-		cpus &= ~(1 << cpu);
-
-		KASSERT(cpu_apic_ids[cpu] != -1,
-		    ("IPI NMI to non-existent CPU %d", cpu));
-		
-		/* Wait for an earlier IPI to finish. */
-		if (!lapic_ipi_wait(BEFORE_SPIN))
-			panic("ipi_nmi_selected: previous IPI has not cleared");
-
-		lapic_ipi_raw(icrlo, cpu_apic_ids[cpu]);
-	}
-}
-
 int
-ipi_nmi_handler(void)
+ipi_nmi_handler()
 {
-	int cpumask = PCPU_GET(cpumask);
+	cpumask_t cpumask;
 
-	if (!(ipi_nmi_pending & cpumask))
-		return 1;
+	/*
+	 * As long as there is not a simple way to know about a NMI's
+	 * source, if the bitmask for the current CPU is present in
+	 * the global pending bitword an IPI_STOP_HARD has been issued
+	 * and should be handled.
+	 */
+	cpumask = PCPU_GET(cpumask);
+	if ((ipi_nmi_pending & cpumask) == 0)
+		return (1);
 
 	atomic_clear_int(&ipi_nmi_pending, cpumask);
 	cpustop_handler();
-	return 0;
+	return (0);
 }
      
-#endif /* STOP_NMI */
-
 /*
  * Handle an IPI_STOP by saving our current context and spinning until we
  * are resumed.

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#4 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.667 2009/07/24 13:50:29 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.672 2009/09/02 16:47:10 jkim Exp $");
 
 /*
  *	Manages physical address maps.
@@ -178,6 +178,8 @@
 vm_offset_t kernel_vm_end = VM_MIN_KERNEL_ADDRESS;
 pt_entry_t pg_nx;
 
+static int pat_works = 0;		/* Is page attribute table sane? */
+
 SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
 static int pg_ps_enabled = 1;
@@ -590,20 +592,56 @@
 pmap_init_pat(void)
 {
 	uint64_t pat_msr;
+	char *sysenv;
+	static int pat_tested = 0;
 
 	/* Bail if this CPU doesn't implement PAT. */
 	if (!(cpu_feature & CPUID_PAT))
 		panic("no PAT??");
 
 	/*
-	 * Leave the indices 0-3 at the default of WB, WT, UC, and UC-.
-	 * Program 4 and 5 as WP and WC.
-	 * Leave 6 and 7 as UC and UC-.
+	 * Some Apple Macs based on nVidia chipsets cannot enter ACPI mode
+	 * via SMI# when we use upper 4 PAT entries for unknown reason.
 	 */
-	pat_msr = rdmsr(MSR_PAT);
-	pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5));
-	pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) |
-	    PAT_VALUE(5, PAT_WRITE_COMBINING);
+	if (!pat_tested) {
+		pat_works = 1;
+		sysenv = getenv("smbios.system.product");
+		if (sysenv != NULL) {
+			if (strncmp(sysenv, "MacBook5,1", 10) == 0 ||
+			    strncmp(sysenv, "MacBookPro5,5", 13) == 0 ||
+			    strncmp(sysenv, "Macmini3,1", 10) == 0)
+				pat_works = 0;
+			freeenv(sysenv);
+		}
+		pat_tested = 1;
+	}
+
+	/* Initialize default PAT entries. */
+	pat_msr = PAT_VALUE(0, PAT_WRITE_BACK) |
+	    PAT_VALUE(1, PAT_WRITE_THROUGH) |
+	    PAT_VALUE(2, PAT_UNCACHED) |
+	    PAT_VALUE(3, PAT_UNCACHEABLE) |
+	    PAT_VALUE(4, PAT_WRITE_BACK) |
+	    PAT_VALUE(5, PAT_WRITE_THROUGH) |
+	    PAT_VALUE(6, PAT_UNCACHED) |
+	    PAT_VALUE(7, PAT_UNCACHEABLE);
+
+	if (pat_works) {
+		/*
+		 * Leave the indices 0-3 at the default of WB, WT, UC-, and UC.
+		 * Program 4 and 5 as WP and WC.
+		 * Leave 6 and 7 as UC- and UC.
+		 */
+		pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5));
+		pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) |
+		    PAT_VALUE(5, PAT_WRITE_COMBINING);
+	} else {
+		/*
+		 * Just replace PAT Index 2 with WC instead of UC-.
+		 */
+		pat_msr &= ~PAT_MASK(2);
+		pat_msr |= PAT_VALUE(2, PAT_WRITE_COMBINING);
+	}
 	wrmsr(MSR_PAT, pat_msr);
 }
 
@@ -754,27 +792,48 @@
 	pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT;
 
 	/* Map the caching mode to a PAT index. */
-	switch (mode) {
-	case PAT_UNCACHEABLE:
-		pat_index = 3;
-		break;
-	case PAT_WRITE_THROUGH:
-		pat_index = 1;
-		break;
-	case PAT_WRITE_BACK:
-		pat_index = 0;
-		break;
-	case PAT_UNCACHED:
-		pat_index = 2;
-		break;
-	case PAT_WRITE_COMBINING:
-		pat_index = 5;
-		break;
-	case PAT_WRITE_PROTECTED:
-		pat_index = 4;
-		break;
-	default:
-		panic("Unknown caching mode %d\n", mode);
+	if (pat_works) {
+		switch (mode) {
+		case PAT_UNCACHEABLE:
+			pat_index = 3;
+			break;
+		case PAT_WRITE_THROUGH:
+			pat_index = 1;
+			break;
+		case PAT_WRITE_BACK:
+			pat_index = 0;
+			break;
+		case PAT_UNCACHED:
+			pat_index = 2;
+			break;
+		case PAT_WRITE_COMBINING:
+			pat_index = 5;
+			break;
+		case PAT_WRITE_PROTECTED:
+			pat_index = 4;
+			break;
+		default:
+			panic("Unknown caching mode %d\n", mode);
+		}
+	} else {
+		switch (mode) {
+		case PAT_UNCACHED:
+		case PAT_UNCACHEABLE:
+		case PAT_WRITE_PROTECTED:
+			pat_index = 3;
+			break;
+		case PAT_WRITE_THROUGH:
+			pat_index = 1;
+			break;
+		case PAT_WRITE_BACK:
+			pat_index = 0;
+			break;
+		case PAT_WRITE_COMBINING:
+			pat_index = 2;
+			break;
+		default:
+			panic("Unknown caching mode %d\n", mode);
+		}
 	}
 
 	/* Map the 3-bit index value into the PAT, PCD, and PWT bits. */
@@ -943,8 +1002,8 @@
 		 * coherence domain.
 		 */
 		mfence();
-		for (; eva < sva; eva += cpu_clflush_line_size)
-			clflush(eva);
+		for (; sva < eva; sva += cpu_clflush_line_size)
+			clflush(sva);
 		mfence();
 	} else {
 
@@ -2261,6 +2320,8 @@
 			    " in pmap %p", va, pmap);
 			return (FALSE);
 		}
+		if (va < VM_MAXUSER_ADDRESS)
+			pmap->pm_stats.resident_count++;
 	}
 	mptepa = VM_PAGE_TO_PHYS(mpte);
 	firstpte = (pt_entry_t *)PHYS_TO_DMAP(mptepa);
@@ -4474,7 +4535,8 @@
 	if (base < DMAP_MIN_ADDRESS)
 		return (EINVAL);
 
-	cache_bits_pde = cache_bits_pte = -1;
+	cache_bits_pde = pmap_cache_bits(mode, 1);
+	cache_bits_pte = pmap_cache_bits(mode, 0);
 	changed = FALSE;
 
 	/*
@@ -4491,8 +4553,6 @@
 			 * memory type, then we need not demote this page. Just
 			 * increment tmpva to the next 1GB page frame.
 			 */
-			if (cache_bits_pde < 0)
-				cache_bits_pde = pmap_cache_bits(mode, 1);
 			if ((*pdpe & PG_PDE_CACHE) == cache_bits_pde) {
 				tmpva = trunc_1gpage(tmpva) + NBPDP;
 				continue;
@@ -4520,8 +4580,6 @@
 			 * memory type, then we need not demote this page. Just
 			 * increment tmpva to the next 2MB page frame.
 			 */
-			if (cache_bits_pde < 0)
-				cache_bits_pde = pmap_cache_bits(mode, 1);
 			if ((*pde & PG_PDE_CACHE) == cache_bits_pde) {
 				tmpva = trunc_2mpage(tmpva) + NBPDR;
 				continue;
@@ -4555,12 +4613,9 @@
 	for (tmpva = base; tmpva < base + size; ) {
 		pdpe = pmap_pdpe(kernel_pmap, tmpva);
 		if (*pdpe & PG_PS) {

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 11:58:54 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C8491065692; Fri,  4 Sep 2009 11:58:54 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40AF1106568B
	for ; Fri,  4 Sep 2009 11:58:54 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 16C5C8FC0A
	for ; Fri,  4 Sep 2009 11:58:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84BwrAx047511
	for ; Fri, 4 Sep 2009 11:58:53 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84BwrWJ047509
	for perforce@freebsd.org; Fri, 4 Sep 2009 11:58:53 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Fri, 4 Sep 2009 11:58:53 GMT
Message-Id: <200909041158.n84BwrWJ047509@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168153 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, 04 Sep 2009 11:58:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=168153

Change 168153 by anchie@anchie_malimis on 2009/09/04 11:58:53

	The documentation about the implementation work on the native kernel
	SeND API.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/web/gsoc2009_send.htm#1 add
.. //depot/projects/soc2009/anchie_send/web/project-goal#1 add
.. //depot/projects/soc2009/anchie_send/web/snd_hooks.htm#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 12:57:59 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CFB9B1065676; Fri,  4 Sep 2009 12:57:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AF8C1065670
	for ; Fri,  4 Sep 2009 12:57:58 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6978C8FC15
	for ; Fri,  4 Sep 2009 12:57:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84Cvw4H062901
	for ; Fri, 4 Sep 2009 12:57:58 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84CvwqH062899
	for perforce@freebsd.org; Fri, 4 Sep 2009 12:57:58 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 4 Sep 2009 12:57:58 GMT
Message-Id: <200909041257.n84CvwqH062899@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168154 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, 04 Sep 2009 12:57:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=168154

Change 168154 by stas@stas_yandex on 2009/09/04 12:57:35

	- Fix signals on x86.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#6 edit
.. //depot/projects/valgrind/coregrind/m_trampoline.S#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#6 (text+ko) ====

@@ -46,20 +46,8 @@
 #include "pub_core_sigframe.h"   /* self */
 
 
-#warning Needs love!
-
-
 /* This module creates and removes signal frames for signal deliveries
    on x86-freebsd.
-
-   FIXME: sigcontexting is basically broken for the moment.  When
-   delivering a signal, the integer registers and %eflags are
-   correctly written into the sigcontext, however the FP and SSE state
-   is not.  When returning from a signal, only the integer registers
-   are restored from the sigcontext; the rest of the CPU state is
-   restored to what it was before the signal.
-
-   This should be fixed.
 */
 
 
@@ -109,9 +97,18 @@
 {
    /* Sig handler's return address */
    Addr retaddr;
+
    Int  sigNo;
+   Addr psigInfo;      /* code or pointer to sigContext */
+   Addr puContext;     /* points to uContext */
+   Addr addr;          /* "secret" 4th argument */
+   Addr phandler;      /* "action" or "handler" */
+
+   /* pointed to by puContext */
+   struct vki_ucontext uContext;
 
-   struct vki_sigcontext sigContext;
+   vki_siginfo_t sigInfo;
+
    struct _vki_fpstate fpstate;
 
    struct vg_sigframe vg;
@@ -123,8 +120,7 @@
 /*------------------------------------------------------------*/
 
 /* Create a plausible-looking sigcontext from the thread's
-   Vex guest state.  NOTE: does not fill in the FP or SSE
-   bits of sigcontext at the moment.
+   Vex guest state.
 */
 static 
 void synth_ucontext(ThreadId tid, const vki_siginfo_t *si,
@@ -142,8 +138,6 @@
    uc->uc_stack = tst->altstack;
    VG_(memcpy)(&sc->fpstate, fpstate, sizeof(*fpstate));
 
-   // FIXME: save_i387(&tst->arch, fpstate);
-
 #  define SC2(reg,REG)  sc->reg = tst->arch.vex.guest_##REG
    SC2(gs,GS);
    SC2(fs,FS);
@@ -163,9 +157,12 @@
    SC2(cs,CS);
    sc->eflags = LibVEX_GuestX86_get_eflags(&tst->arch.vex);
    SC2(ss,SS);
-   /* XXX esp_at_signal */
    sc->trapno = trapno;
    sc->err = err;
+//   sc->addr = (UWord)si->si_addr;
+   sc->fpformat = VKI_FPFMT_NODEV;
+   sc->len = sizeof(*sc);
+   sc->ownedfp = VKI_FPOWNED_NONE;
 #  undef SC2
 
 //   sc->cr2 = (UInt)si->_sifields._sigfault._addr;
@@ -220,6 +217,7 @@
 
 static void build_vg_sigframe(struct vg_sigframe *frame,
 			      ThreadState *tst,
+                              const vki_sigset_t *mask,
 			      UInt flags,
 			      Int sigNo)
 {
@@ -235,21 +233,19 @@
    frame->magicE        = 0x27182818;
 }
 
-
 static Addr build_sigframe(ThreadState *tst,
-			   Addr esp_top_of_frame,
-			   const vki_siginfo_t *siginfo,
-                           const struct vki_ucontext *siguc,
-			   UInt flags,
-			   const vki_sigset_t *mask,
-			   void *restorer)
+                              Addr esp_top_of_frame,
+                              const vki_siginfo_t *siginfo,
+                              const struct vki_ucontext *siguc,
+                              void *handler, UInt flags,
+                              const vki_sigset_t *mask,
+                              void *restorer)
 {
    struct sigframe *frame;
    Addr esp = esp_top_of_frame;
-   Int	sigNo = siginfo->si_signo;
+   Int  sigNo = siginfo->si_signo;
    UWord trapno;
    UWord err;
-   struct vki_ucontext uc;
 
    esp -= sizeof(*frame);
    esp = VG_ROUNDDN(esp, 16);
@@ -258,37 +254,35 @@
    if (!extend(tst, esp, sizeof(*frame)))
       return esp_top_of_frame;
 
-   /* retaddr, sigNo, siguContext fields are to be written */
-   VG_TRACK( pre_mem_write, Vg_CoreSignal, tst->tid, "signal handler frame", 
-	     esp, offsetof(struct sigframe, vg) );
+   /* retaddr, siginfo, uContext fields are to be written */
+   VG_TRACK( pre_mem_write, Vg_CoreSignal, tst->tid, "signal handler frame",
+             esp, offsetof(struct sigframe, vg) );
 
    frame->sigNo = sigNo;
-
    frame->retaddr = (Addr)&VG_(x86_freebsd_SUBST_FOR_sigreturn);
+   if ((flags & VKI_SA_SIGINFO) == 0)
+      frame->psigInfo = (Addr)siginfo->si_code;
+   else
+      frame->psigInfo = (Addr)&frame->sigInfo;
+   VG_(memcpy)(&frame->sigInfo, siginfo, sizeof(vki_siginfo_t));
 
-   if (siguc) {
-      trapno = siguc->uc_mcontext.trapno;
-      err = siguc->uc_mcontext.err;
-   } else {
-      trapno = 0;
-      err = 0;
-   }
+   trapno = siguc->uc_mcontext.trapno;
+   err = siguc->uc_mcontext.err;
 
-   synth_ucontext(tst->tid, siginfo, trapno, err, mask, &uc, &frame->fpstate);
+   synth_ucontext(tst->tid, siginfo, trapno, err, mask,
+                  &frame->uContext, &frame->fpstate);
 
-   VG_(memcpy)(&frame->sigContext, &uc.uc_mcontext, 
-	       sizeof(struct vki_sigcontext));
-//   frame->sigContext.oldmask = mask->sig[0];
+   if (sigNo == VKI_SIGILL && siginfo->si_code > 0)
+      frame->sigInfo.si_addr = (void*)tst->arch.vex.guest_EIP;
 
-   VG_TRACK( post_mem_write, Vg_CoreSignal, tst->tid, 
+   VG_TRACK( post_mem_write,  Vg_CoreSignal, tst->tid,
              esp, offsetof(struct sigframe, vg) );
 
-   build_vg_sigframe(&frame->vg, tst, flags, sigNo);
-   
+   build_vg_sigframe(&frame->vg, tst, mask, flags, sigNo);
+
    return esp;
 }
 
-
 /* EXPORTED */
 void VG_(sigframe_create)( ThreadId tid, 
                            Addr esp_top_of_frame,
@@ -302,7 +296,7 @@
    Addr		esp;
    ThreadState* tst = VG_(get_ThreadState)(tid);
 
-   esp = build_sigframe(tst, esp_top_of_frame, siginfo, siguc,
+   esp = build_sigframe(tst, esp_top_of_frame, siginfo, siguc, handler, 
                              flags, mask, restorer);
 
    /* Set the thread so it will next run the handler. */
@@ -310,8 +304,8 @@
    VG_(set_SP)(tid, esp);
    VG_TRACK( post_reg_write, Vg_CoreSignal, tid, VG_O_STACK_PTR, sizeof(Addr));
 
-   //VG_(printf)("handler = %p\n", handler);
    tst->arch.vex.guest_EIP = (Addr) handler;
+//   tst->arch.vex.guest_EDI = (ULong) siginfo->si_signo;
    /* This thread needs to be marked runnable, but we leave that the
       caller to do. */
 
@@ -335,8 +329,7 @@
    if (frame->magicPI != 0x31415927 ||
        frame->magicE  != 0x27182818) {
       VG_(message)(Vg_UserMsg, "Thread %d return signal frame "
-                               "corrupted.  Killing process.\n",
-		   tst->tid);
+                               "corrupted.  Killing process.", tst->tid);
       VG_(set_default_handler)(VKI_SIGSEGV);
       VG_(synth_fault)(tst->tid);
       *sigNo = VKI_SIGSEGV;
@@ -355,7 +348,7 @@
 
 static 
 void restore_sigcontext( ThreadState *tst, 
-                         struct vki_sigcontext *sc, 
+                         struct vki_mcontext *sc, 
                          struct _vki_fpstate *fpstate )
 {
    tst->arch.vex.guest_EAX     = sc->eax;
@@ -374,8 +367,7 @@
    tst->arch.vex.guest_ES      = sc->es;
    tst->arch.vex.guest_FS      = sc->fs;
    tst->arch.vex.guest_GS      = sc->gs;
-
-//::    restore_i387(&tst->arch, fpstate);
+   VG_(memcpy)(fpstate, &sc->fpstate, sizeof(*fpstate));
 }
 
 
@@ -384,7 +376,7 @@
                          struct sigframe *frame, Int *sigNo )
 {
    if (restore_vg_sigframe(tst, &frame->vg, sigNo))
-      restore_sigcontext(tst, &frame->sigContext, &frame->fpstate);
+      restore_sigcontext(tst, &frame->uContext.uc_mcontext, &frame->fpstate);
 
    return sizeof(*frame);
 }
@@ -401,6 +393,7 @@
 
    /* Correctly reestablish the frame base address. */
    esp   = tst->arch.vex.guest_ESP;
+   esp  += 8; /* Clean up stack from argument/ret passed to sigreturn(2) */
 
    size = restore_sigframe(tst, (struct sigframe *)esp, &sigNo);
 

==== //depot/projects/valgrind/coregrind/m_trampoline.S#8 (text+ko) ====

@@ -788,8 +788,6 @@
 .global VG_(trampoline_stuff_start)
 VG_(trampoline_stuff_start):
 
-// AAA check for 64 bit correctness here. also, assumes linux style syscall
-// args where sigframe is top-of-stack, not a pointer as an argument
 .global VG_(amd64_freebsd_SUBST_FOR_sigreturn)
 VG_(amd64_freebsd_SUBST_FOR_sigreturn):
         /* This is a very specific sequence which GDB uses to

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 14:00:15 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DEB941065693; Fri,  4 Sep 2009 14:00:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A4A5C1065670
	for ; Fri,  4 Sep 2009 14:00:14 +0000 (UTC)
	(envelope-from marinosi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9327A8FC08
	for ; Fri,  4 Sep 2009 14:00:14 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84E06kl070294
	for ; Fri, 4 Sep 2009 14:00:06 GMT
	(envelope-from marinosi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84E06vi070292
	for perforce@freebsd.org; Fri, 4 Sep 2009 14:00:06 GMT
	(envelope-from marinosi@FreeBSD.org)
Date: Fri, 4 Sep 2009 14:00:06 GMT
Message-Id: <200909041400.n84E06vi070292@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marinosi@FreeBSD.org using -f
From: Ilias Marinos 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168155 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, 04 Sep 2009 14:00:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=168155

Change 168155 by marinosi@marinosi_redrum on 2009/09/04 14:00:05

	- Added audit_trigger.h header files which contains data about the trigger protocols.
	- Starting implementing a TLV based trigger protocol for multiple slices.

Affected files ...

.. //depot/projects/soc2009/marinosi_appaudit/src/sys/bsm/audit.h#7 edit
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_trigger.c#2 edit
.. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_trigger.h#1 add

Differences ...

==== //depot/projects/soc2009/marinosi_appaudit/src/sys/bsm/audit.h#7 (text) ====

@@ -312,7 +312,9 @@
 #if !defined(_KERNEL) && !defined(KERNEL)
 int	audit(const void *, int);
 int	auditon(int, void *, int);
+int	auditon_slice(int, char *, void *, int);
 int	auditctl(const char *);
+int	auditctl_slice(const char *, const char *);
 int	getauid(au_id_t *);
 int	setauid(const au_id_t *);
 int	getaudit(struct auditinfo *);

==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_trigger.c#2 (text) ====

@@ -40,25 +40,11 @@
 
 #include 
 #include 
-
-/*
- * Structures and operations to support the basic character special device
- * used to communicate with userland.  /dev/audit reliably delivers one-byte
- * messages to a listening application (or discards them if there is no
- * listening application).
- *
- * Currently, select/poll are not supported on the trigger device.
- */
-struct trigger_info {
-	unsigned int			trigger;
-	TAILQ_ENTRY(trigger_info)	list;
-};
+#include 
 
 static MALLOC_DEFINE(M_AUDITTRIGGER, "audit_trigger", "Audit trigger events");
 static struct cdev *audit_dev;
 static int audit_isopen = 0;
-static TAILQ_HEAD(, trigger_info) trigger_list;
-static struct mtx audit_trigger_mtx;
 
 static int
 audit_open(struct cdev *dev, int oflags, int devtype, struct thread *td)

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 14:05:12 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42A271065670; Fri,  4 Sep 2009 14:05:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06E98106566B
	for ; Fri,  4 Sep 2009 14:05:12 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA3198FC14
	for ; Fri,  4 Sep 2009 14:05:11 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84E5Bun071815
	for ; Fri, 4 Sep 2009 14:05:11 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84E5Bqt071813
	for perforce@freebsd.org; Fri, 4 Sep 2009 14:05:11 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 4 Sep 2009 14:05:11 GMT
Message-Id: <200909041405.n84E5Bqt071813@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168156 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, 04 Sep 2009 14:05:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=168156

Change 168156 by stas@stas_yandex on 2009/09/04 14:05:11

	- siguc might be passed as NULL by valgrind, handle that in the manner
	         linux wrapper does this.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#7 edit
.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#7 (text+ko) ====

@@ -267,8 +267,13 @@
       frame->psigInfo = (Addr)&frame->sigInfo;
    VG_(memcpy)(&frame->sigInfo, siginfo, sizeof(vki_siginfo_t));
 
-   trapno = siguc->uc_mcontext.trapno;
-   err = siguc->uc_mcontext.err;
+   if (siguc != NULL) {
+      trapno = siguc->uc_mcontext.trapno;
+      err = siguc->uc_mcontext.err;
+   } else {
+      trapno = 0;
+      err = 0;
+   }
 
    synth_ucontext(tst->tid, siginfo, trapno, err, mask,
                   &frame->uContext, &frame->fpstate);

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#7 (text+ko) ====

@@ -266,8 +266,13 @@
       frame->psigInfo = (Addr)&frame->sigInfo;
    VG_(memcpy)(&frame->sigInfo, siginfo, sizeof(vki_siginfo_t));
 
-   trapno = siguc->uc_mcontext.trapno;
-   err = siguc->uc_mcontext.err;
+   if (siguc != NULL) {
+      trapno = siguc->uc_mcontext.trapno;
+      err = siguc->uc_mcontext.err;
+   } else {
+      trapno = 0;
+      err = 0;
+   }
 
    synth_ucontext(tst->tid, siginfo, trapno, err, mask,
                   &frame->uContext, &frame->fpstate);

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 17:48:16 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 28FE71065695; Fri,  4 Sep 2009 17:48:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D47D8106568F
	for ; Fri,  4 Sep 2009 17:48:15 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A9FE58FC12
	for ; Fri,  4 Sep 2009 17:48:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84HmF9b007708
	for ; Fri, 4 Sep 2009 17:48:15 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84HmFee007706
	for perforce@freebsd.org; Fri, 4 Sep 2009 17:48:15 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 4 Sep 2009 17:48:15 GMT
Message-Id: <200909041748.n84HmFee007706@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168159 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, 04 Sep 2009 17:48:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=168159

Change 168159 by gabor@gabor_aspire on 2009/09/04 17:47:47

	- Fix an error message number

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#91 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#91 (text+ko) ====

@@ -530,7 +530,7 @@
 			else if (strcmp("text", optarg) == 0)
 				binbehave = BINFILE_TEXT;
 			else
-				errx(2, getstr(11));
+				errx(2, getstr(8));
 			break;
 		case COLOR_OPT:
 			if (optarg == NULL || strcmp("auto", optarg) == 0 || strcmp("always", optarg) == 0 ) {

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 18:08:38 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C19B21065672; Fri,  4 Sep 2009 18:08:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DB08106566C
	for ; Fri,  4 Sep 2009 18:08:38 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C1708FC1A
	for ; Fri,  4 Sep 2009 18:08:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84I8cI9010754
	for ; Fri, 4 Sep 2009 18:08:38 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84I8bbK010752
	for perforce@freebsd.org; Fri, 4 Sep 2009 18:08:37 GMT
	(envelope-from mav@freebsd.org)
Date: Fri, 4 Sep 2009 18:08:37 GMT
Message-Id: <200909041808.n84I8bbK010752@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168160 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, 04 Sep 2009 18:08:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=168160

Change 168160 by mav@mav_mavbook on 2009/09/04 18:08:15

	Add format to -r argument and document changes.

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#7 edit
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#20 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#7 (text+ko) ====

@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.45 2009/07/10 08:18:08 scottl Exp $
 .\"
-.Dd June 29, 2009
+.Dd September 4, 2009
 .Dt CAMCONTROL 8
 .Os
 .Sh NAME
@@ -120,10 +120,12 @@
 .Ic cmd
 .Op device id
 .Op generic args
+.Aq Fl a Ar cmd Op args
 .Aq Fl c Ar cmd Op args
 .Op Fl i Ar len Ar fmt
 .Bk -words
 .Op Fl o Ar len Ar fmt Op args
+.Op Fl r Ar fmt
 .Ek
 .Nm
 .Ic debug
@@ -486,12 +488,14 @@
 .El
 .El
 .It Ic cmd
-Allows the user to send an arbitrary SCSI CDB to any device.
+Allows the user to send an arbitrary ATA or SCSI CDB to any device.
 The
 .Ic cmd
 function requires the
 .Fl c
-argument to specify the CDB.
+argument to specify SCSI CDB or the
+.Fl a
+argument to specify ATA Command Block registers values.
 Other arguments are optional, depending on
 the command type.
 The command and data specification syntax is documented
@@ -503,9 +507,13 @@
 or
 .Fl o .
 .Bl -tag -width 17n
+.It Fl a Ar cmd Op args
+This specifies the content of 12 ATA Command Block registers (command,
+features, lba_low, lba_mid, lba_high, device, lba_low_exp, lba_mid_exp.
+lba_high_exp, features_exp, sector_count, sector_count_exp).
 .It Fl c Ar cmd Op args
 This specifies the SCSI CDB.
-CDBs may be 6, 10, 12 or 16 bytes.
+SCSI CDBs may be 6, 10, 12 or 16 bytes.
 .It Fl i Ar len Ar fmt
 This specifies the amount of data to read, and how it should be displayed.
 If the format is
@@ -519,6 +527,13 @@
 .Sq - ,
 .Ar len
 bytes of data will be read from standard input and written to the device.
+.It Fl r Ar fmt
+This specifies that 11 result ATA Command Block registers should be displayed
+(status, error, lba_low, lba_mid, lba_high, device, lba_low_exp, lba_mid_exp,
+lba_high_exp, sector_count, sector_count_exp), and how.
+If the format is
+.Sq - ,
+11 result registers will be written to standard output in hex.
 .El
 .It Ic debug
 Turn on CAM debugging printfs in the kernel.

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#20 (text+ko) ====

@@ -2084,9 +2084,9 @@
 	int cdb_len = 0;
 	int atacmd_len = 0;
 	int need_res = 0;
-	char *datastr = NULL, *tstr;
+	char *datastr = NULL, *tstr, *resstr = NULL;
 	int error = 0;
-	int fd_data = 0;
+	int fd_data = 0, fd_res = 0;
 	int retval;
 
 	ccb = cam_getccb(device);
@@ -2221,6 +2221,13 @@
 			break;
 		case 'r':
 			need_res = 1;
+			hook.argc = argc - optind;
+			hook.argv = argv + optind;
+			hook.got = 0;
+			resstr = cget(&hook, NULL);
+			if ((resstr != NULL) && (resstr[0] == '-'))
+				fd_res = 1;
+			optind += hook.got;
 			break;
 		default:
 			break;
@@ -2341,20 +2348,26 @@
 	}
 
 	if (atacmd_len && need_res) {
-		fprintf(stdout,
-		    "%02X %02X %02X %02X %02X %02X %02X %02X %02X 00 %02X %02X\n",
-		    ccb->ataio.res.status,
-		    ccb->ataio.res.error,
-		    ccb->ataio.res.lba_low,
-		    ccb->ataio.res.lba_mid,
-		    ccb->ataio.res.lba_high,
-		    ccb->ataio.res.device,
-		    ccb->ataio.res.lba_low_exp,
-		    ccb->ataio.res.lba_mid_exp,
-		    ccb->ataio.res.lba_high_exp,
-		    ccb->ataio.res.sector_count,
-		    ccb->ataio.res.sector_count_exp);
-		fflush(stdout);
+		if (fd_res == 0) {
+			buff_decode_visit(&ccb->ataio.res.status, 11, resstr,
+					  arg_put, NULL);
+			fprintf(stdout, "\n");
+		} else {
+			fprintf(stdout,
+			    "%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
+			    ccb->ataio.res.status,
+			    ccb->ataio.res.error,
+			    ccb->ataio.res.lba_low,
+			    ccb->ataio.res.lba_mid,
+			    ccb->ataio.res.lba_high,
+			    ccb->ataio.res.device,
+			    ccb->ataio.res.lba_low_exp,
+			    ccb->ataio.res.lba_mid_exp,
+			    ccb->ataio.res.lba_high_exp,
+			    ccb->ataio.res.sector_count,
+			    ccb->ataio.res.sector_count_exp);
+			fflush(stdout);
+		}
 	}
 
 	if (((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP)
@@ -4091,7 +4104,7 @@
 "                              [-P pagectl][-e | -b][-d]\n"
 "        camcontrol cmd        [dev_id][generic args]\n"
 "                              <-a cmd [args] | -c cmd [args]>\n"
-"                              [-i len fmt|-o len fmt [args]] [-r]\n"
+"                              [-i len fmt|-o len fmt [args]] [-r fmt]\n"
 "        camcontrol debug      [-I][-P][-T][-S][-X][-c]\n"
 "                              \n"
 "        camcontrol tags       [dev_id][generic args] [-N tags] [-q] [-v]\n"

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 18:53:27 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 859CB1065679; Fri,  4 Sep 2009 18:53:27 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A54F106566C
	for ; Fri,  4 Sep 2009 18:53:27 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 397118FC1A
	for ; Fri,  4 Sep 2009 18:53:27 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84IrRWY017204
	for ; Fri, 4 Sep 2009 18:53:27 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84IrRGi017201
	for perforce@freebsd.org; Fri, 4 Sep 2009 18:53:27 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Fri, 4 Sep 2009 18:53:27 GMT
Message-Id: <200909041853.n84IrRGi017201@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168163 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, 04 Sep 2009 18:53:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=168163

Change 168163 by anchie@anchie_malimis on 2009/09/04 18:52:29

	Pictures that are parts of the htm documents.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/web/incoming-cps.jpeg#1 add
.. //depot/projects/soc2009/anchie_send/web/incoming.jpeg#1 add
.. //depot/projects/soc2009/anchie_send/web/input.jpg#1 add
.. //depot/projects/soc2009/anchie_send/web/outgoing-cps.jpeg#1 add
.. //depot/projects/soc2009/anchie_send/web/outgoing.jpeg#1 add
.. //depot/projects/soc2009/anchie_send/web/output.jpg#1 add
.. //depot/projects/soc2009/anchie_send/web/send02.jpg#1 add
.. //depot/projects/soc2009/anchie_send/web/snd-hooks.jpeg#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 21:00:47 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A5861065679; Fri,  4 Sep 2009 21:00:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5DB92106566B
	for ; Fri,  4 Sep 2009 21:00:47 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D0E98FC12
	for ; Fri,  4 Sep 2009 21:00:47 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84L0ljZ045983
	for ; Fri, 4 Sep 2009 21:00:47 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84L0l3l045981
	for perforce@freebsd.org; Fri, 4 Sep 2009 21:00:47 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 4 Sep 2009 21:00:47 GMT
Message-Id: <200909042100.n84L0l3l045981@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168171 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, 04 Sep 2009 21:00:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=168171

Change 168171 by stas@stas_orion on 2009/09/04 21:00:06

	- We cannot alway reliably unwind the rtld stack because
	  assembler routines do not have dwarf annotaions.  Thus
	         ignore all rtld-related warnings completely.

Affected files ...

.. //depot/projects/valgrind/freebsd.supp#2 edit

Differences ...

==== //depot/projects/valgrind/freebsd.supp#2 (text+ko) ====

@@ -5,12 +5,7 @@
 ##----------------------------------------------------------------------##
 
 {
-   rtld-strcpy-1
+   rtld-1
    Memcheck:Cond
    obj:/libexec/ld-elf.so.1
-   obj:/libexec/ld-elf.so.1
-   obj:/libexec/ld-elf.so.1
-   obj:/libexec/ld-elf.so.1
-   obj:/libexec/ld-elf.so.1
-   fun:dlopen
 }

From owner-p4-projects@FreeBSD.ORG  Sat Sep  5 08:26:24 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B578B1065672; Sat,  5 Sep 2009 08:26:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 78DF4106566C
	for ; Sat,  5 Sep 2009 08:26:23 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 660FC8FC17
	for ; Sat,  5 Sep 2009 08:26:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n858QNge033942
	for ; Sat, 5 Sep 2009 08:26:23 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n858QNNZ033940
	for perforce@freebsd.org; Sat, 5 Sep 2009 08:26:23 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 5 Sep 2009 08:26:23 GMT
Message-Id: <200909050826.n858QNNZ033940@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168185 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, 05 Sep 2009 08:26:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=168185

Change 168185 by trasz@trasz_anger on 2009/09/05 08:25:39

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#35 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#39 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.1#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/ls/print.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/inetd.conf#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.usr.dist#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/ctype.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/digittoint.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isalnum.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isalpha.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isascii.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isblank.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/iscntrl.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isdigit.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isgraph.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isideogram.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/islower.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isphonogram.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isprint.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/ispunct.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isrune.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isspace.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isspecial.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isupper.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/isxdigit.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/toascii.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/tolower.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/toupper.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/route/route.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/colldef/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/colldef/la_LN.ISO8859-13.src#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/colldef/lt_LT.ISO8859-13.src#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/mklocale/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/mklocale/la_LN.ISO8859-13.src#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/mklocale/lt_LT.ISO8859-13.src#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/monetdef/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/monetdef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/msgdef/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/msgdef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/msgdef/lv_LV.UTF-8.src#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/numericdef/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/lv_LV.UTF-8.src#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#48 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.ia64#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sparc64#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/if_mwl.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/gensequences#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/sequences#5 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#10 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#8 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#6 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_scs.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_stress.c#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#6 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr_compat.h#4 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_wcwidth.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zyd.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_disk.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/stripe/g_stripe.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pcpu.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_arp.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_dfs.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptodev.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/bus.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/gensequences#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/sequences#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_demo.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_scs.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_stress.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr_compat.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_wcwidth.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/find/function.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/netstat.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/diskinfo/diskinfo.c#2 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#35 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.207 2009/09/02 14:56:23 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.208 2009/09/03 16:34:20 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090904: remove lukemftpd
+OLD_FILES+=usr/libexec/lukemftpd
+OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
+OLD_FILES+=usr/share/man/man5/ftpusers.5.gz
+OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz
 # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist

==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#39 (text+ko) ====

@@ -1,51 +1,53 @@
 Updating Information for FreeBSD current users
 
-This file is maintained and copyrighted by M. Warner Losh
-.  See end of file for further details.  For commonly
-done items, please see the COMMON ITEMS: section later in the file.
+This file is maintained and copyrighted by M. Warner Losh .
+See end of file for further details.  For commonly done items, please see the
+COMMON ITEMS: section later in the file.  These instructions assume that you
+basically know what you are doing.  If not, then please consult the FreeBSD
+handbook.
 
 Items affecting the ports and packages system can be found in
-/usr/ports/UPDATING.  Please read that file before running
-portupgrade.
+/usr/ports/UPDATING.  Please read that file before running portupgrade.
 
 NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW:
-	FreeBSD 9.x has many debugging features turned on, in
-	both the kernel and userland.  These features attempt to detect
-	incorrect use of system primitives, and encourage loud failure
-	through extra sanity checking and fail stop semantics.  They
-	also substantially impact system performance.  If you want to
-	do performance measurement, benchmarking, and optimization,
-	you'll want to turn them off.  This includes various WITNESS-
-	related kernel options, INVARIANTS, malloc debugging flags
-	in userland, and various verbose features in the kernel.  Many
-	developers choose to disable these features on build machines
-	to maximize performance.  (To disable malloc debugging, run
+	FreeBSD 9.x has many debugging features turned on, in both the kernel
+	and userland.  These features attempt to detect incorrect use of
+	system primitives, and encourage loud failure through extra sanity
+	checking and fail stop semantics.  They also substantially impact
+	system performance.  If you want to do performance measurement,
+	benchmarking, and optimization, you'll want to turn them off.  This
+	includes various WITNESS- related kernel options, INVARIANTS, malloc
+	debugging flags in userland, and various verbose features in the
+	kernel.  Many developers choose to disable these features on build
+	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
 20090813:
-	Remove the option STOP_NMI.  The default action is now to use NMI
-	only for KDB via the newly introduced function stop_cpus_hard()
-	and maintain stop_cpus() to just use a normal IPI_STOP on ia32
-	and amd64.
+	Remove the option STOP_NMI.  The default action is now to use NMI only
+	for KDB via the newly introduced function stop_cpus_hard() and
+	maintain stop_cpus() to just use a normal IPI_STOP on ia32 and amd64.
+
+20090803:
+	stable/8 branch created in subversion.
 
 20090719:
-	Bump the shared library version numbers for all libraries that
-	do not use symbol versioning as part of the 8.0-RELEASE cycle.
-	Bump __FreeBSD_version to 800105.
+	Bump the shared library version numbers for all libraries that do not
+	use symbol versioning as part of the 8.0-RELEASE cycle.  Bump
+	__FreeBSD_version to 800105.
 
 20090714:
-	Due to changes in the implementation of virtual network stack
-	support, all network-related kernel modules must be recompiled.
-	As this change breaks the ABI, bump __FreeBSD_version to 800104.
+	Due to changes in the implementation of virtual network stack support,
+	all network-related kernel modules must be recompiled.  As this change
+	breaks the ABI, bump __FreeBSD_version to 800104.
 
 20090713:
-	The TOE interface to the TCP syncache has been modified to remove struct
-	tcpopt () from the ABI of the network stack.  The
-	cxgb driver is the only TOE consumer affected by this change, and needs
-	to be recompiled along with the kernel. As this change breaks the ABI,
-	bump __FreeBSD_version to 800103.
+	The TOE interface to the TCP syncache has been modified to remove
+	struct tcpopt () from the ABI of the network stack.
+	The cxgb driver is the only TOE consumer affected by this change, and
+	needs to be recompiled along with the kernel. As this change breaks
+	the ABI, bump __FreeBSD_version to 800103.
 
-20090712:
+20090712: 
 	Padding has been added to struct tcpcb, sackhint and tcpstat in
 	 to facilitate future MFCs and bug fixes whilst
 	maintainig the ABI. However, this change breaks the ABI, so bump
@@ -53,79 +55,75 @@
 	any of these structs (e.g. sockstat) need to be recompiled.
 
 20090630:
-	The NFS_LEGACYRPC option has been removed along with the old
-	kernel RPC implementation that this option selected. Kernel
-	configurations may need to be adjusted.
+	The NFS_LEGACYRPC option has been removed along with the old kernel
+	RPC implementation that this option selected. Kernel configurations
+	may need to be adjusted.
 
 20090629:
-	The network interface device nodes at /dev/net/ have
-	been removed.  All ioctl operations can be performed the normal
-	way using routing sockets.  The kqueue functionality can
-	generally be replaced with routing sockets.
+	The network interface device nodes at /dev/net/ have been
+	removed.  All ioctl operations can be performed the normal way using
+	routing sockets.  The kqueue functionality can generally be replaced
+	with routing sockets.
 
 20090628:
-	The documentation from the FreeBSD Documentation Project
-	(Handbook, FAQ, etc.) is now installed via packages by
-	sysinstall(8) and under the /usr/local/share/doc/freebsd
-	directory instead of /usr/share/doc.
+	The documentation from the FreeBSD Documentation Project (Handbook,
+	FAQ, etc.) is now installed via packages by sysinstall(8) and under
+	the /usr/local/share/doc/freebsd directory instead of /usr/share/doc.
 
 20090624:
-	The ABI of various structures related to the SYSV IPC API have
-	been changed.  As a result, the COMPAT_FREEBSD[456] and COMPAT_43
-	kernel options now all require COMPAT_FREEBSD7.
-	Bump __FreeBSD_version to 800100.
+	The ABI of various structures related to the SYSV IPC API have been
+	changed.  As a result, the COMPAT_FREEBSD[456] and COMPAT_43 kernel
+	options now all require COMPAT_FREEBSD7.  Bump __FreeBSD_version to
+	800100.
 
 20090622:
-	Layout of struct vnet has changed as routing related variables
-	were moved to their own Vimage module. Modules need to be
-	recompiled.  Bump __FreeBSD_version to 800099.
+	Layout of struct vnet has changed as routing related variables were
+	moved to their own Vimage module. Modules need to be recompiled.  Bump
+	__FreeBSD_version to 800099.
 
 20090619:
-	NGROUPS_MAX and NGROUPS have been increased from 16 to 1023
-	and 1024 respectively.  As long as no more than 16 groups per
-	process are used, no changes should be visible.  When more
-	than 16 groups are used, old binaries may fail if they call
-	getgroups() or getgrouplist() with statically sized storage.
-	Recompiling will work around this, but applications should be
-	modified to use dynamically allocated storage for group arrays
-	as POSIX.1-2008 does not cap an implementation's number of
-	supported groups at NGROUPS_MAX+1 as previous versions did.
+	NGROUPS_MAX and NGROUPS have been increased from 16 to 1023 and 1024
+	respectively.  As long as no more than 16 groups per process are used,
+	no changes should be visible.  When more than 16 groups are used, old
+	binaries may fail if they call getgroups() or getgrouplist() with
+	statically sized storage.  Recompiling will work around this, but
+	applications should be modified to use dynamically allocated storage
+	for group arrays as POSIX.1-2008 does not cap an implementation's
+	number of supported groups at NGROUPS_MAX+1 as previous versions did.
 
-	NFS and portalfs mounts may also be affected as the list of
-	groups is truncated to 16.  Users of NFS who use more than 16
-	groups, should take care that negative group permissions are not
-	used on the exported file systems as they will not be reliable
-	unless a GSSAPI based authentication method is used.
+	NFS and portalfs mounts may also be affected as the list of groups is
+	truncated to 16.  Users of NFS who use more than 16 groups, should
+	take care that negative group permissions are not used on the exported
+	file systems as they will not be reliable unless a GSSAPI based
+	authentication method is used.
 
-20090616:
-	The compiling option ADAPTIVE_LOCKMGRS has been introduced.
-	This option compiles in the support for adaptive spinning for lockmgrs
-	which want to enable it.  The lockinit() function now accepts the
-	flag LK_ADAPTIVE in order to make the lock object subject to
-	adaptive spinning when both held in write and read mode.
+20090616: 
+	The compiling option ADAPTIVE_LOCKMGRS has been introduced.  This
+	option compiles in the support for adaptive spinning for lockmgrs
+	which want to enable it.  The lockinit() function now accepts the flag
+	LK_ADAPTIVE in order to make the lock object subject to adaptive
+	spinning when both held in write and read mode.
 
 20090613:
-	The layout of the structure returned by IEEE80211_IOC_STA_INFO
-	has changed.  User applications that use this ioctl need to be
-	rebuilt.
+	The layout of the structure returned by IEEE80211_IOC_STA_INFO has
+	changed.  User applications that use this ioctl need to be rebuilt.
 
 20090611:
-	The layout of struct thread has changed.  Kernel and modules
-	need to be rebuilt.
+	The layout of struct thread has changed.  Kernel and modules need to
+	be rebuilt.
 
 20090608:
-	The layout of structs ifnet, domain, protosw and vnet_net has
-	changed.  Kernel modules need to be rebuilt.
-	Bump __FreeBSD_version to 800097.
+	The layout of structs ifnet, domain, protosw and vnet_net has changed.
+	Kernel modules need to be rebuilt.  Bump __FreeBSD_version to 800097.
 
 20090602:
 	window(1) has been removed from the base system. It can now be
 	installed from ports. The port is called misc/window.
 
 20090601:
-	The way we are storing and accessing `routing table' entries
-	has changed. Programs reading the FIB, like netstat, need to
-	be re-compiled.
+	The way we are storing and accessing `routing table' entries has
+	changed. Programs reading the FIB, like netstat, need to be
+	re-compiled.
 
 20090601:
 	A new netisr implementation has been added for FreeBSD 8.  Network
@@ -134,24 +132,24 @@
 	Bump __FreeBSD_version to 800096.
 
 20090530:
-	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
-	is no more valid.
+	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose is no
+	more valid.
 
 20090530:
 	Add VOP_ACCESSX(9).  File system modules need to be rebuilt.
 	Bump __FreeBSD_version to 800094.
 
 20090529:
-	Add mnt_xflag field to 'struct mount'.  File system modules
-	need to be rebuilt.
+	Add mnt_xflag field to 'struct mount'.  File system modules need to be
+	rebuilt.
 	Bump __FreeBSD_version to 800093.
 
 20090528:
 	The compiling option ADAPTIVE_SX has been retired while it has been
 	introduced the option NO_ADAPTIVE_SX which handles the reversed logic.
 	The KPI for sx_init_flags() changes as accepting flags:
-	SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag
-	has been introduced in order to handle the reversed logic.
+	SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag has
+	been introduced in order to handle the reversed logic.
 	Bump __FreeBSD_version to 800092.
 
 20090527:
@@ -164,20 +162,18 @@
 	Bump __FreeBSD_version to 800090.
 
 20090523:
-	The newly imported zic(8) produces a new format in the
-	output. Please run tzsetup(8) to install the newly created
-	data to /etc/localtime.
+	The newly imported zic(8) produces a new format in the output. Please
+	run tzsetup(8) to install the newly created data to /etc/localtime.
 
 20090520:
 	The sysctl tree for the usb stack has renamed from hw.usb2.* to
 	hw.usb.* and is now consistent again with previous releases.
 
 20090520:
-	802.11 monitor mode support was revised and driver api's
-	were changed.  Drivers dependent on net80211 now support
-	DLT_IEEE802_11_RADIO instead of DLT_IEEE802_11.  No
-	user-visible data structures were changed but applications
-	that use DLT_IEEE802_11 may require changes.
+	802.11 monitor mode support was revised and driver api's were changed.
+	Drivers dependent on net80211 now support DLT_IEEE802_11_RADIO instead
+	of DLT_IEEE802_11.  No user-visible data structures were changed but
+	applications that use DLT_IEEE802_11 may require changes.
 	Bump __FreeBSD_version to 800088.
 
 20090430:
@@ -768,730 +764,29 @@
 20071010:
 	RELENG_7 branched.
 
-20071009:
-	Setting WITHOUT_LIBPTHREAD now means WITHOUT_LIBKSE and
-	WITHOUT_LIBTHR are set.
-
-20070930:
-	The PCI code has been made aware of PCI domains. This means that
-	the location strings as used by pciconf(8) etc are now in the
-	following format: pci::[:]. It
-	also means that consumers of  potentially need to
-	be recompiled; this includes the hal and xorg-server ports.
-
-20070928:
-	The caching daemon (cached) was renamed to nscd. nscd.conf
-	configuration file should be used instead of cached.conf and
-	nscd_enable, nscd_pidfile and nscd_flags options should be used
-	instead of cached_enable, cached_pidfile and cached_flags in
-	rc.conf.
-
-20070921:
-	The getfacl(1) utility now prints owning user and group name
-	instead of owning uid and gid in the three line comment header.
-	This is the same behavior as getfacl(1) on Solaris and Linux.
-
-20070704:
-	The new IPsec code is now compiled in using the IPSEC option.  The
-	IPSEC option now requires "device crypto" be defined in your kernel
-	configuration.  The FAST_IPSEC kernel option is now deprecated.
-
-20070702:
-	The packet filter (pf) code has been updated to OpenBSD 4.1 Please
-	note the changed syntax - keep state is now on by default.  Also
-	note the fact that ftp-proxy(8) has been changed from bottom up and
-	has been moved from libexec to usr/sbin.  Changes in the ALTQ
-	handling also affect users of IPFW's ALTQ capabilities.
-
-20070701:
-	Remove KAME IPsec in favor of FAST_IPSEC, which is now the
-	only IPsec supported by FreeBSD.  The new IPsec stack
-	supports both IPv4 and IPv6. The kernel option will change
-	after the code changes have settled in.  For now the kernel
-	option IPSEC is deprecated and FAST_IPSEC is the only option, that
-	will change after some settling time.
-
-20070701:
-	The wicontrol(8) utility has been removed from the base system. wi(4)
-	cards should be configured using ifconfig(8), see the man page for more
-	information.
-
-20070612:
-	The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver
-	instead of the nve(4) driver. Please update your configuration
-	accordingly.
-
-20070612:
-	By default, /etc/rc.d/sendmail no longer rebuilds the aliases
-	database if it is missing or older than the aliases file.  If
-	desired, set the new rc.conf option sendmail_rebuild_aliases
-	to "YES" to restore that functionality.
-
-20070612:
-	The IPv4 multicast socket code has been considerably modified, and
-	moved to the file sys/netinet/in_mcast.c. Initial support for the
-	RFC 3678 Source-Specific Multicast Socket API has been added to
-	the IPv4 network stack.
-
-	Strict multicast and broadcast reception is now the default for
-	UDP/IPv4 sockets; the net.inet.udp.strict_mcast_mship sysctl variable
-	has now been removed.
-
-	The RFC 1724 hack for interface selection has been removed; the use
-	of the Linux-derived ip_mreqn structure with IP_MULTICAST_IF has
-	been added to replace it. Consumers such as routed will soon be
-	updated to reflect this.
-
-	These changes affect users who are running routed(8) or rdisc(8)
-	from the FreeBSD base system on point-to-point or unnumbered
-	interfaces.
-
-20070610:
-	The net80211 layer has changed significantly and all wireless
-	drivers that depend on it need to be recompiled.  Further these
-	changes require that any program that interacts with the wireless
-	support in the kernel be recompiled; this includes: ifconfig,
-	wpa_supplicant, hostapd, and wlanstats.  Users must also, for
-	the moment, kldload the wlan_scan_sta and/or wlan_scan_ap modules
-	if they use modules for wireless support.  These modules implement
-	scanning support for station and ap modes, respectively.  Failure
-	to load the appropriate module before marking a wireless interface
-	up will result in a message to the console and the device not
-	operating properly.
-
-20070610:
-	The pam_nologin(8) module ceases to provide an authentication
-	function and starts providing an account management function.
-	Consequent changes to /etc/pam.d should be brought in using
-	mergemaster(8).  Third-party files in /usr/local/etc/pam.d may
-	need manual editing as follows.  Locate this line (or similar):
-
-		auth	required	pam_nologin.so	no_warn
-
-	and change it according to this example:
-
-		account	required	pam_nologin.so	no_warn
-
-	That is, the first word needs to be changed from "auth" to
-	"account".  The new line can be moved to the account section
-	within the file for clarity.  Not updating pam.conf(5) files
-	will result in nologin(5) ignored by the respective services.
-
-20070529:
-	The ether_ioctl() function has been synchronized with ioctl(2)
-	and ifnet.if_ioctl.  Due to that, the size of one of its arguments
-	has changed on 64-bit architectures.  All kernel modules using
-	ether_ioctl() need to be rebuilt on such architectures.
-
-20070516:
-	Improved INCLUDE_CONFIG_FILE support has been introduced to the
-	config(8) utility. In order to take advantage of this new
-	functionality, you are expected to recompile and install
-	src/usr.sbin/config. If you don't rebuild config(8), and your
-	kernel configuration depends on INCLUDE_CONFIG_FILE, the kernel
-	build will be broken because of a missing "kernconfstring"
-	symbol.
-
-20070513:
-	Symbol versioning is enabled by default.  To disable it, use
-	option WITHOUT_SYMVER.  It is not advisable to attempt to
-	disable symbol versioning once it is enabled; your installworld
-	will break because a symbol version-less libc will get installed
-	before the install tools.  As a result, the old install tools,
-	which previously had symbol dependencies to FBSD_1.0, will fail
-	because the freshly installed libc will not have them.
-
-	The default threading library (providing "libpthread") has been
-	changed to libthr.  If you wish to have libkse as your default,
-	use option DEFAULT_THREAD_LIB=libkse for the buildworld.
-
-20070423:
-	The ABI breakage in sendmail(8)'s libmilter has been repaired
-	so it is no longer necessary to recompile mail filters (aka,
-	milters).  If you recompiled mail filters after the 20070408
-	note, it is not necessary to recompile them again.
-
-20070417:
-	The new trunk(4) driver has been renamed to lagg(4) as it better
-	reflects its purpose. ifconfig will need to be recompiled.
-
-20070408:
-	sendmail(8) has been updated to version 8.14.1.  Mail filters
-	(aka, milters) compiled against the libmilter included in the
-	base operating system should be recompiled.
-
-20070302:
-	Firmwares for ipw(4) and iwi(4) are now included in the base tree.
-	In order to use them one must agree to the respective LICENSE in
-	share/doc/legal and define legal.intel_.license_ack=1 via
-	loader.conf(5) or kenv(1).  Make sure to deinstall the now
-	deprecated modules from the respective firmware ports.
-
-20070228:
-	The name resolution/mapping functions addr2ascii(3) and ascii2addr(3)
-	were removed from FreeBSD's libc. These originally came from INRIA
-	IPv6. Nothing in FreeBSD ever used them. They may be regarded as
-	deprecated in previous releases.
-	The AF_LINK support for getnameinfo(3) was merged from NetBSD to
-	replace it as a more portable (and re-entrant) API.
-
-20070224:
-	To support interrupt filtering a modification to the newbus API
-	has occurred, ABI was broken and __FreeBSD_version was bumped
-	to 700031. Please make sure that your kernel and modules are in
-	sync. For more info:
-	http://docs.freebsd.org/cgi/mid.cgi?20070221233124.GA13941
-
-20070224:
-	The IPv6 multicast forwarding code may now be loaded into GENERIC
-	kernels by loading the ip_mroute.ko module. This is built into the
-	module unless WITHOUT_INET6 or WITHOUT_INET6_SUPPORT options are
-	set; see src.conf(5) for more information.
-
-20070214:
-	The output of netstat -r has changed. Without -n, we now only
-	print a "network name" without the prefix length if the network
-	address and mask exactly match a Class A/B/C network, and an entry
-	exists in the nsswitch "networks" map.
-	With -n, we print the full unabbreviated CIDR network prefix in
-	the form "a.b.c.d/p". 0.0.0.0/0 is always printed as "default".
-	This change is in preparation for changes such as equal-cost
-	multipath, and to more generally assist operational deployment
-	of FreeBSD as a modern IPv4 router.
-
-20070210:
-	PIM has been turned on by default in the IPv4 multicast
-	routing code. The kernel option 'PIM' has now been removed.
-	PIM is now built by default if option 'MROUTING' is specified.
-	It may now be loaded into GENERIC kernels by loading the
-	ip_mroute.ko module.
-
-20070207:
-	Support for IPIP tunnels (VIFF_TUNNEL) in IPv4 multicast routing
-	has been removed. Its functionality may be achieved by explicitly
-	configuring gif(4) interfaces and using the 'phyint' keyword in
-	mrouted.conf.
-	XORP does not support source-routed IPv4 multicast tunnels nor the
-	integrated IPIP tunneling, therefore it is not affected by this
-	change. The __FreeBSD_version macro has been bumped to 700030.
-
-20061221:
-	Support for PCI Message Signalled Interrupts has been
-	re-enabled in the bge driver, only for those chips which are
-	believed to support it properly.  If there are any problems,
-	MSI can be disabled completely by setting the
-	'hw.pci.enable_msi' and 'hw.pci.enable_msix' tunables to 0
-	in the loader.
-
-20061214:
-	Support for PCI Message Signalled Interrupts has been
-	disabled again in the bge driver.  Many revisions of the
-	hardware fail to support it properly.  Support can be
-	re-enabled by removing the #define of BGE_DISABLE_MSI in
-	"src/sys/dev/bge/if_bge.c".
-
-20061214:
-	Support for PCI Message Signalled Interrupts has been added
-	to the bge driver.  If there are any problems, MSI can be
-	disabled completely by setting the 'hw.pci.enable_msi' and
-	'hw.pci.enable_msix' tunables to 0 in the loader.
-
-20061205:
-	The removal of several facets of the experimental Threading
-	system from the kernel means that the proc and thread structures
-	have changed quite a bit. I suggest all kernel modules that might
-	reference these structures be recompiled.. Especially the
-	linux module.
-
-20061126:
-	Sound infrastructure has been updated with various fixes and
-	improvements. Most of the changes are pretty much transparent,
-	with exceptions of followings:
-	1) All sound driver specific sysctls (hw.snd.pcm%d.*) have been
-	   moved to their own dev sysctl nodes, for example:
-		hw.snd.pcm0.vchans -> dev.pcm.0.vchans
-	2) /dev/dspr%d.%d has been deprecated. Each channel now has its
-	   own chardev in the form of "dsp%d.%d", where 
-	   is p = playback, r = record and v = virtual, respectively. Users
-	   are encouraged to use these devs instead of (old) "/dev/dsp%d.%d".
-	   This does not affect those who are using "/dev/dsp".
-
-20061122:
-	geom(4)'s gmirror(8) class metadata structure has been
-	rev'd from v3 to v4. If you update across this point and
-	your metadata is converted for you, you will not be easily
-	able to downgrade since the /boot/kernel.old/geom_mirror.ko
-	kernel module will be unable to read the v4 metadata.  You
-	can resolve this by doing from the loader(8) prompt:
-
-		set vfs.root.mountfrom="ufs:/dev/XXX"
-
-	where XXX is the root slice of one of the disks that composed
-	the mirror (i.e.: /dev/ad0s1a). You can then rebuild
-	the array the same way you built it originally.
-
-20061122:
-	The following binaries have been disconnected from the build:
-	mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs,
-	and mount_std.  The functionality of these programs has been
-	moved into the mount program.  For example, to mount a devfs
-	filesystem, instead of using mount_devfs, use: "mount -t devfs".
-	This does not affect entries in /etc/fstab, since entries in
-	/etc/fstab are always processed with "mount -t fstype".
-
-20061113:
-	Support for PCI Message Signalled Interrupts on i386 and amd64
-	has been added to the kernel and various drivers will soon be
-	updated to use MSI when it is available.  If there are any problems,
-	MSI can be disabled completely by setting the 'hw.pci.enable_msi'
-	and 'hw.pci.enable_msix' tunables to 0 in the loader.
-
-20061110:
-	The MUTEX_PROFILING option has been renamed to LOCK_PROFILING.
-	The lockmgr object layout has been changed as a result of having
-	a lock_object embedded in it. As a consequence all file system
-	kernel modules must be re-compiled. The mutex profiling man page
-	has not yet been updated to reflect this change.
-
-20061026:
-	KSE in the kernel has now been made optional and turned on by
-	default. Use 'nooption KSE' in your kernel config to turn it
-	off. All kernel modules *must* be recompiled after this change.
-	There-after, modules from a KSE kernel should be compatible with
-	modules from a NOKSE kernel due to the temporary padding fields
-	added to 'struct proc'.
-
-20060929:
-	mrouted and its utilities have been removed from the base system.
-
-20060927:
-	Some ioctl(2) command codes have changed.  Full backward ABI
-	compatibility is provided if the "options COMPAT_FREEBSD6" is
-	present in the kernel configuration file.  Make sure to add
-	this option to your kernel config file, or recompile X.Org
-	and the rest of ports; otherwise they may refuse to work.
-
-20060924:
-	tcpslice has been removed from the base system.
-
-20060913:
-	The sizes of struct tcpcb (and struct xtcpcb) have changed due to
-	the rewrite of TCP syncookies.  Tools like netstat, sockstat, and
-	systat needs to be rebuilt.
-
-20060903:
-	libpcap updated to v0.9.4 and tcpdump to v3.9.4
-
-20060816:
-	The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour
-	for IPFIREWALL_FORWARD is now as it was before when it was first
-	committed and for years after. The behaviour is now ON.
-
-20060725:
-	enigma(1)/crypt(1) utility has been changed on 64 bit architectures.
-	Now it can decrypt files created from different architectures.
-	Unfortunately, it is no longer able to decrypt a cipher text
-	generated with an older version on 64 bit architectures.
-	If you have such a file, you need old utility to decrypt it.
-
-20060709:
-	The interface version of the i4b kernel part has changed. So
-	after updating the kernel sources and compiling a new kernel,
-	the i4b user space tools in "/usr/src/usr.sbin/i4b" must also
-	be rebuilt, and vice versa.
-
-20060627:
-	The XBOX kernel now defaults to the nfe(4) driver instead of
-	the nve(4) driver. Please update your configuration
-	accordingly.
-
-20060514:
-	The i386-only lnc(4) driver for the AMD Am7900 LANCE and Am79C9xx
-	PCnet family of NICs has been removed. The new le(4) driver serves
-	as an equivalent but cross-platform replacement with the pcn(4)
-	driver still providing performance-optimized support for the subset
-	of AMD Am79C971 PCnet-FAST and greater chips as before.
-
-20060511:
-	The machdep.* sysctls and the adjkerntz utility have been
-	modified a bit.  The new adjkerntz utility uses the new
-	sysctl names and sysctlbyname() calls, so it may be impossible
-	to run an old /sbin/adjkerntz utility in single-user mode
-	with a new kernel.  Replace the `adjkerntz -i' step before
-	`make installworld' with:
-
-	    /usr/obj/usr/src/sbin/adjkerntz/adjkerntz -i
-
-	and proceed as usual with the rest of the installworld-stage
-	steps.  Otherwise, you risk installing binaries with their
-	timestamp set several hours in the future, especially if
-	you are running with local time set to GMT+X hours.
-
-20060412:
-	The ip6fw utility has been removed.  The behavior provided by
-	ip6fw has been in ipfw2 for a good while and the rc.d scripts
-	have been updated to deal with it.  There are some rules that
-	might not migrate cleanly.  Use rc.firewall6 as a template to
-	rewrite rules.
-
-20060428:
-	The puc(4) driver has been overhauled. The ebus(4) and sbus(4)
-	attachments have been removed. Make sure to configure scc(4)
-	on sparc64. Note also that by default puc(4) will use uart(4)
-	and not sio(4) for serial ports because interrupt handling has
-	been optimized for multi-port serial cards and only uart(4)
-	implements the interface to support it.
-
-20060330:
-	The scc(4) driver replaces puc(4) for Serial Communications
-	Controllers (SCCs) like the Siemens SAB82532 and the Zilog
-	Z8530. On sparc64, it is advised to add scc(4) to the kernel
-	configuration to make sure that the serial ports remain
-	functional.
-
-20060317:
-	Most world/kernel related NO_* build options changed names.
-	New knobs have common prefixes WITHOUT_*/WITH_* (modelled
-	after FreeBSD ports) and should be set in /etc/src.conf
-	(the src.conf(5) manpage is provided).  Full backwards
-	compatibility is maintained for the time being though it's
-	highly recommended to start moving old options out of the
-	system-wide /etc/make.conf file into the new /etc/src.conf
-	while also properly renaming them.  More conversions will
-	likely follow.  Posting to current@:
-
-	http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html
-
-20060305:
-	The NETSMBCRYPTO kernel option has been retired because its
-	functionality is always included in NETSMB and smbfs.ko now.
-
-20060303:
-	The TDFX_LINUX kernel option was retired and replaced by the
-	tdfx_linux device.  The latter can be loaded as the 3dfx_linux.ko
-	kernel module.  Loading it alone should suffice to get 3dfx support
-	for Linux apps because it will pull in 3dfx.ko and linux.ko through
-	its dependencies.
-
-20060204:
-	The 'audit' group was added to support the new auditing functionality
-	in the base system.  Be sure to follow the directions for updating,
-	including the requirement to run mergemaster -p.
-
-20060201:
-	The kernel ABI to file system modules was changed on i386.
-	Please make sure that your kernel and modules are in sync.
-
-20060118:
-	This actually occured some time ago, but installing the kernel
-	now also installs a bunch of symbol files for the kernel modules.
-	This increases the size of /boot/kernel to about 67Mbytes. You
-	will need twice this if you will eventually back this up to kernel.old
-	on your next install.
-	If you have a shortage of room in your root partition, you should add
-	-DINSTALL_NODEBUG to your make arguments or add INSTALL_NODEBUG="yes"
-	to your /etc/make.conf.
-
-20060113:
-	libc's malloc implementation has been replaced.  This change has the
-	potential to uncover application bugs that previously went unnoticed.
-	See the malloc(3) manual page for more details.
-
-20060112:
-	The generic netgraph(4) cookie has been changed. If you upgrade
-	kernel passing this point, you also need to upgrade userland
-	and netgraph(4) utilities like ports/net/mpd or ports/net/mpd4.
-
-20060106:
-	si(4)'s device files now contain the unit number.
-	Uses of {cua,tty}A[0-9a-f] should be replaced by {cua,tty}A0[0-9a-f].
-
-20060106:
-	The kernel ABI was mostly destroyed due to a change in the size
-	of struct lock_object which is nested in other structures such
-	as mutexes which are nested in all sorts of other structures.
-	Make sure your kernel and modules are in sync.
-
-20051231:
-	The page coloring algorithm in the VM subsystem was converted
-	from tuning with kernel options to autotuning. Please remove
-	any PQ_* option except PQ_NOOPT from your kernel config.
-
-20051211:
-	The net80211-related tools in the tools/tools/ath directory
-	have been moved to tools/tools/net80211 and renamed with a
-	"wlan" prefix.  Scripts that use them should be adjusted
-	accordingly.
-
-20051202:
-	Scripts in the local_startup directories (as defined in
-	/etc/defaults/rc.conf) that have the new rc.d semantics will
-	now be run as part of the base system rcorder. If there are
-	errors or problems with one of these local scripts, it could
-	cause boot problems. If you encounter such problems, boot in
-	single user mode, remove that script from the */rc.d directory.
-	Please report the problem to the port's maintainer, and the
-	freebsd-ports@freebsd.org mailing list.
-
-20051129:
-	The nodev mount option was deprecated in RELENG_6 (where it
-	was a no-op), and is now unsupported.  If you have nodev or dev listed
-	in /etc/fstab, remove it, otherwise it will result in a mount error.
-
-20051129:
-	ABI between ipfw(4) and ipfw(8) has been changed. You need
-	to rebuild ipfw(8) when rebuilding kernel.
-
-20051108:
-	rp(4)'s device files now contain the unit number.
-	Uses of {cua,tty}R[0-9a-f] should be replaced by {cua,tty}R0[0-9a-f].
-
-20051029:
-	/etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp.
-	Its /etc/rc.conf.d configuration file has been `ppp' from
-	the beginning, and hence there is no need to touch it.
-
-20051014:
-	Now most modules get their build-time options from the kernel
-	configuration file.  A few modules still have fixed options
-	due to their non-conformant implementation, but they will be
-	corrected eventually.  You may need to review the options of
-	the modules in use, explicitly specify the non-default options
-	in the kernel configuration file, and rebuild the kernel and
-	modules afterwards.
-
-20051001:
-	kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8)
-	to turn polling(4) on your interfaces.
-
-20050927:
-	The old bridge(4) implementation was retired.  The new
-	if_bridge(4) serves as a full functional replacement.
-
-20050722:
-	The ai_addrlen of a struct addrinfo was changed to a socklen_t
-	to conform to POSIX-2001.  This change broke an ABI
-	compatibility on 64 bit architecture.  You have to recompile
-	userland programs that use getaddrinfo(3) on 64 bit
-	architecture.
-
-20050711:
-	RELENG_6 branched here.
-
-20050629:
-	The pccard_ifconfig rc.conf variable has been removed and a new
-	variable, ifconfig_DEFAULT has been introduced.  Unlike
-	pccard_ifconfig, ifconfig_DEFAULT applies to ALL interfaces that
-	do not have ifconfig_ifn entries rather than just those in
-	removable_interfaces.
-
-20050616:
-	Some previous versions of PAM have permitted the use of
-	non-absolute paths in /etc/pam.conf or /etc/pam.d/* when referring
-	to third party PAM modules in /usr/local/lib.  A change has been
-	made to require the use of absolute paths in order to avoid
-	ambiguity and dependence on library path configuration, which may
-	affect existing configurations.
-
-20050610:
-	Major changes to network interface API.  All drivers must be
-	recompiled.  Drivers not in the base system will need to be
-	updated to the new APIs.
-
-20050609:
-	Changes were made to kinfo_proc in sys/user.h.  Please recompile
-	userland, or commands like `fstat', `pkill', `ps', `top' and `w'
-	will not behave correctly.
-
-	The API and ABI for hwpmc(4) have changed with the addition
-	of sampling support.  Please recompile lib/libpmc(3) and
-	usr.sbin/{pmcstat,pmccontrol}.
-
-20050606:
-	The OpenBSD dhclient was imported in place of the ISC dhclient
-	and the network interface configuration scripts were updated
-	accordingly.  If you use DHCP to configure your interfaces, you
-	must now run devd.  Also, DNS updating was lost so you will need
-	to find a workaround if you use this feature.
-
-	The '_dhcp' user was added to support the OpenBSD dhclient.  Be
-	sure to run mergemaster -p (like you are supposed to do every time
-	anyway).
-
-20050605:
-	if_bridge was added to the tree. This has changed struct ifnet.
-	Please recompile userland and all network related modules.
-
-20050603:
-	The n_net of a struct netent was changed to an uint32_t, and
-	1st argument of getnetbyaddr() was changed to an uint32_t, to
-	conform to POSIX-2001.  These changes broke an ABI
-	compatibility on 64 bit architecture.  With these changes,
-	shlib major of libpcap was bumped.  You have to recompile
-	userland programs that use getnetbyaddr(3), getnetbyname(3),
-	getnetent(3) and/or libpcap on 64 bit architecture.
-
-20050528:
-	Kernel parsing of extra options on '#!' first lines of shell
-	scripts has changed.  Lines with multiple options likely will
-	fail after this date.  For full details, please see
-		http://people.freebsd.org/~gad/Updating-20050528.txt
-
-20050503:
-	The packet filter (pf) code has been updated to OpenBSD 3.7
-	Please note the changed anchor syntax and the fact that
-	authpf(8) now needs a mounted fdescfs(5) to function.
-
-20050415:
-	The NO_MIXED_MODE kernel option has been removed from the i386
-	amd64 platforms as its use has been superceded by the new local
-	APIC timer code.  Any kernel config files containing this option
-	should be updated.
-
-20050227:
-	The on-disk format of LC_CTYPE files was changed to be machine
-	independent.  Please make sure NOT to use NO_CLEAN buildworld
-	when crossing this point. Crossing this point also requires
-	recompile or reinstall of all locale depended packages.

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Sep  5 16:26:11 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2ECE61065676; Sat,  5 Sep 2009 16:26:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E36F91065670
	for ; Sat,  5 Sep 2009 16:26:10 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FE9A8FC08
	for ; Sat,  5 Sep 2009 16:26:09 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n85GQ9OZ099536
	for ; Sat, 5 Sep 2009 16:26:09 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n85GQ93Y099534
	for perforce@freebsd.org; Sat, 5 Sep 2009 16:26:09 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Sat, 5 Sep 2009 16:26:09 GMT
Message-Id: <200909051626.n85GQ93Y099534@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168201 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, 05 Sep 2009 16:26:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=168201

Change 168201 by anchie@anchie_malimis on 2009/09/05 16:25:22

	icmp6_rip6_input() is now called from send.c as well, so the declaration
	is add to netinet/icmp6.h.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#12 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#25 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#31 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#12 (text+ko) ====


==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#25 (text+ko) ====


==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#31 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Sat Sep  5 16:29:13 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 58F971065670; Sat,  5 Sep 2009 16:29:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D6A3106566B
	for ; Sat,  5 Sep 2009 16:29:13 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C1D68FC15
	for ; Sat,  5 Sep 2009 16:29:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n85GTCja099704
	for ; Sat, 5 Sep 2009 16:29:12 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n85GTCFS099702
	for perforce@freebsd.org; Sat, 5 Sep 2009 16:29:12 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Sat, 5 Sep 2009 16:29:12 GMT
Message-Id: <200909051629.n85GTCFS099702@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168202 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, 05 Sep 2009 16:29:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=168202

Change 168202 by anchie@anchie_malimis on 2009/09/05 16:28:57

	icmp6_rip6_input() is now called from send.c as well, so the declaration
	is added to netinet/icmp6.h.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#13 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#26 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#13 (text+ko) ====

@@ -663,6 +663,7 @@
 void	icmp6_prepare(struct mbuf *);
 void	icmp6_redirect_input(struct mbuf *, int);
 void	icmp6_redirect_output(struct mbuf *, struct rtentry *);
+int 	icmp6_rip6_input(struct mbuf **, int);
 
 struct	ip6ctlparam;
 void	icmp6_mtudisc_update(struct ip6ctlparam *, int);

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#26 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Sat Sep  5 16:31:15 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA6151065679; Sat,  5 Sep 2009 16:31:15 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EE92106566B
	for ; Sat,  5 Sep 2009 16:31:15 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DCAD8FC1D
	for ; Sat,  5 Sep 2009 16:31:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n85GVFTm099877
	for ; Sat, 5 Sep 2009 16:31:15 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n85GVFAf099875
	for perforce@freebsd.org; Sat, 5 Sep 2009 16:31:15 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Sat, 5 Sep 2009 16:31:15 GMT
Message-Id: <200909051631.n85GVFAf099875@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168203 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, 05 Sep 2009 16:31:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=168203

Change 168203 by anchie@anchie_malimis on 2009/09/05 16:30:36

	icmp6_rip6_input() is now called from send.c as well, so the declaration
	is added to netinet/icmp6.h.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#27 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#27 (text+ko) ====

@@ -132,7 +132,6 @@
 #define	V_icmp6errppslim_last	VNET(icmp6errppslim_last)
 
 static void icmp6_errcount(struct icmp6errstat *, int, int);
-static int icmp6_rip6_input(struct mbuf **, int);
 static int icmp6_ratelimit(const struct in6_addr *, const int, const int);
 static const char *icmp6_redirect_diag __P((struct in6_addr *,
 	struct in6_addr *, struct in6_addr *));

From owner-p4-projects@FreeBSD.ORG  Sat Sep  5 23:23:53 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E00671065679; Sat,  5 Sep 2009 23:23:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A19D41065672
	for ; Sat,  5 Sep 2009 23:23:52 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 76F3B8FC14
	for ; Sat,  5 Sep 2009 23:23:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n85NNqW2056914
	for ; Sat, 5 Sep 2009 23:23:52 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n85NNqh2056912
	for perforce@freebsd.org; Sat, 5 Sep 2009 23:23:52 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Sat, 5 Sep 2009 23:23:52 GMT
Message-Id: <200909052323.n85NNqh2056912@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 168221 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, 05 Sep 2009 23:23:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=168221

Change 168221 by anchie@anchie_malimis on 2009/09/05 23:23:39

	Minor fix.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#28 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#28 (text+ko) ====

@@ -1971,7 +1971,7 @@
 /*
  * XXX almost dup'ed code with rip6_input.
  */
-static int
+int
 icmp6_rip6_input(struct mbuf **mp, int off)
 {
 	struct mbuf *m = *mp;