From owner-p4-projects@FreeBSD.ORG Sun Jan 3 00:05:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFFCB1065693; Sun, 3 Jan 2010 00:05: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 7C43C1065672 for ; Sun, 3 Jan 2010 00:05: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 6854C8FC0C for ; Sun, 3 Jan 2010 00:05: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 o03054Td056308 for ; Sun, 3 Jan 2010 00:05:04 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o03054ke056306 for perforce@freebsd.org; Sun, 3 Jan 2010 00:05:04 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 3 Jan 2010 00:05:04 GMT Message-Id: <201001030005.o03054ke056306@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 Precedence: bulk Cc: Subject: PERFORCE change 172499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2010 00:05:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=172499 Change 172499 by pgj@Binturong on 2010/01/03 00:04:55 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#43 integrate .. //depot/projects/docproj_hu/www/en/cgi/cgi-style.pl#5 integrate .. //depot/projects/docproj_hu/www/en/cgi/mid.cgi#3 integrate .. //depot/projects/docproj_hu/www/en/cgi/missing_handler.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/pds.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/ports.cgi#3 integrate .. //depot/projects/docproj_hu/www/en/releases/8.0R/schedule.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#34 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#74 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#19 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#43 (text+ko) ==== @@ -1,7 +1,7 @@ + + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.68 2009/12/21 21:00:37 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.69 2009/12/29 20:35:42 jkois Exp $ @@ -584,6 +584,19 @@ + + HNT Solutions + http://www.hntsolutions.com + + HNT Solutions provides complete &os; support services and + consulting. Please contact us at unix@hntsolutions.com or + visit our website + for more information. + + + Greg Lehey http://www.lemis.com/~grog/ From owner-p4-projects@FreeBSD.ORG Sun Jan 3 00:11:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04BA51065695; Sun, 3 Jan 2010 00:11: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 BD4061065679 for ; Sun, 3 Jan 2010 00:11:10 +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 AAB708FC16 for ; Sun, 3 Jan 2010 00:11: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 o030BAYP056872 for ; Sun, 3 Jan 2010 00:11:10 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o030BAtI056870 for perforce@freebsd.org; Sun, 3 Jan 2010 00:11:10 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 3 Jan 2010 00:11:10 GMT Message-Id: <201001030011.o030BAtI056870@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 Precedence: bulk Cc: Subject: PERFORCE change 172500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2010 00:11:11 -0000 http://p4web.freebsd.org/chv.cgi?CH=172500 Change 172500 by pgj@Binturong on 2010/01/03 00:10:50 MFen (doc): 1.1118 -> 1.1119 hu_HU.ISO8859-2/books/faq/book.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#55 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#55 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -378,7 +378,7 @@ James Howard The BSD Family Tree + url="http://www.freebsdworld.gr/freebsd/bsd-family-tree.html">The BSD Family Tree címmel (angolul) készített egy alapos leírást a különbözõ projektek közti eltérések From owner-p4-projects@FreeBSD.ORG Sun Jan 3 16:03:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F00E41065676; Sun, 3 Jan 2010 16:03: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 B45AC106566B for ; Sun, 3 Jan 2010 16:03:04 +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 A26F78FC1C for ; Sun, 3 Jan 2010 16:03: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 o03G34UW096816 for ; Sun, 3 Jan 2010 16:03:04 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o03G34lV096814 for perforce@freebsd.org; Sun, 3 Jan 2010 16:03:04 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 3 Jan 2010 16:03:04 GMT Message-Id: <201001031603.o03G34lV096814@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 Precedence: bulk Cc: Subject: PERFORCE change 172522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2010 16:03:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=172522 Change 172522 by rene@rene_self on 2010/01/03 16:02:27 [www/nl] Remove defunct and untranslated pages. While here, add untranslated internal/i18n.sgml so that internal/Makefile matches the English version again after removing internal/rtp.sgml Affected files ... .. //depot/projects/docproj_nl/www/nl/internal/Makefile#2 edit .. //depot/projects/docproj_nl/www/nl/internal/i18n.sgml#1 add .. //depot/projects/docproj_nl/www/nl/internal/rtp.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/platforms/amd64/Makefile#2 delete .. //depot/projects/docproj_nl/www/nl/platforms/amd64/motherboards.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/projects/dingo/Makefile#2 delete .. //depot/projects/docproj_nl/www/nl/projects/dingo/index.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/projects/gnats4/Makefile#2 delete .. //depot/projects/docproj_nl/www/nl/projects/gnats4/index.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/projects/ideas/index.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/projects/nanobsd/Makefile#2 delete .. //depot/projects/docproj_nl/www/nl/projects/nanobsd/index.sgml#2 delete .. //depot/projects/docproj_nl/www/nl/projects/summerofcode.sgml#2 delete Differences ... ==== //depot/projects/docproj_nl/www/nl/internal/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: www/en/internal/Makefile,v 1.43 2005/08/16 18:53:16 jhb Exp $ -# $FreeBSDnl: www/nl/internal/Makefile,v 1.3 2006/01/14 13:35:25 siebrand Exp $ -# Gebaseerd op: 1.43 +# $FreeBSD$ +# %SOURCE% en/internal/Makefile +# %SRCID% 1.48 # Bewerkt door: Siebrand Mazeland .if exists(../Makefile.conf) @@ -23,9 +23,9 @@ DOCS+= expire-bits.sgml DOCS+= core-vote.sgml DOCS+= doceng.sgml -DOCS+= rtp.sgml DOCS+= policies.sgml DOCS+= fortunes.sgml +DOCS+= i18n.sgml INDEXLINK= internal.html From owner-p4-projects@FreeBSD.ORG Sun Jan 3 16:31:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9985A106568F; Sun, 3 Jan 2010 16:31:33 +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 45C1B1065670 for ; Sun, 3 Jan 2010 16:31:33 +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 333388FC20 for ; Sun, 3 Jan 2010 16:31:33 +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 o03GVXkj099018 for ; Sun, 3 Jan 2010 16:31:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o03GVXMf099016 for perforce@freebsd.org; Sun, 3 Jan 2010 16:31:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 3 Jan 2010 16:31:33 GMT Message-Id: <201001031631.o03GVXMf099016@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 Precedence: bulk Cc: Subject: PERFORCE change 172523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2010 16:31:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=172523 Change 172523 by hselasky@hselasky_laptop001 on 2010/01/03 16:30:36 usbconfig: - be more verbose on duplicate options. - patch by: HPS Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#18 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#18 (text+ko) ==== @@ -253,6 +253,14 @@ } static void +duplicate_option(const char *ptr) +{ + printf("Syntax error: " + "Duplicate option: '%s'\n", ptr); + exit(1); +} + +static void usage(void) { printf("" @@ -601,14 +609,14 @@ case T_DUMP_QUIRK_NAMES: if (opt->got_dump_quirk_names) - break; + duplicate_option(argv[n]); opt->got_dump_quirk_names = 1; opt->got_any++; break; case T_DUMP_DEVICE_QUIRKS: if (opt->got_dump_device_quirks) - break; + duplicate_option(argv[n]); opt->got_dump_device_quirks = 1; opt->got_any++; break; @@ -638,7 +646,7 @@ break; case T_SET_CONFIG: if (opt->got_set_config) - break; + duplicate_option(argv[n]); opt->config_index = num_id(argv[n + 1], "cfg_index"); opt->got_set_config = 1; opt->got_any++; @@ -646,7 +654,7 @@ break; case T_SET_ALT: if (opt->got_set_alt) - break; + duplicate_option(argv[n]); opt->alt_index = num_id(argv[n + 1], "cfg_index"); opt->got_set_alt = 1; opt->got_any++; @@ -654,7 +662,7 @@ break; case T_SET_TEMPLATE: if (opt->got_set_template) - break; + duplicate_option(argv[n]); opt->template = get_int(argv[n + 1]); opt->got_set_template = 1; opt->got_any++; @@ -662,31 +670,31 @@ break; case T_GET_TEMPLATE: if (opt->got_get_template) - break; + duplicate_option(argv[n]); opt->got_get_template = 1; opt->got_any++; break; case T_DUMP_DEVICE_DESC: if (opt->got_dump_device_desc) - break; + duplicate_option(argv[n]); opt->got_dump_device_desc = 1; opt->got_any++; break; case T_DUMP_CURR_CONFIG_DESC: if (opt->got_dump_curr_config) - break; + duplicate_option(argv[n]); opt->got_dump_curr_config = 1; opt->got_any++; break; case T_DUMP_ALL_CONFIG_DESC: if (opt->got_dump_all_config) - break; + duplicate_option(argv[n]); opt->got_dump_all_config = 1; opt->got_any++; break; case T_DUMP_INFO: if (opt->got_dump_info) - break; + duplicate_option(argv[n]); opt->got_dump_info = 1; opt->got_any++; break; @@ -701,43 +709,43 @@ break; case T_SUSPEND: if (opt->got_suspend) - break; + duplicate_option(argv[n]); opt->got_suspend = 1; opt->got_any++; break; case T_RESUME: if (opt->got_resume) - break; + duplicate_option(argv[n]); opt->got_resume = 1; opt->got_any++; break; case T_POWER_OFF: if (opt->got_power_off) - break; + duplicate_option(argv[n]); opt->got_power_off = 1; opt->got_any++; break; case T_POWER_SAVE: if (opt->got_power_save) - break; + duplicate_option(argv[n]); opt->got_power_save = 1; opt->got_any++; break; case T_POWER_ON: if (opt->got_power_on) - break; + duplicate_option(argv[n]); opt->got_power_on = 1; opt->got_any++; break; case T_RESET: if (opt->got_reset) - break; + duplicate_option(argv[n]); opt->got_reset = 1; opt->got_any++; break; case T_LIST: if (opt->got_list) - break; + duplicate_option(argv[n]); opt->got_list = 1; opt->got_any++; break; From owner-p4-projects@FreeBSD.ORG Sun Jan 3 18:42:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45DF41065698; Sun, 3 Jan 2010 18:42:46 +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 084701065696 for ; Sun, 3 Jan 2010 18:42:46 +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 E7A618FC1F for ; Sun, 3 Jan 2010 18:42: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 o03Igjko021027 for ; Sun, 3 Jan 2010 18:42:45 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o03IgiVp021025 for perforce@freebsd.org; Sun, 3 Jan 2010 18:42:44 GMT (envelope-from trasz@freebsd.org) Date: Sun, 3 Jan 2010 18:42:44 GMT Message-Id: <201001031842.o03IgiVp021025@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 Precedence: bulk Cc: Subject: PERFORCE change 172526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2010 18:42:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=172526 Change 172526 by trasz@trasz_victim on 2010/01/03 18:41:50 One last IFC. The only thing left here is a change to vn_stat(), which makes it return error if ACL_READ_ACL is denied. I'm not sure whether we should merge this one to HEAD. Don't expect any more commits to this branch. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/COPYRIGHT#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/MAINTAINERS#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#39 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/kenv/kenv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/pax/ftree.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/pkill.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/arith.y#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/cd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/error.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/expand.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/histedit.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/input.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/jobs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/main.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/miscbltin.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mkbuiltins#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mkinit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mksyntax.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mystring.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/options.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/options.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/output.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/var.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/telnet/telnetd/sys_term.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/named#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.firewall#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/strfile/strfile.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/number/number.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/paths.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/csu/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/csu/arm/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/csu/i386-elf/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/csu/mips/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_check_magic.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_crc32.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_endian.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_link_resolver.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_private.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_stat.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_xattr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_hash.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_private.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_disk_entry_from_file.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_disk_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_disk_set_standard_lookup.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_open_filename.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_private.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_all.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_compress.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_program.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_uu.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_xz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_ar.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_mtree.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_raw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_string.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_string.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_util.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_virtual.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write.3#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk_set_standard_lookup.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_open_fd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_private.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_compression_compress.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_compression_program.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_compression_xz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_ar.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_cpio.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_mtree.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_zip.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/config_freebsd.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/filter_fork.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/tar.5#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/main.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_acl_pax.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_bzip2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_cpio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_lzma.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_solaris_tar_acl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_entry.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_entry_strmode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_extattr_freebsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_fuzz.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_fuzz_1.iso.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_open_fd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_open_file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_pax_filename_encoding.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_compress_program.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_disk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_disk_entry_from_file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_extract.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_ar.ar.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_gz.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_multi_extent.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isojoliet_bz2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isojoliet_long.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isojoliet_rr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_bz2.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_ce.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_mtree.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_mtree.mtree.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_pax_bz2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tar.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tbz.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tlz.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_large.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_uu.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_tar_large.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_compress_program.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_failures.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_hardlink.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_perms.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_secure.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_sparse.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_symlink.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_times.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_cpio_newc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_cpio_odc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_tar_ustar.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_zip.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_zip_empty.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_zip_no_compression.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libauditd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libautofs/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbegemot/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbsm/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbz2/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/sem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/time.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/time.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/localtime.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcalendar/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcam/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcompat/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcrypt/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libdevinfo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libdevstat/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libdwarf/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libedit/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libexpat/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libexpat/libbsdxml.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libftpio/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/geom_getxml.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgpib/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgssapi/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgssapi/gss_mech_switch.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libipsec/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libipx/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libjail/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkiconv/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmagic/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmilter/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmp/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libncp/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libngatm/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libopie/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/pam_exec/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/pam_krb5/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/pam_radius/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/pam_ssh/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpcap/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libproc/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/librpcsec_gss/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/librpcsec_gss/rpcsec_gss_conf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/librpcsec_gss/svc_rpcsec_gss.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/librt/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libsbuf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libsm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libsmdb/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libsmutil/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libtacplus/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libufs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libugidfw/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libulog/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libulog/ulog.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libulog/ulog_getutxent.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libulog/ulog_setutxfile.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/Makefile#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libvgl/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libwrap/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/liby/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libypclnt/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libz/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/atrun/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/bootpd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/bootpd/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/bootpd/tools/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/comsat/comsat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/fingerd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/getty/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/mail.local/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/mknetid/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/pppoed/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rbootd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/revnetgroup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rquotad/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rstatd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rusersd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rusersd/rusersd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rwalld/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.sprayd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rshd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-aout/shlib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-aout/support.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/smrsh/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/talkd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/talkd/process.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/tcpd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/tftp-proxy/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/tftpd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ulog-helper/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ypxfr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/bridge/PICOBSD#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/build/mfs.mtree#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/build/picobsd#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/floppy.tree/etc/master.passwd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/floppy.tree/sbin/dhclient-script#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/qemu/PICOBSD#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/qemu/PICOBSD.hints#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/qemu/config#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/qemu/crunch.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/qemu/floppy.tree.exclude#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/gjournal.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/cache/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/cache/gcache.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/core/geom.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/growfs/growfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/vfslist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/mount_msdosfs.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nullfs/mount_nullfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/natd/natd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/newfs/mkfs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/rcorder/hash.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/reboot/reboot.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/routed/if.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/umount/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/umount/umount.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/auth-down.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/auth-up.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/chap-secrets.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/chat.sh.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/ip-down.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/ip-up.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/options.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/pap-secrets.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/ppp.deny.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/pppd/ppp.shells.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/slattach/unit-command.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/sliplogin/slip.hosts#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/sliplogin/slip.login#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/sliplogin/slip.logout#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/sliplogin/slip.slparms#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/startslip/sldown.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/startslip/slip.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/startslip/slup.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ifmib.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mfi.4#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/termios.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/tty.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/u3g.4#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ucom.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.sys.mk#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/module.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/bios.S#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/boot.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/boot.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/disk.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/inode.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/io.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/serial_16550.S#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/sys.c#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/boot/zfs/zfsimpl.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#59 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.ia64#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.sparc64#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aicasm/aicasm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbus_cis.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dc.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_vm.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/creator.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/fb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/s3_pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vga.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vgareg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_core.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwnreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwnvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ksyms/ksyms.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/led/led.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/md/md.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siis/siis.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siis/siis.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_aue.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axe.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cue.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_kue.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/quirk/usb_quirk.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uftdi.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uipaq.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uplcom.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uslcom.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvisor.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_ural.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkfront/blkfront.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clbio.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clrpcops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clvnops.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_io.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/bus_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mp_machdep.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/bus.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/vga_isa.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_conf.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_devstat.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#30 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_accf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#46 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/iwn1000/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/iwn4965/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/iwn5000/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/iwn6000/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_llatbl.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_llatbl.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_vlan.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/uni/ng_uni.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ipfw.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ipfw.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_dummynet.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_dummynet.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw2.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_log.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_nat.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_pfil.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_table.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_mod.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#29 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/krpc_subr.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/gdc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/ofw/ofw_syscons.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mem.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/fire.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/firereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/firevar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/psycho.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/psychovar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/eeprom.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ata.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/conf.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/copyright.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/event.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/file.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pmc.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttydevsw.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/device_pager.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/uma_core.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/gnttab.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acct/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acct/regress.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/date/regress.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/mv/regress.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/builtin1.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/command6.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/command6.0.stdout#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/command7.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/type2.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/expansion/arith1.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/expansion/arith2.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/expansion/cmdsubst1.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom/ConfCmp/ConfCmp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/jot/regress.sh#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/apply/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/acpyacc.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/ar.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/read.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/at/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/at/at.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/atm/sscop/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/awk/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/banner/banner.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/biff/biff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/bluetooth/bthost/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/bsdiff/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/calendar/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/catman/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/chkey/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/chpass/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/colldef/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/compile_et/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/compress/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/test/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpuset/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ctags/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/dig/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/du/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/elf2aout/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/elfdump/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/env/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fetch/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fetch/fetch.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/file2c/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/find/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/find/function.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/finger.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/finger.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/lprint.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/net.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/sprint.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/util.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fsync/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ftp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gencat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gencat/gencat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/getent/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gprof/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gprof/aout.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/head/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/hexdump/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/host/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/id/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ipcrm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ipcs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/kdump/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/keylogin/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ktrace/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ktrdump/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lam/lam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/last/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lastcomm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ldd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/leave/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/less/Makefile.common#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lex/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lex/flex.skl#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lex/initscan.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/limits/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/locate/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/locate/locate/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lock/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/logger/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/login/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/login/login.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/login/login_fbtab.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/logins/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/logname/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/look/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/lsvfs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/m4/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mail/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/minigzip/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mkfifo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mklocale/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mklocale/lex.l#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mklocale/yacc.y#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mkstr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mkuzip/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/msgs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncplist/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/newkey/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nfsstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nohup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nslookup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nsupdate/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/opieinfo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/opiekey/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/opiepasswd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/passwd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/passwd/passwd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/pr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/printf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/renice/renice.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/revoke/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rlogin/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rpcgen/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rpcgen/rpc_hout.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rpcgen/rpc_main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rsh/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ruptime/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rusers/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rwho/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/script/script.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/showmount/showmount.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/smbutil/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sockstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sockstat/sockstat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/su/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/systat/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tail/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tail/misc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/Makefile#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/test/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tcopy/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/telnet/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tftp/tftp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/time/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/top/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/syscalls.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/unifdef/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/unzip/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/users/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/uudecode/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/uuencode/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/vacation/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/vgrind/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/vi/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/wall/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/wall/wall.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/wc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/wc/wc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/whereis/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/who/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/who/who.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/write/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/xargs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/xinstall/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/xlint/xlint/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/yacc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/yacc/skeleton.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ypcat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ypmatch/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ypwhich/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ac/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/accton/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/accton/accton.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpiconf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpidump/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/iasl/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/amd/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ancontrol/ancontrol.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/apm/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/apmd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arp/arp.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/asf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/asf/asf_kld.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/audit/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/auditd/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/auditreduce/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/authpf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/boot0cfg/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bootparamd/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/btxld/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cdcontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/chkgrp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/chown/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/chroot/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/chroot/chroot.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/lang.l#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cron/cron/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/crunch/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/crunch/examples/really-big.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ctm/ctm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ctm/ctm_rmail/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/daemon/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dconschat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/devinfo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/digictl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/diskinfo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dnssec-dsfromkey/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dnssec-keyfromlabel/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dnssec-keygen/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dnssec-signzone/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/editmap/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/edquota/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/eeprom/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/eeprom/eeprom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/extattr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/extattrctl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/extattrctl/extattrctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/faithd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fdcontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fdformat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fdread/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fdwrite/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fifolog/lib/getdate.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ftp-proxy/libevent/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/getfmac/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/getpmac/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/inetd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/inetd/inetd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/iostat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ip6addrctl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ipfwpcap/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jexec/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kbdcontrol/kbdcontrol.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kernbb/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lastlogin/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lastlogin/lastlogin.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lmcconfig/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/common_source/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/filters.ru/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/lpc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/lpd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/lpr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lptcontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mailstats/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mailwrapper/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/makemap/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/memcontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.8#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mixer/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mld6query/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mlxcontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mount_portalfs/mount_portalfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mptable/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mtree/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/named-checkconf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/named-checkzone/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/named/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndiscvt/ndiscvt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/newsyslog/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nghook/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ntp/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ntp/config.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nvram/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ofwdump/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/main.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/create/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/delete/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/delete/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/info/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/info/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/updating/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/version/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/version/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcannotate/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcannotate/pmcannotate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmccontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat_log.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pnpinfo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/portsnap/make_index/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/portsnap/phttpget/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/powerd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/powerd/powerd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/ppp.8.m4#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pppctl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/praliases/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/praudit/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/procctl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pstat/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pwd_mkdb/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/quotaon/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/repquota/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rip6query/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rip6query/rip6query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rmt/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rmt/rmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rndc-confgen/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rndc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/route6d/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.lockd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.statd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.umntall/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.umntall/mounttab.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.yppasswdd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.ypupdated/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.ypxfrd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpcbind/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rrenumd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtadvd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtprio/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rwhod/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rwhod/rwhod.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sa/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sa/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sa/usrdb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sendmail/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/service.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/service.sh#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/setfmac/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/setpmac/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/smbmsg/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/snapinfo/snapinfo.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/disks.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/label.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tcpdrop/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tcpdump/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute6/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tzsetup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/uathload/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbdevs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/vidcontrol/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/vipw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wake/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wake/wake.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wake/wake.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/watchdogd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/watchdogd/watchdogd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wlandebug/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wlconfig/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/yp_mkdb/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ypbind/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/yppoll/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/yppush/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/yppush/yppush_main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ypserv/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ypserv/yp_main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ypserv/ypinit.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ypset/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zic/Makefile#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/COPYRIGHT#4 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.12 2009/12/31 10:00:37 obrien Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 4 21:56:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0DCB1065676; Mon, 4 Jan 2010 21:56: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 4C3E3106566C for ; Mon, 4 Jan 2010 21:56:54 +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 39A588FC08 for ; Mon, 4 Jan 2010 21:56: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 o04LusQk046302 for ; Mon, 4 Jan 2010 21:56:54 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o04LusXl046300 for perforce@freebsd.org; Mon, 4 Jan 2010 21:56:54 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 4 Jan 2010 21:56:54 GMT Message-Id: <201001042156.o04LusXl046300@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 Precedence: bulk Cc: Subject: PERFORCE change 172585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2010 21:56:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=172585 Change 172585 by rene@rene_self on 2010/01/04 21:56:04 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#42 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#66 integrate .. //depot/projects/docproj_nl/www/en/internal/machines.sgml#5 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#42 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -936,8 +936,9 @@ in /usr/local/lib/X11/fonts/ and ~/.fonts/ are automatically made available for anti-aliasing to Xft-aware applications. - Most recent applications are Xft-aware, including KDE, GNOME, and - Firefox. + Most recent applications are Xft-aware, including + KDE, GNOME, and + Firefox. In order to control which fonts are anti-aliased, or to configure anti-aliasing properties, create (or edit, if it ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#66 (text+ko) ==== @@ -1,7 +1,7 @@ Example simple rc.d script: #!/bin/sh -# $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1043 2009/12/31 21:14:16 dougb Exp $ + +# $FreeBSD$ # # PROVIDE: doormand # REQUIRE: LOGIN @@ -8481,10 +8482,10 @@ Unless there is a good reason to start the service earlier all ports scripts should use - REQUIRE: LOGIN. If the service + REQUIRE: LOGIN If the service runs as a particular user (other than root) this is mandatory. - The KEYWORD: shutdown - included in the script above is there because the mythical port + KEYWORD: shutdown + is included in the script above because the mythical port we are using as an example starts a service, and should be shut down cleanly when the system shuts down. If the script is not starting a persistent service this is not necessary. @@ -13484,6 +13485,14 @@ sleepq_sleepcnt(), which can be used to query the number of waiters on a specific waiting queue. + + 900006 + January 4, 2010 + 9.0-CURRENT after change of the + scandir(3) and + alphasort(3) prototypes to + conform to SUSv4. + ==== //depot/projects/docproj_nl/www/en/internal/machines.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -40,14 +40,14 @@ freefall -7-CURRENT +8-PRERELEASE GNATS/shell Logins. committers ftp-master -7-STABLE +8-STABLE FTP Master (stage server). peter/kuriyama/obrien/steve @@ -60,15 +60,22 @@ +gohan18 +8-STABLE +portmgr testbed. +portmgr + + + gohan20-59 -8-CURRENT +8-STABLE i386 package build cluster. portmgr hub -6-STABLE +7-STABLE Mailing Lists and Mail services. postmaster @@ -103,23 +110,23 @@ pluto1 -7-STABLE -Reference machine for testing ia64 changes. +8-STABLE +Reference machine for testing ia64 changes; ia64 package building. committers pluto2 --CURRENT -Reference machine for testing ia64 changes. +9-CURRENT +Reference machine for testing ia64 changes; ia64 package building. committers pointyhat --CURRENT +9-CURRENT All architectures package build master. -portmgr +portmgr (r/w), committers (r/o) @@ -138,7 +145,7 @@ sledge --CURRENT +8-STABLE Reference machine for testing AMD64 changes. committers @@ -152,7 +159,7 @@ www -6-STABLE +7-STABLE The www.FreeBSD.org Webserver. webmaster @@ -192,8 +199,8 @@ ftp-master Intel x86 -2.66GHz Pentium 4, 1GB Memory, 40GB Maxtor ATA drive, - Broadcom BCM5703 Gigabit Ethernet NIC. +2x dual-core 2.80GHz Xeon, 4GB Memory, LSI Logic PERC 4e/Di RAID + adapter, 1.14T disk, 2x Intel PRO/1000 Ethernet NIC. @@ -204,6 +211,13 @@ +gohan18 +Intel x86 +2x1.8GHz quad-core Xeon L5320, 8GB Memory, LSILogic SAS/SATA controller, +1x160GB SAT300 drive, 2x Broadcom NetXtreme Gigabit Ethernet NIC. + + + gohan20-59 Intel x86 700-900MHz Pentium III, 1GB Memory, ServerWorks CSB5 UDMA100 controller, @@ -283,9 +297,9 @@ www -Intel x86 MP -2x600MHz Pentium III, 1GB Memory, 3ware 4-port IDE controller (twe), - Intel EtherExpress Pro 10/100B NIC. +Intel x86 +2x dual-core 2.80GHz Xeon, 1.5GB Memory, Compaq Smart Array 5i RAID controller, + 2x34GB SCSI Disks in RAID1, 2x Broadcom Gigabit Ethernet NIC. From owner-p4-projects@FreeBSD.ORG Mon Jan 4 22:03:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF4001065693; Mon, 4 Jan 2010 22:03:00 +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 83901106568F for ; Mon, 4 Jan 2010 22:03:00 +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 7202E8FC13 for ; Mon, 4 Jan 2010 22:03:00 +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 o04M30u9046718 for ; Mon, 4 Jan 2010 22:03:00 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o04M30nG046716 for perforce@freebsd.org; Mon, 4 Jan 2010 22:03:00 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 4 Jan 2010 22:03:00 GMT Message-Id: <201001042203.o04M30nG046716@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 Precedence: bulk Cc: Subject: PERFORCE change 172586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2010 22:03:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=172586 Change 172586 by rene@rene_self on 2010/01/04 22:02:37 MFen handbook/x11 1.200 -> 1.201 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#25 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#25 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.25 2009/12/14 17:37:38 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml - %SRCID% 1.200 + %SRCID% 1.201 --> @@ -991,8 +991,9 @@ /usr/local/lib/X11/fonts/ en ~/.fonts/ staan zijn automatisch beschikbaar voor anti-aliasing in applicaties die Xft ondersteunen. De meeste - recente applicaties ondersteunen Xft, inclusief KDE, GNOME, en - Firefox. + recente applicaties ondersteunen Xft, inclusief + KDE, GNOME, en + Firefox. Om te kunnen regelen welke lettertypen gebruik maken van anti-alias of om de eigenschappen van anti-aliasing in te From owner-p4-projects@FreeBSD.ORG Tue Jan 5 17:24:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C92F1065679; Tue, 5 Jan 2010 17:24:29 +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 C508E106566B for ; Tue, 5 Jan 2010 17:24:28 +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 B26B28FC12 for ; Tue, 5 Jan 2010 17:24: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 o05HOSlv010849 for ; Tue, 5 Jan 2010 17:24:28 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o05HOSfp010847 for perforce@freebsd.org; Tue, 5 Jan 2010 17:24:28 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 5 Jan 2010 17:24:28 GMT Message-Id: <201001051724.o05HOSfp010847@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 Precedence: bulk Cc: Subject: PERFORCE change 172623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2010 17:24:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=172623 Change 172623 by rene@rene_self on 2010/01/05 17:23:30 IFC Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#26 integrate .. //depot/projects/docproj_nl/www/share/sgml/header.ent#6 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#26 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/www/share/sgml/header.ent#6 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ Site Map | - Legal Notices | © 1995-2009 The FreeBSD Project. + Legal Notices | © 1995-2010 The FreeBSD Project. All rights reserved.'> home   |   contact   |   legal   |   ©right;'> From owner-p4-projects@FreeBSD.ORG Tue Jan 5 17:41:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E6231065693; Tue, 5 Jan 2010 17:41:46 +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 32CAD106568B for ; Tue, 5 Jan 2010 17:41:46 +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 1F5BE8FC08 for ; Tue, 5 Jan 2010 17:41:46 +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 o05HfkrT012114 for ; Tue, 5 Jan 2010 17:41:46 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o05Hfjec012112 for perforce@freebsd.org; Tue, 5 Jan 2010 17:41:45 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 5 Jan 2010 17:41:45 GMT Message-Id: <201001051741.o05Hfjec012112@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 Precedence: bulk Cc: Subject: PERFORCE change 172624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2010 17:41:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=172624 Change 172624 by rene@rene_self on 2010/01/05 17:40:55 MFen www/nl/share/sgml/header.l10n.ent 1.13 -> 1.14 While here, fix most whitespace errors Affected files ... .. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#15 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#15 (text+ko) ==== @@ -1,20 +1,20 @@ - + - -'> + +'> '> - - - + + + Sitemap | - Wettelijke mededelingen | © 1995-2009 Het FreeBSD Project. + Wettelijke mededelingen | © 1995-2010 Het FreeBSD Project. Alle rechten voorbehouden.'> beginpagina   |   contact   |   legaal   |   ©right;'> @@ -25,7 +25,7 @@ - + '> @@ -50,11 +50,11 @@ '> @@ -63,11 +63,11 @@ '> @@ -77,7 +77,7 @@ + title="&rsstitle;" href="&rsslink;" /> '> ]]> @@ -95,12 +95,12 @@ &os; + width="457" height="75" alt="&os;" /> '> ]]> &os; + width="457" height="75" alt="&os;"> '> @@ -115,25 +115,23 @@ - - - - + + + + '> ]]> - - - - + + + + '> @@ -232,29 +230,29 @@

Aanvullende koppelingen

@@ -273,27 +271,27 @@ &header2;
-
- &nav; -
+
+ &nav; +
-
- &header3;'> +
+ &header3;'> +
- &html.br.clearboth; + &html.br.clearboth;
'> - + Dit document beschrijft hoe de &os; webpagina&qout;s met de hand vanuit het CVS reservoir te bouwen en actueel te houden.

'> From owner-p4-projects@FreeBSD.ORG Wed Jan 6 10:15:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 604F2106568B; Wed, 6 Jan 2010 10:15: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 23CE8106566B for ; Wed, 6 Jan 2010 10:15:22 +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 115AE8FC19 for ; Wed, 6 Jan 2010 10:15:22 +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 o06AFLoF046884 for ; Wed, 6 Jan 2010 10:15:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06AFLPV046882 for perforce@freebsd.org; Wed, 6 Jan 2010 10:15:21 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 6 Jan 2010 10:15:21 GMT Message-Id: <201001061015.o06AFLPV046882@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 Precedence: bulk Cc: Subject: PERFORCE change 172650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 10:15:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=172650 Change 172650 by pgj@Binturong on 2010/01/06 10:15:17 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#56 integrate .. //depot/projects/docproj_hu/www/en/internal/machines.sgml#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/header.ent#6 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#56 (text+ko) ==== @@ -20,7 +20,7 @@ A &os; Dokumentációs Projekt - $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.16 2009/12/15 22:32:53 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.17 2010/01/03 00:20:07 pgj Exp $ 1995 ==== //depot/projects/docproj_hu/www/en/internal/machines.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -40,14 +40,14 @@ freefall -7-CURRENT +8-PRERELEASE GNATS/shell Logins. committers ftp-master -7-STABLE +8-STABLE FTP Master (stage server). peter/kuriyama/obrien/steve @@ -60,15 +60,22 @@ +gohan18 +8-STABLE +portmgr testbed. +portmgr + + + gohan20-59 -8-CURRENT +8-STABLE i386 package build cluster. portmgr hub -6-STABLE +7-STABLE Mailing Lists and Mail services. postmaster @@ -103,23 +110,23 @@ pluto1 -7-STABLE -Reference machine for testing ia64 changes. +8-STABLE +Reference machine for testing ia64 changes; ia64 package building. committers pluto2 --CURRENT -Reference machine for testing ia64 changes. +9-CURRENT +Reference machine for testing ia64 changes; ia64 package building. committers pointyhat --CURRENT +9-CURRENT All architectures package build master. -portmgr +portmgr (r/w), committers (r/o) @@ -138,7 +145,7 @@ sledge --CURRENT +8-STABLE Reference machine for testing AMD64 changes. committers @@ -152,7 +159,7 @@ www -6-STABLE +7-STABLE The www.FreeBSD.org Webserver. webmaster @@ -192,8 +199,8 @@ ftp-master Intel x86 -2.66GHz Pentium 4, 1GB Memory, 40GB Maxtor ATA drive, - Broadcom BCM5703 Gigabit Ethernet NIC. +2x dual-core 2.80GHz Xeon, 4GB Memory, LSI Logic PERC 4e/Di RAID + adapter, 1.14T disk, 2x Intel PRO/1000 Ethernet NIC. @@ -204,6 +211,13 @@ +gohan18 +Intel x86 +2x1.8GHz quad-core Xeon L5320, 8GB Memory, LSILogic SAS/SATA controller, +1x160GB SAT300 drive, 2x Broadcom NetXtreme Gigabit Ethernet NIC. + + + gohan20-59 Intel x86 700-900MHz Pentium III, 1GB Memory, ServerWorks CSB5 UDMA100 controller, @@ -283,9 +297,9 @@ www -Intel x86 MP -2x600MHz Pentium III, 1GB Memory, 3ware 4-port IDE controller (twe), - Intel EtherExpress Pro 10/100B NIC. +Intel x86 +2x dual-core 2.80GHz Xeon, 1.5GB Memory, Compaq Smart Array 5i RAID controller, + 2x34GB SCSI Disks in RAID1, 2x Broadcom Gigabit Ethernet NIC. ==== //depot/projects/docproj_hu/www/share/sgml/header.ent#6 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ Site Map | - Legal Notices | © 1995-2009 The FreeBSD Project. + Legal Notices | © 1995-2010 The FreeBSD Project. All rights reserved.'> home   |   contact   |   legal   |   ©right;'> From owner-p4-projects@FreeBSD.ORG Wed Jan 6 11:03:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 388AB1065693; Wed, 6 Jan 2010 11:03: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 F10FC1065679 for ; Wed, 6 Jan 2010 11:03:09 +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 DF2ED8FC13 for ; Wed, 6 Jan 2010 11:03: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 o06B39Em051700 for ; Wed, 6 Jan 2010 11:03:09 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06B396u051698 for perforce@freebsd.org; Wed, 6 Jan 2010 11:03:09 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 6 Jan 2010 11:03:09 GMT Message-Id: <201001061103.o06B396u051698@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 Precedence: bulk Cc: Subject: PERFORCE change 172651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 11:03:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=172651 Change 172651 by pgj@Binturong on 2010/01/06 11:03:08 MFen: 1.13 -> 1.14 hu/share/sgml/header.l10n.ent Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#17 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#17 (text+ko) ==== @@ -4,14 +4,14 @@ Oldaltérkép | - Jogi Megjegyzések | © 1995-2009 A &os; Projekt. + Jogi Megjegyzések | © 1995-2010 A &os; Projekt. Minden jog fenntartva.'> Kezdõlap   |   Kapcsolat   |   From owner-p4-projects@FreeBSD.ORG Wed Jan 6 12:25:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C69A1106568F; Wed, 6 Jan 2010 12:25:33 +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 716501065670 for ; Wed, 6 Jan 2010 12:25:33 +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 5D3048FC17 for ; Wed, 6 Jan 2010 12:25:33 +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 o06CPXsj058873 for ; Wed, 6 Jan 2010 12:25:33 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06CPWgt058871 for perforce@freebsd.org; Wed, 6 Jan 2010 12:25:32 GMT (envelope-from mav@freebsd.org) Date: Wed, 6 Jan 2010 12:25:32 GMT Message-Id: <201001061225.o06CPWgt058871@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 Precedence: bulk Cc: Subject: PERFORCE change 172653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 12:25:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=172653 Change 172653 by mav@mav_mavbook on 2010/01/06 12:24:58 IFC Affected files ... .. //depot/projects/scottl-camlock/src/COPYRIGHT#3 integrate .. //depot/projects/scottl-camlock/src/Makefile.inc1#12 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#22 integrate .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/error.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#10 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.c#9 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.h#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/expand.c#7 integrate .. //depot/projects/scottl-camlock/src/bin/sh/output.h#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#11 integrate .. //depot/projects/scottl-camlock/src/bin/sh/sh.1#8 integrate .. //depot/projects/scottl-camlock/src/crypto/heimdal/kcm/connect.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/devfs.rules#3 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#13 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/named#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/nsswitch#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#7 integrate .. //depot/projects/scottl-camlock/src/games/pom/pom.6#2 integrate .. //depot/projects/scottl-camlock/src/games/pom/pom.c#2 integrate .. //depot/projects/scottl-camlock/src/include/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/include/dirent.h#3 integrate .. //depot/projects/scottl-camlock/src/include/semaphore.h#1 branch .. //depot/projects/scottl-camlock/src/include/strings.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile.inc#4 integrate .. //depot/projects/scottl-camlock/src/lib/csu/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/arm/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/csu/mips/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/lib/libauditd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libautofs/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libbegemot/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libbsm/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libbz2/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#9 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_new.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/Makefile.inc#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/kqueue.2#4 integrate .. //depot/projects/scottl-camlock/src/lib/libcalendar/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libcam/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libcompat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libcrypt/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libdevinfo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libdevstat/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libdwarf/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libedit/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libexpat/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libftpio/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgeom/geom_getxml.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgpib/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libipsec/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libipx/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libjail/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libkiconv/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libkvm/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libmagic/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libmd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libmilter/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libmp/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libncp/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libngatm/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libopie/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/Makefile.inc#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_exec/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_krb5/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_radius/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_ssh/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpcap/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libproc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libradius/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/librt/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libsbuf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libsm/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libsmdb/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libsmutil/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libtacplus/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/pthread.map#4 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthread_db/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libufs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libugidfw/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libvgl/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libwrap/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/liby/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libypclnt/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libz/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/libexec/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/libexec/atrun/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/libexec/bootpd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/bootpd/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/libexec/bootpd/tools/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/libexec/comsat/comsat.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/fingerd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/getty/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/mail.local/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/mknetid/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/pppoed/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rbootd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/revnetgroup/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rstatd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rwalld/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.sprayd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rshd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/libexec/smrsh/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/talkd/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/libexec/tcpd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/tftp-proxy/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/tftpd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/libexec/ulog-helper/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/ypxfr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/release/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/cache/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/cache/gcache.8#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/core/geom.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/growfs/growfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/scottl-camlock/src/secure/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#7 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/security.7#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vm_page_bits.9#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#7 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-doc.dot#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.sys.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#29 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/DEFAULTS#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/econa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/files.econa#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/std.econa#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/timer.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/module.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/selector.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/bios.S#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.c#8 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.h#5 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot2.S#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/dinode.h#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/disk.c#5 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/fs.h#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/inode.h#4 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/io.c#7 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/quota.h#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_16550.S#4 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_8251.S#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/sys.c#6 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/table.c#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#13 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#18 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dcreg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/exca/excareg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/tdkphy.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txx.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/card_if.m#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_private.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xl/if_xl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#28 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#13 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#19 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/bus_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/nexus.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/bus.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_nfs4.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#39 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_compat.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_sem.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/DEFAULTS#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#30 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_dynamic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#11 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#22 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/DEFAULTS#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#24 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_lomac/mac_lomac.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/DEFAULTS#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#26 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#12 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psychovar.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/eeprom.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/DEFAULTS#6 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_semaphore.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_umtx.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/copyright.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/event.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#38 integrate .. //depot/projects/scottl-camlock/src/sys/sys/semaphore.h#3 delete .. //depot/projects/scottl-camlock/src/sys/sys/tty.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/umtx.h#14 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acct/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acct/regress.t#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/date/regress.sh#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/mv/regress.sh#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/builtin1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/command6.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/command6.0.stdout#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/command7.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/type2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/arith2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/cmdsubst1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/posixsem2/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/posixsem2/semtest.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/calendar/regress.sh#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/jot/regress.sh#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/lastcomm/values.sh#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/common.sh#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/test.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/multitest.t#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/apply/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/acpyacc.y#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/ar.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/at/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/at/at.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/atm/sscop/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/awk/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/banner/banner.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/biff/biff.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bluetooth/bthost/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bsdiff/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bzip2/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/catman/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/catman/catman.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/chkey/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/chpass/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/colldef/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/compile_et/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/compress/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/test/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpuset/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ctags/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ctags/ctags.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dig/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/du/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/elf2aout/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/elfdump/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/env/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/fetch/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/file2c/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/fstat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/fsync/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ftp/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gencat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getent/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gprof/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gprof/aout.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/head/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/hexdump/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/host/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/id/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ipcrm/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ipcs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/keylogin/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ktrace/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ktrdump/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lam/lam.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/last/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ldd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/leave/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/less/Makefile.common#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lex/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lex/flex.skl#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lex/initscan.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lex/lib/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/limits/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/locate/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/locate/locate/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lock/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/logger/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/login/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/login/login.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/login/login_fbtab.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/logins/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/logname/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/look/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lsvfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/m4/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mail/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/dir.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/dir.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/make.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/parse.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/makewhatis/makewhatis.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/minigzip/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mkfifo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mklocale/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mkstr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mkuzip/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/msgs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ncplist/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/newkey/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nfsstat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nohup/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nslookup/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nsupdate/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/opieinfo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/opiekey/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/opiepasswd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/passwd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/passwd/passwd.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/pr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/printf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/procstat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/renice/renice.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/revoke/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rlogin/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_hout.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rsh/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rup/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ruptime/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rusers/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rwho/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/script/script.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sed/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/showmount/showmount.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/smbutil/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sockstat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sockstat/sockstat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/su/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tail/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tail/misc.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/test/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tcopy/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tcopy/tcopy.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/telnet/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tftp/tftp.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/time/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/top/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/syscalls.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unzip/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uudecode/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uuencode/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/vacation/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/vgrind/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/vi/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/vmstat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/whereis/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/write/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xargs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xinstall/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xlint/xlint/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xlint/xlint/xlint.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/yacc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/yacc/skeleton.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ypcat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ypmatch/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ypwhich/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ac/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/accton/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/accton/accton.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpiconf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/iasl/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/amd/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ancontrol/ancontrol.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apm/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/arp/arp.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/asf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/asf/asf_kld.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/audit/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/auditd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/auditreduce/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/authpf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/boot0cfg/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bootparamd/Makefile.inc#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/btxld/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/burncd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cdcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cdcontrol/cdcontrol.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/chkgrp/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/chown/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/chroot/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/chroot/chroot.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/config/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cpucontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cron/cron/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/crunch/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_rmail/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/daemon/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/dconschat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/devinfo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/digictl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/diskinfo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-dsfromkey/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-keyfromlabel/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-keygen/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-signzone/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/dumpcis/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/editmap/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/edquota/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/eeprom/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/extattr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/extattrctl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/extattrctl/extattrctl.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/faithd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/faithd/faithd.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fdcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fdformat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fdread/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fdwrite/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ftp-proxy/libevent/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/getfmac/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/getpmac/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/inetd/inetd.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/iostat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ip6addrctl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ipfwpcap/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jail/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jexec/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jls/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/kbdcontrol/kbdcontrol.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/kernbb/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lmcconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/common_source/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/common_source/lp.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/common_source/rmjob.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/filters.ru/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lpc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lpd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lpr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lptcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mailstats/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mailwrapper/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/makemap/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/memcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mixer/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mld6query/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mlxcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mount_portalfs/mount_portalfs.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/moused/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mptable/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mtree/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/named-checkconf/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/named-checkzone/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/named/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ndiscvt/ndiscvt.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ndp/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nghook/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nscd/nscd.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ntp/Makefile.inc#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ntp/doc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nvram/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ofwdump/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcannotate/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmccontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pnpinfo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/portsnap/make_index/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/portsnap/phttpget/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/powerd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pppctl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/praliases/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/praudit/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/procctl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pstat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pwd_mkdb/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/quotaon/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/repquota/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rip6query/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rip6query/rip6query.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rmt/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rmt/rmt.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rndc-confgen/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rndc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/route6d/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.lockd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.statd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.umntall/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.yppasswdd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.ypupdated/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpc.ypxfrd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpcbind/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rrenumd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtadvd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtprio/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/probe.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sa/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sendmail/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/setfmac/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/setpmac/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/smbmsg/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/snapinfo/snapinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/disks.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/label.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tcpdrop/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tcpdump/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/traceroute/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/traceroute6/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tzsetup/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/uathload/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbdevs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/vipw/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.8#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/watchdogd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wlandebug/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wlconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/yp_mkdb/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypbind/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/yppoll/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/yppush/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/yppush/yppush_main.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypset/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/zic/zic/Makefile#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/COPYRIGHT#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.12 2009/12/31 10:00:37 obrien Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/scottl-camlock/src/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.635 2009/12/16 02:54:34 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.636 2009/12/31 00:07:26 ed Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -940,6 +940,11 @@ _sed= usr.bin/sed .endif +.if ${BOOTSTRAPPING} < 900006 +_lex= usr.bin/lex +_yacc= usr.bin/yacc +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -966,6 +971,8 @@ ${_mklocale} \ usr.bin/rpcgen \ ${_sed} \ + ${_lex} \ + ${_yacc} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.216 2009/12/29 20:20:51 trasz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.218 2010/01/05 02:37:59 davidxu 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. # +# 20100105: new userland semaphore implementation +OLD_FILES+=usr/include/sys/semaphore.h +# 20100103: ntptrace(8) removed +OLD_FILES+=usr/sbin/ntptrace +OLD_FILES+=usr/share/man/man8/ntptrace.8.gz # 20091229: remove no longer relevant examples OLD_FILES+=usr/share/examples/pppd/auth-down.sample OLD_FILES+=usr/share/examples/pppd/auth-up.sample ==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.5 2009/12/28 22:56:30 antoine Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.7 2010/01/04 10:50:17 obrien Exp $"); #include #include @@ -671,8 +671,19 @@ li->li_number = -1; /* any jail */ break; case LT_TTY: - usage(); - /* NOTREACHED */ + if (li->li_number < 0) + errx(STATUS_BADUSAGE, + "Negative /dev/pts tty `%s'", sp); + snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s", + sp); + if (stat(buf, &st) != -1) + goto foundtty; + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `" + _PATH_DEV "pts/%s'", sp); + err(STATUS_ERROR, "Cannot access `" + _PATH_DEV "pts/%s'", sp); + break; default: break; } ==== //depot/projects/scottl-camlock/src/bin/sh/error.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.28 2009/12/24 20:55:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.29 2010/01/01 18:17:46 jilles Exp $"); /* * Errors and exceptions. @@ -160,8 +160,8 @@ #endif if (msg) { if (commandname) - outfmt(&errout, "%s: ", commandname); - doformat(&errout, msg, ap); + outfmt(out2, "%s: ", commandname); + doformat(out2, msg, ap); out2c('\n'); } flushall(); ==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.71 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.75 2010/01/03 15:01:38 jilles Exp $"); #include #include @@ -646,7 +646,7 @@ out2str(ps4val()); for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); p = sp->text; while (*p != '=' && *p != '\0') out2c(*p++); @@ -658,7 +658,7 @@ } for (sp = arglist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); /* Disambiguate command looking like assignment. */ if (sp == arglist.list && strchr(sp->text, '=') != NULL && @@ -670,7 +670,7 @@ out2qstr(sp->text); sep = ' '; } - outc('\n', &errout); + out2c('\n'); flushout(&errout); } @@ -722,10 +722,10 @@ break; if ((cmdentry.u.index = find_builtin(*argv, &cmdentry.special)) < 0) { - outfmt(&errout, "%s: not found\n", *argv); - exitstatus = 127; - flushout(&errout); - return; + cmdentry.u.index = BLTINCMD; + argv--; + argc++; + break; } if (cmdentry.u.index != BLTINCMD) break; @@ -792,20 +792,20 @@ unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; + funcnest--; handler = savehandler; longjmp(handler->loc, 1); } handler = &jmploc; + funcnest++; INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); - funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); else evaltree(getfuncnode(cmdentry.u.func), 0); - funcnest--; INTOFF; unreffunc(cmdentry.u.func); poplocalvars(); @@ -813,6 +813,7 @@ freeparam(&shellparam); shellparam = saveparam; handler = savehandler; + funcnest--; popredir(); INTON; if (evalskip == SKIPFUNC) { @@ -831,6 +832,7 @@ memout.nextc = memout.buf; memout.bufsize = 64; mode |= REDIR_BACKQ; + cmdentry.special = 0; } savecmdname = commandname; savetopfile = getcurrentfile(); @@ -864,20 +866,21 @@ } } handler = savehandler; + if (flags == EV_BACKCMD) { + backcmd->buf = memout.buf; + backcmd->nleft = memout.nextc - memout.buf; + memout.buf = NULL; + } if (e != -1) { if ((e != EXERROR && e != EXEXEC) || cmdentry.special) exraise(e); popfilesupto(savetopfile); - FORCEINTON; + if (flags != EV_BACKCMD) + FORCEINTON; } if (cmdentry.u.index != EXECCMD) popredir(); - if (flags == EV_BACKCMD) { - backcmd->buf = memout.buf; - backcmd->nleft = memout.nextc - memout.buf; - memout.buf = NULL; - } } else { #ifdef DEBUG trputs("normal command: "); trargs(argv); @@ -942,12 +945,17 @@ */ /* - * No command given, or a bltin command with no arguments. + * No command given, a bltin command with no arguments, or a bltin command + * with an invalid name. */ int -bltincmd(int argc __unused, char **argv __unused) +bltincmd(int argc, char **argv) { + if (argc > 1) { + out2fmt_flush("%s: not found\n", argv[1]); + return 127; + } /* * Preserve exitstatus of a previous possible redirection >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 6 17:41:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 218231065695; Wed, 6 Jan 2010 17:41: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 D93471065739 for ; Wed, 6 Jan 2010 17:41: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 7972D8FC2C for ; Wed, 6 Jan 2010 17:41: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 o06Hfp0e008113 for ; Wed, 6 Jan 2010 17:41:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06HfpNf008111 for perforce@freebsd.org; Wed, 6 Jan 2010 17:41:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 6 Jan 2010 17:41:51 GMT Message-Id: <201001061741.o06HfpNf008111@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 Precedence: bulk Cc: Subject: PERFORCE change 172665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 17:41:52 -0000 http://p4web.freebsd.org/chv.cgi?CH=172665 Change 172665 by hselasky@hselasky_laptop001 on 2010/01/06 17:41:26 usbconfig: - Allow specifying unit and address like a coordinate, optionally prefixed by "ugen". - Refactor string dumping code. - Idea by "Warren Block". - Patch by HPS. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#17 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#9 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#8 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#19 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#17 (text+ko) ==== @@ -365,3 +365,40 @@ } return; } + +void +dump_string_by_index(struct libusb20_device *pdev, uint8_t str_index) +{ + char *pbuf; + uint8_t n; + uint8_t len; + + pbuf = malloc(256); + if (pbuf == NULL) + err(1, "out of memory"); + + if (str_index == 0) { + /* language table */ + if (libusb20_dev_req_string_sync(pdev, + str_index, 0, pbuf, 256)) { + printf("STRING_0x%02x = \n", str_index); + } else { + printf("STRING_0x%02x = ", str_index); + len = (uint8_t)pbuf[0]; + for (n = 0; n != len; n++) { + printf("0x%02x%s", (uint8_t)pbuf[n], + (n != (len-1)) ? ", " : ""); + } + printf("\n"); + } + } else { + /* ordinary string */ + if (libusb20_dev_req_string_simple_sync(pdev, + str_index, pbuf, 256)) { + printf("STRING_0x%02x = \n", str_index); + } else { + printf("STRING_0x%02x = <%s>\n", str_index, pbuf); + } + } + free(pbuf); +} ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#9 (text+ko) ==== @@ -24,11 +24,17 @@ * SUCH DAMAGE. */ +#ifndef _DUMP_H_ +#define _DUMP_H_ + const char *dump_mode(uint8_t value); const char *dump_speed(uint8_t value); const char *dump_power_mode(uint8_t value); +void dump_string_by_index(struct libusb20_device *pdev, uint8_t index); void dump_device_info(struct libusb20_device *pdev, uint8_t show_drv); void dump_be_quirk_names(struct libusb20_backend *pbe); void dump_be_dev_quirks(struct libusb20_backend *pbe); void dump_device_desc(struct libusb20_device *pdev); void dump_config(struct libusb20_device *pdev, uint8_t all_cfg); + +#endif /* _DUMP_H_ */ ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#8 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $FreeBSD: src/usr.sbin/usbconfig/usbconfig.8,v 1.3 2009/11/01 11:39:07 brueffer Exp $ .\" -.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +.\" Copyright (c) 2008-2010 Hans Petter Selasky. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 1, 2009 +.Dd January 6, 2010 .Dt USBCONFIG 8 .Os .Sh NAME @@ -34,6 +34,9 @@ .Op Fl u Ar unit .Op Fl a Ar addr .Op cmds... +.Nm +.Op Fl d Ar [ugen]. +.Op cmds... .Sh DESCRIPTION The .Nm @@ -46,6 +49,9 @@ .It Fl a Ar addr Limit device range to the given USB device index. Should only be used in conjunction with the unit argument. +.It Fl d Ar [ugen]. +Limit device range to USB devices connected to the given unit and address. +The unit and address coordinates may be prefixed by the lowercased word "ugen". .It Fl h Show help and available commands. .El @@ -57,5 +63,34 @@ Show information about the device on USB bus 1 at address 2: .Pp .Dl usbconfig -u 1 -a 2 dump_info +.Pp +Dump HID descriptor for device on USB bus 1 at address 2: +.Pp +.Dl usbconfig -u 1 -a 2 do_request 0x81 0x06 0x2200 0 0x100 +.Pp +Dump string descriptor at index Z for device on USB bus 1 at address 2: +.Pp +.Dl usbconfig -u 1 -a 2 dump_string Z +.Pp +Dump current configuration descriptor for device on USB bus 1 at address 2: +.Pp +.Dl usbconfig -u 1 -a 2 dump_curr_config_desc +.Pp +Dump device descriptor for device on USB bus 1 at address 2: +.Pp +.Dl usbconfig -u 1 -a 2 dump_device_desc +.Pp +Program the device on USB bus 1 at address 2 to suspend, resume, power off, go into power save, or power on: +.Pp +.Dl usbconfig -u 1 -a 2 suspend +.Dl usbconfig -u 1 -a 2 resume +.Dl usbconfig -u 1 -a 2 power_off +.Dl usbconfig -u 1 -a 2 power_save +.Dl usbconfig -u 1 -a 2 power_on +.Pp +Display a list of available quirk names: +.Pp +.Dl usbconfig dump_quirk_names +.Pp .Sh SEE ALSO .Xr usb 4 ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#19 (text+ko) ==== @@ -96,6 +96,7 @@ enum { T_UNIT, T_ADDR, + T_UGEN, T_IFACE, T_SET_CONFIG, T_SET_ALT, @@ -128,6 +129,7 @@ static const struct token token[] = { {"-u", T_UNIT, 1}, {"-a", T_ADDR, 1}, + {"-d", T_UGEN, 1}, {"-i", T_IFACE, 1}, {"set_config", T_SET_CONFIG, 1}, {"set_alt", T_SET_ALT, 1}, @@ -266,6 +268,7 @@ printf("" "usbconfig - configure the USB subsystem" "\n" "usage: usbconfig -u -a -i [cmds...]" "\n" + "usage: usbconfig -d [ugen]. -i [cmds...]" "\n" "commands:" "\n" " set_config " "\n" " set_alt " "\n" @@ -402,21 +405,7 @@ err(1, "could not open device"); } if (opt->got_dump_string) { - char *pbuf; - - pbuf = malloc(256); - if (pbuf == NULL) { - err(1, "out of memory"); - } - if (libusb20_dev_req_string_simple_sync(pdev, - opt->string_index, pbuf, 256)) { - printf("STRING_0x%02x = \n", - opt->string_index); - } else { - printf("STRING_0x%02x = <%s>\n", - opt->string_index, pbuf); - } - free(pbuf); + dump_string_by_index(pdev, opt->string_index); } if (opt->got_do_request) { uint16_t actlen; @@ -539,6 +528,9 @@ { struct libusb20_backend *pbe; struct options *opt = &options; + const char *ptr; + int unit; + int addr; int n; int t; @@ -625,6 +617,33 @@ opt->got_show_iface_driver = 1; break; + case T_UGEN: + if (opt->got_any) { + /* allow multiple commands on the same line */ + flush_command(pbe, opt); + } + ptr = argv[n + 1]; + + if ((ptr[0] == 'u') && + (ptr[1] == 'g') && + (ptr[2] == 'e') && + (ptr[3] == 'n')) + ptr += 4; + + if ((sscanf(ptr, "%d.%d", + &unit, &addr) != 2) || + (unit < 0) || (unit > 65535) || + (addr < 0) || (addr > 65535)) { + errx(1, "cannot " + "parse '%s'", argv[n + 1]); + } + opt->bus = unit; + opt->addr = addr; + opt->got_bus = 1; +; opt->got_addr = 1; + n++; + break; + case T_UNIT: if (opt->got_any) { /* allow multiple commands on the same line */ @@ -699,9 +718,8 @@ opt->got_any++; break; case T_DUMP_STRING: - if (opt->got_dump_string) { - flush_command(pbe, opt); - } + if (opt->got_dump_string) + duplicate_option(argv[n]); opt->string_index = num_id(argv[n + 1], "str_index"); opt->got_dump_string = 1; opt->got_any++; @@ -750,9 +768,8 @@ opt->got_any++; break; case T_DO_REQUEST: - if (opt->got_do_request) { - flush_command(pbe, opt); - } + if (opt->got_do_request) + duplicate_option(argv[n]); LIBUSB20_INIT(LIBUSB20_CONTROL_SETUP, &opt->setup); opt->setup.bmRequestType = num_id(argv[n + 1], "bmReqTyp"); opt->setup.bRequest = num_id(argv[n + 2], "bReq"); From owner-p4-projects@FreeBSD.ORG Wed Jan 6 18:10:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 795E910656A3; Wed, 6 Jan 2010 18:10:20 +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 3E5A11065697 for ; Wed, 6 Jan 2010 18:10:20 +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 2BECE8FC17 for ; Wed, 6 Jan 2010 18:10:20 +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 o06IAKXT011212 for ; Wed, 6 Jan 2010 18:10:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06IAKVw011210 for perforce@freebsd.org; Wed, 6 Jan 2010 18:10:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 6 Jan 2010 18:10:20 GMT Message-Id: <201001061810.o06IAKVw011210@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 Precedence: bulk Cc: Subject: PERFORCE change 172667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 18:10:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=172667 Change 172667 by hselasky@hselasky_laptop001 on 2010/01/06 18:09:37 USB core: - fix a parameter passing - "scratch_size" is incorrectly passed as language ID when retrieving the language ID table. - might fix retrieval of string descriptions - reported by Renato Botelho - patch by HPS Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#61 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#61 (text+ko) ==== @@ -1691,8 +1691,7 @@ udev->ddesc.iSerialNumber) { /* read out the language ID string */ err = usbd_req_get_string_desc(udev, NULL, - (char *)scratch_ptr, 4, scratch_size, - USB_LANGUAGE_TABLE); + (char *)scratch_ptr, 4, 0, USB_LANGUAGE_TABLE); } else { err = USB_ERR_INVAL; } From owner-p4-projects@FreeBSD.ORG Wed Jan 6 21:54:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ED061065704; Wed, 6 Jan 2010 21:54: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 02BEE1065700 for ; Wed, 6 Jan 2010 21:54:05 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3E2C8FC17 for ; Wed, 6 Jan 2010 21:54: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 o06Ls49G041403 for ; Wed, 6 Jan 2010 21:54:04 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06Ls4rA041401 for perforce@freebsd.org; Wed, 6 Jan 2010 21:54:04 GMT (envelope-from raj@freebsd.org) Date: Wed, 6 Jan 2010 21:54:04 GMT Message-Id: <201001062154.o06Ls4rA041401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 21:54:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=172675 Change 172675 by raj@raj_fdt on 2010/01/06 21:53:13 Refactor simplebus and MPC85XX definitions. - Merge sys/powerpc/include/ocpbus.h into mpc85xx.h (this is the first step towards recycling ocbush.h) - Factor out a fdt_common.c from simplebus.c so that routines could be used by other FDT drivers as well (the upcoming LBC rework) - Imrove fdtbus driver a bit. - Temporarily disconnect LBC driver from the build. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#10 edit .. //depot/projects/fdt/sys/powerpc/booke/machdep.c#4 edit .. //depot/projects/fdt/sys/powerpc/booke/platform_bare.c#2 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/atpic.c#2 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdt_common.c#1 add .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdt_common.h#1 add .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdtbus.c#4 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/i2c.c#3 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#2 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/ocpbus.c#2 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/simplebus.c#5 edit Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#10 (text+ko) ==== @@ -119,10 +119,11 @@ powerpc/mpc85xx/atpic.c optional mpc85xx isa powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553 mpc85xx powerpc/mpc85xx/ds1553_core.c optional ds1553 +powerpc/mpc85xx/fdt_common.c optional fdt powerpc/mpc85xx/fdtbus.c optional fdt powerpc/mpc85xx/i2c.c optional iicbus fdt powerpc/mpc85xx/isa.c optional mpc85xx isa -powerpc/mpc85xx/lbc.c optional mpc85xx +#powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx ==== //depot/projects/fdt/sys/powerpc/booke/machdep.c#4 (text+ko) ==== @@ -137,7 +137,6 @@ #include -#include #include #ifdef DDB ==== //depot/projects/fdt/sys/powerpc/booke/platform_bare.c#2 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include -#include #include "platform_if.h" ==== //depot/projects/fdt/sys/powerpc/mpc85xx/atpic.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include -#include +#include #include ==== //depot/projects/fdt/sys/powerpc/mpc85xx/fdtbus.c#4 (text+ko) ==== @@ -43,6 +43,7 @@ #include +#include "fdt_common.h" #include "ofw_bus_if.h" #define DEBUG @@ -60,10 +61,14 @@ extern struct bus_space bs_be_tag; struct fdtbus_devinfo { - phandle_t di_node; - const char *di_name; - const char *di_type; - const char *di_compat; + phandle_t di_node; + char *di_name; + char *di_type; + char *di_compat; + struct resource_list di_res; + + /* Interrupts sense-level info for this device */ + struct sense_level di_intr_sl[DI_MAX_INTR_NUM]; }; struct fdtbus_softc { @@ -77,6 +82,7 @@ static int fdtbus_probe(device_t); static int fdtbus_attach(device_t); +static int fdtbus_print_child(device_t, device_t); static struct resource *fdtbus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); static int fdtbus_release_resource(device_t, device_t, int, int, @@ -113,6 +119,7 @@ DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ + DEVMETHOD(bus_print_child, fdtbus_print_child), DEVMETHOD(bus_alloc_resource, fdtbus_alloc_resource), DEVMETHOD(bus_release_resource, fdtbus_release_resource), DEVMETHOD(bus_activate_resource, fdtbus_activate_resource), @@ -143,7 +150,7 @@ fdtbus_probe(device_t dev) { - device_set_desc(dev, "FDTbus"); + device_set_desc(dev, "FDT main bus"); if (!bootverbose) device_quiet(dev); return (BUS_PROBE_DEFAULT); @@ -203,8 +210,6 @@ return (error); } - debugf("rmans initialized\n"); - /* * Walk the FDT root node and add top-level devices as our children. */ @@ -214,6 +219,16 @@ return (bus_generic_attach(dev)); } +static int +fdtbus_print_child(device_t bus, device_t child) +{ + int rv; + + rv = bus_print_child_header(bus, child); + rv += printf("\n"); + return (rv); +} + /* * These FDT nodes do not need a corresponding newbus device object. */ @@ -223,6 +238,21 @@ NULL }; +static void +newbus_device_destroy(device_t dev) +{ + struct fdtbus_devinfo *di; + + di = device_get_ivars(dev); + + free(di->di_name, M_OFWPROP); + free(di->di_type, M_OFWPROP); + free(di->di_compat, M_OFWPROP); + + resource_list_free(&di->di_res); + free(di, M_FDTBUS); +} + static device_t newbus_device_from_fdt_node(device_t parent, phandle_t node) { @@ -249,8 +279,33 @@ di->di_name = name; di->di_type = type; di->di_compat = compat; - device_set_ivars(child, di); - debugf("added child name='%s', node=%p\n", name, (void *)node); + + resource_list_init(&di->di_res); + + /* + * XXX this 0x1ef00000 offset is a gross hack, which assumes: + * - physical addresses in the DTS are 0xe0000000 range, and + * - virtual CCSR base in kernel is 0xfef00000 + */ + if (fdt_reg_to_rl(node, &di->di_res, 0x1ef00000)) { + device_printf(child, "could not process 'reg' " + "property\n"); + newbus_device_destroy(child); + child = NULL; + } + + if (fdt_intr_to_rl(node, &di->di_res, di->di_intr_sl)) { + device_printf(child, "could not process 'interrupts' " + "property\n"); + newbus_device_destroy(child); + child = NULL; + } + + if (child != NULL) { + device_set_ivars(child, di); + debugf("added child name='%s', node=%p\n", name, + (void *)node); + } } else { free(name, M_OFWPROP); free(type, M_OFWPROP); @@ -267,8 +322,32 @@ struct fdtbus_softc *sc; struct resource *res; struct rman *rm; + struct fdtbus_devinfo *di; + struct resource_list_entry *rle; int needactivate; + /* + * Request for the default allocation with a given rid: use resource + * list stored in the local device info. + */ + if ((start == 0UL) && (end == ~0UL)) { + if ((di = device_get_ivars(child)) == NULL) + return (NULL); + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + + rle = resource_list_find(&di->di_res, type, *rid); + if (rle == NULL) { + device_printf(bus, "no default resources for " + "rid = %d, type = %d\n", *rid, type); + return (NULL); + } + start = rle->start; + end = rle->end; + count = rle->count; + } + sc = device_get_softc(bus); needactivate = flags & RF_ACTIVE; ==== //depot/projects/fdt/sys/powerpc/mpc85xx/i2c.c#3 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include -#include #include #include ==== //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (C) 2008 Semihalf, Rafal Jaworowski + * Copyright 2006 by Juniper Networks. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,6 +30,109 @@ #ifndef _MPC85XX_H_ #define _MPC85XX_H_ +/* + * Configuration control and status registers + */ +#define OCP85XX_CCSRBAR (CCSRBAR_VA + 0x0) +#define OCP85XX_BPTR (CCSRBAR_VA + 0x20) + +/* + * E500 Coherency Module registers + */ +#define OCP85XX_EEBPCR (CCSRBAR_VA + 0x1010) + +/* + * Local access registers + */ +#define OCP85XX_LAWBAR(n) (CCSRBAR_VA + 0xc08 + 0x20 * (n)) +#define OCP85XX_LAWSR(n) (CCSRBAR_VA + 0xc10 + 0x20 * (n)) + +#define OCP85XX_TGTIF_PCI0 2 +#define OCP85XX_TGTIF_PCI1 1 +#define OCP85XX_TGTIF_PCI2 0 +#if 0 +#define OCP85XX_TGTIF_PCI0 0 +#define OCP85XX_TGTIF_PCI1 1 +#define OCP85XX_TGTIF_PCI2 2 +#endif + +#define OCP85XX_TGTIF_LBC 4 +#define OCP85XX_TGTIF_RAM_INTL 11 +#define OCP85XX_TGTIF_RIO 12 +#define OCP85XX_TGTIF_RAM1 15 +#define OCP85XX_TGTIF_RAM2 22 + +/* + * L2 cache registers + */ +#define OCP85XX_L2CTL (CCSRBAR_VA + 0x20000) + +/* + * Power-On Reset configuration + */ +#define OCP85XX_PORDEVSR (CCSRBAR_VA + 0xe000c) +#define OCP85XX_PORDEVSR_IO_SEL 0x00780000 +#define OCP85XX_PORDEVSR_IO_SEL_SHIFT 19 + +#define OCP85XX_PORDEVSR2 (CCSRBAR_VA + 0xe0014) + +#define OCP85XX_DEVDISR (CCSRBAR_VA + 0xe0070) +#define OCP85XX_DEVDISR_PCIE0 0x20000000 +#define OCP85XX_DEVDISR_PCIE1 0x04000000 +#define OCP85XX_DEVDISR_PCIE2 0x02000000 + +/* + * Status Registers. + */ +#define OCP85XX_RSTCR (CCSRBAR_VA + 0xe00b0) + +/* + * OCP Bus Definitions + */ +#define OCP85XX_I2C0_OFF 0x03000 +#define OCP85XX_I2C1_OFF 0x03100 +#define OCP85XX_I2C_SIZE 0x16 +#define OCP85XX_UART0_OFF 0x04500 +#define OCP85XX_UART1_OFF 0x04600 +#define OCP85XX_UART_SIZE 0x10 +#define OCP85XX_LBC_OFF 0x05000 +#define OCP85XX_LBC_SIZE 0x1000 + +#define OCP85XX_PCI0_OFF 0x0A000 +#define OCP85XX_PCI1_OFF 0x09000 +#define OCP85XX_PCI2_OFF 0x08000 +#if 0 +#define OCP85XX_PCI0_OFF 0x08000 +#define OCP85XX_PCI1_OFF 0x09000 +#define OCP85XX_PCI2_OFF 0x0A000 +#endif + +#define OCP85XX_PCI_SIZE 0x1000 +#define OCP85XX_TSEC0_OFF 0x24000 +#define OCP85XX_TSEC1_OFF 0x25000 +#define OCP85XX_TSEC2_OFF 0x26000 +#define OCP85XX_TSEC3_OFF 0x27000 +#define OCP85XX_TSEC_SIZE 0x1000 +#define OCP85XX_OPENPIC_OFF 0x40000 +#define OCP85XX_OPENPIC_SIZE 0x200B4 +#define OCP85XX_QUICC_OFF 0x80000 +#define OCP85XX_QUICC_SIZE 0x20000 +#define OCP85XX_SEC_OFF 0x30000 +#define OCP85XX_SEC_SIZE 0x10000 + +/* + * PIC definitions + */ +#define ISA_IRQ_START 0 +#define PIC_IRQ_START (ISA_IRQ_START + 16) + +#define ISA_IRQ(n) (ISA_IRQ_START + (n)) +#define PIC_IRQ_EXT(n) (PIC_IRQ_START + (n)) +#define PIC_IRQ_INT(n) (PIC_IRQ_START + 16 + (n)) + +/* + * Prototypes. + */ uint32_t ccsr_read4(uintptr_t addr); void ccsr_write4(uintptr_t addr, uint32_t val); int law_enable(int trgt, u_long addr, u_long size); ==== //depot/projects/fdt/sys/powerpc/mpc85xx/ocpbus.c#2 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include -#include #include #include "pic_if.h" ==== //depot/projects/fdt/sys/powerpc/mpc85xx/simplebus.c#5 (text+ko) ==== @@ -48,7 +48,7 @@ #include "ofw_bus_if.h" -#include "../../contrib/dtc/libfdt/libfdt_env.h" +#include "fdt_common.h" #define DEBUG #undef DEBUG @@ -70,27 +70,14 @@ u_long sc_size; }; -struct sense_level { - enum intr_trigger trig; - enum intr_polarity pol; -}; - -#define DI_MAX_INTR_NUM 8 - struct simplebus_devinfo { struct ofw_bus_devinfo di_ofw; struct resource_list di_res; - /* Interrupt-parent phandle */ - phandle_t di_intr_par; - int di_intr_cells; - /* Interrupts sense-level info for this device */ struct sense_level di_intr_sl[DI_MAX_INTR_NUM]; - int di_intr_num; }; - /* * Prototypes. */ @@ -155,371 +142,30 @@ { if (ofw_bus_is_compatible(dev, "simple-bus")) { - device_set_desc(dev, "Flattened Device Tree simple bus"); + device_set_desc(dev, "Flattened device tree simple bus"); return (BUS_PROBE_DEFAULT); } return (ENXIO); } -static int -fdt_parent_addr_cells(phandle_t node) -{ - pcell_t addr_cells; - - /* Find out #address-cells of the superior bus. */ - if (OF_searchprop(node, "#address-cells", &addr_cells, - sizeof(addr_cells)) <= 0) - addr_cells = 1; - - return ((int)addr_cells); -} - -static void -fdt_ranges_dump(pcell_t *ranges, int tuples, int par_addr_cells, - int this_addr_cells, int this_size_cells) -{ -#ifdef DEBUG - int i, n; - - for (i = 0; i < tuples; i++) { - printf("par addr = "); - for (n = 0; n < par_addr_cells; n++) - printf("%x ", ranges[n]); - printf("\n"); - - printf("this addr = "); - for (; n < par_addr_cells + this_addr_cells; n++) - printf("%x ", ranges[n]); - printf("\n"); - - printf("this size = "); - for (; n < par_addr_cells + this_addr_cells + this_size_cells; - n++) - printf("%x ", ranges[n]); - printf("\n"); - } -#endif -} - -static int -fdt_data_verify(void *data, int cells) -{ - uint64_t d64; - - if (cells > 1) { - d64 = fdt64_to_cpu(*((uint64_t *)data)); - if (((d64 > 32) & 0xffffffffull) != 0) - return (ERANGE); - } - - return (0); -} - -static u_long -fdt_data_get(void *data, int cells) -{ - - if (cells == 1) - return (fdt32_to_cpu(*((uint32_t *)data))); - - return (fdt64_to_cpu(*((uint64_t *)data))); -} - -static int -fdt_ranges_verify(pcell_t *ranges, int tuples, int par_addr_cells, - int this_addr_cells, int this_size_cells) -{ - int i, rv, ulsz; - - if (par_addr_cells > 2 || this_addr_cells > 2 || this_size_cells > 2) - return (ERANGE); - - /* - * This is the max size the resource manager can handle for addresses - * and sizes. - */ - ulsz = sizeof(u_long); - if (par_addr_cells <= ulsz && this_addr_cells <= ulsz && - this_size_cells <= ulsz) - /* We can handle everything */ - return (0); - - rv = 0; - for (i = 0; i < tuples; i++) { - - if (fdt_data_verify((void *)ranges, par_addr_cells)) - goto err; - ranges += par_addr_cells; - - if (fdt_data_verify((void *)ranges, this_addr_cells)) - goto err; - ranges += this_addr_cells; - - if (fdt_data_verify((void *)ranges, this_size_cells)) - goto err; - ranges += this_size_cells; - } - - return (0); - -err: - printf("using address range >%d-bit not supported\n", ulsz * 8); - return (ERANGE); -} - -static int -simplebus_add_reg(phandle_t node, struct simplebus_devinfo *di, - struct simplebus_softc *sc) -{ - pcell_t *reg; - u_long start, end, count; - int tuple_size, tuples; - int i; - - /* XXX free reg prop? */ - tuple_size = sizeof(pcell_t) * (sc->sc_addr_cells + sc->sc_size_cells); - tuples = OF_getprop_alloc(node, "reg", tuple_size, (void **)®); - if (tuples <= 0) - /* No 'reg' property in this node. */ - return (0); - - for (i = 0; i < tuples; i++) { - /* Address portion. */ - if (fdt_data_verify((void *)reg, sc->sc_addr_cells)) { - debugf("tuple #%d: unsupported addr value in 'reg' " - "property\n", i); - goto err; - } - start = fdt_data_get((void *)reg, sc->sc_addr_cells); - reg += sc->sc_addr_cells; - - /* Size portion. */ - if (fdt_data_verify((void *)reg, sc->sc_size_cells)) { - debugf("tuple #%d: unsupported size value in 'reg' " - "property\n", i); - goto err; - } - count = fdt_data_get((void *)reg, sc->sc_size_cells); - reg += sc->sc_size_cells; - - /* Calculate address range relative to simple-bus VA base. */ - start = sc->sc_start_va + start; - end = start + count - 1; - - debugf("reg addr start = %lx, end = %lx, count = %lx\n", start, - end, count); - - if (end > sc->sc_start_va + sc->sc_size) { - debugf("end out of simple-bus range: %lx\n", end); - goto err; - } - - resource_list_add(&di->di_res, SYS_RES_MEMORY, i, start, end, - count); - } - return (0); - -err: - resource_list_free(&di->di_res); - return (ERANGE); -} - -static int -fdt_pic_decode_iic(phandle_t node, pcell_t *intr, int intr_cells, - int *interrupt, int *trig, int *pol) -{ - - /* TODO */ - return (ENXIO); -} - -static int -fdt_pic_decode_openpic(phandle_t node, pcell_t *intr, int intr_cells, - int *interrupt, int *trig, int *pol) -{ - char *compat; - ssize_t prop_len; - int rv; - - prop_len = OF_getprop_alloc(node, "compatible", 1, (void **)&compat); - if (prop_len <= 0) - return (ENXIO); - - rv = 0; - if (strncmp("open-pic", compat, 8) < 0) { - rv = ENXIO; - goto out; - } - - /* - * XXX The interrupt number read out from the device tree is already - * offset by 16 to reflect the 'internal' IRQ range shift on the - * OpenPIC. We still however need to account for the ISA IRQ block, - * potentially in use as well. - */ - *interrupt = ISA_IRQ_COUNT + intr[0]; - - if (intr_cells == 2) - switch (intr[1]) { - case 0: - /* L to H edge */ - *trig = INTR_TRIGGER_EDGE; - *pol = INTR_POLARITY_HIGH; - break; - case 1: - /* Active L level */ - *trig = INTR_TRIGGER_LEVEL; - *pol = INTR_POLARITY_LOW; - break; - case 2: - /* Active H level */ - *trig = INTR_TRIGGER_LEVEL; - *pol = INTR_POLARITY_HIGH; - break; - case 3: - /* H to L edge */ - *trig = INTR_TRIGGER_EDGE; - *pol = INTR_POLARITY_LOW; - break; - default: - *trig = INTR_TRIGGER_CONFORM; - *pol = INTR_POLARITY_CONFORM; - } - else { - *trig = INTR_TRIGGER_CONFORM; - *pol = INTR_POLARITY_CONFORM; - } - -out: - free(compat, M_OFWPROP); - return (rv); -} - -typedef int (*fdt_pic_decode_t)(phandle_t, pcell_t *, int, int *, int *, - int *); - -static fdt_pic_decode_t fdt_pic_table[] = { - &fdt_pic_decode_iic, - &fdt_pic_decode_openpic, - NULL -}; - -static int -fdt_intr_decode(struct simplebus_devinfo *di, pcell_t *intr, - int *interrupt, int *trig, int *pol) -{ - fdt_pic_decode_t intr_decode; - int i, rv; - - for (i = 0; fdt_pic_table[i] != NULL; i++) { - - /* XXX check if pic_handle has interrupt-controller prop? */ - - intr_decode = fdt_pic_table[i]; - rv = intr_decode(di->di_intr_par, intr, di->di_intr_cells, - interrupt, trig, pol); - - if (rv == 0) - /* This was recognized as our PIC and decoded. */ - return (0); - } - - return (ENXIO); -} - -static int -simplebus_add_one_intr(struct simplebus_devinfo *di, pcell_t *intr) -{ - int interrupt, trig, pol; - int intr_num; - - intr_num = di->di_intr_num; - - if (intr_num > DI_MAX_INTR_NUM) { - debugf("max intr num reached: %d\n", DI_MAX_INTR_NUM); - return (ENOMEM); - } - - interrupt = trig = pol = 0; - - if (fdt_intr_decode(di, intr, &interrupt, &trig, &pol) != 0) - return (ENXIO); - - if (interrupt <= 0) - return (ERANGE); - - debugf("decoded intr = %d, trig = %d, pol = %d\n", interrupt, trig, - pol); - - di->di_intr_sl[intr_num].trig = trig; - di->di_intr_sl[intr_num].pol = pol; - - resource_list_add(&di->di_res, SYS_RES_IRQ, intr_num, - interrupt, interrupt, 1); - - di->di_intr_num++; - - return (0); -} - -static int -simplebus_add_intr(phandle_t node, struct simplebus_devinfo *di) -{ - phandle_t intr_par; - ihandle_t iph; - pcell_t *intr; - pcell_t intr_cells; - int i, intr_num, rv; - - if (OF_getproplen(node, "interrupts") <= 0) - /* Node does not have 'interrupts' property. */ - return (0); - - /* - * Find #interrupt-cells of the interrupt domain. - */ - if (OF_getprop(node, "interrupt-parent", &iph, sizeof(iph)) <= 0) { - debugf("no intr-parent phandle\n"); - intr_par = OF_parent(node); - } else - intr_par = OF_instance_to_package(iph); - - if (OF_getprop(intr_par, "#interrupt-cells", &intr_cells, - sizeof(intr_cells)) <= 0) { - debugf("no intr-cells defined, defaulting to 1\n"); - intr_cells = 1; - } - - intr_num = OF_getprop_alloc(node, "interrupts", - intr_cells * sizeof(pcell_t), (void **)&intr); - if (intr_num <= 0) - return (ERANGE); - - rv = 0; - di->di_intr_num = 0; - di->di_intr_par = intr_par; - di->di_intr_cells = intr_cells; - for (i = 0; i < intr_num; i++) { - rv = simplebus_add_one_intr(di, &intr[i * intr_cells]); - if (rv != 0) { - /* XXX resource_list_free(&di->di_res); ??? */ - goto out; - } - } - -out: - free(intr, M_OFWPROP); - return (rv); -} - static void simplebus_fixup(phandle_t node) { - phandle_t cpus, child; + phandle_t cpus, child, root; + char *model; pcell_t freq; + int len; - /* XXX this whole fixup should depend on 8555 SOC */ + /* Fixup handling is platform specific. */ + if ((root = OF_finddevice("/")) == 0) + panic("simplebus: no root node"); + len = OF_getprop_alloc(root, "model", 1, (void **)&model); + if (len <= 0) + return; + if (!(strcmp(model, "fsl,MPC8572DS") == 0 || + strcmp(model, "MPC8555CDS") == 0)) + goto out; if ((cpus = OF_finddevice("/cpus")) == 0) panic("simplebus: no /cpus node"); @@ -532,6 +178,8 @@ return; OF_setprop(node, "bus-frequency", (void *)&freq, sizeof(freq)); +out: + free(model, M_OFWPROP); } static int @@ -543,34 +191,19 @@ struct simplebus_devinfo *di; struct simplebus_softc *sc; phandle_t node, child; - pcell_t cell; - ssize_t prop_len; - int cell_size, tuple_size, tuples; + int tuple_size, tuples; int par_addr_cells; sc = device_get_softc(dev); node = ofw_bus_get_node(dev); - cell_size = sizeof(cell); + + if ((fdt_addrsize_cells(node, &sc->sc_addr_cells, + &sc->sc_size_cells)) != 0) + return (ENXIO); simplebus_fixup(node); /* - * Retrieve #{address,size}-cells. - */ - if (OF_getprop(node, "#address-cells", &cell, cell_size) < cell_size) - cell = 2; - sc->sc_addr_cells = (int)cell; - - if (OF_getprop(node, "#size-cells", &cell, cell_size) < cell_size) - cell = 1; - sc->sc_size_cells = (int)cell; - - if (sc->sc_addr_cells > 2 || sc->sc_size_cells > 2) { - device_printf(dev, "unsupported # of cells\n"); - return (ERANGE); - } - - /* * Process 'ranges' property. */ par_addr_cells = fdt_parent_addr_cells(node); @@ -578,22 +211,16 @@ device_printf(dev, "unsupported parent #addr-cells\n"); return (ERANGE); } - tuple_size = cell_size * (sc->sc_addr_cells + par_addr_cells + + tuple_size = sizeof(pcell_t) * (sc->sc_addr_cells + par_addr_cells + sc->sc_size_cells); - /* XXX free ranges prop? */ - prop_len = OF_getprop_alloc(node, "ranges", 1, (void **)&ranges); + /* TODO free ranges prop */ + tuples = OF_getprop_alloc(node, "ranges", tuple_size, + (void **)&ranges); start = 0; size = 0; - if (prop_len >= 0) { - - if (prop_len % tuple_size) { - device_printf(dev, "inconsistent 'ranges' property\n"); - return (ENXIO); - } - tuples = prop_len / tuple_size; - + if (tuples > 0) { fdt_ranges_dump(ranges, tuples, par_addr_cells, sc->sc_addr_cells, sc->sc_size_cells); @@ -631,14 +258,15 @@ resource_list_init(&di->di_res); - if (simplebus_add_reg(child, di, sc)) { + if (fdt_reg_to_rl(child, &di->di_res, sc->sc_start_va)) { device_printf(dev, "could not process 'reg' " "property\n"); ofw_bus_gen_destroy_devinfo(&di->di_ofw); free(di, M_SIMPLEBUS); continue; } - if (simplebus_add_intr(child, di)) { + + if (fdt_intr_to_rl(child, &di->di_res, di->di_intr_sl)) { device_printf(dev, "could not process 'interrupts' " "property\n"); resource_list_free(&di->di_res); From owner-p4-projects@FreeBSD.ORG Wed Jan 6 22:08:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D7831065693; Wed, 6 Jan 2010 22:08:19 +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 417CF106568F for ; Wed, 6 Jan 2010 22:08:19 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E71B8FC0C for ; Wed, 6 Jan 2010 22:08:19 +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 o06M8JBw043672 for ; Wed, 6 Jan 2010 22:08:19 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06M8JAr043670 for perforce@freebsd.org; Wed, 6 Jan 2010 22:08:19 GMT (envelope-from raj@freebsd.org) Date: Wed, 6 Jan 2010 22:08:19 GMT Message-Id: <201001062208.o06M8JAr043670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 22:08:19 -0000 http://p4web.freebsd.org/chv.cgi?CH=172676 Change 172676 by raj@raj_fdt on 2010/01/06 22:07:36 Convert LBC driver to FDT convention. Temporarily disconnect DS1553 and cfi(4) LBC attachments from the build. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#11 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.c#2 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.h#2 edit Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#11 (text+ko) ==== @@ -29,7 +29,7 @@ dev/adb/adb_mouse.c optional adb dev/adb/adb_hb_if.m optional adb dev/adb/adb_if.m optional adb -dev/cfi/cfi_bus_lbc.c optional cfi +#dev/cfi/cfi_bus_lbc.c optional cfi dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc @@ -117,13 +117,13 @@ powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu powerpc/mpc85xx/atpic.c optional mpc85xx isa -powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553 mpc85xx +#powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553 mpc85xx powerpc/mpc85xx/ds1553_core.c optional ds1553 powerpc/mpc85xx/fdt_common.c optional fdt powerpc/mpc85xx/fdtbus.c optional fdt powerpc/mpc85xx/i2c.c optional iicbus fdt powerpc/mpc85xx/isa.c optional mpc85xx isa -#powerpc/mpc85xx/lbc.c optional mpc85xx +powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx ==== //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.c#2 (text+ko) ==== @@ -1,8 +1,12 @@ /*- * Copyright (c) 2006-2008, Juniper Networks, Inc. * Copyright (c) 2008 Semihalf, Rafal Czubak + * Copyright (c) 2009 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by Semihalf + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -39,70 +43,54 @@ #include #include #include -#include #include #include -#include +#include +#include + #include -#include -struct lbc_softc { - device_t sc_dev; +#include "fdt_common.h" +#include "ofw_bus_if.h" +#include "lbc.h" - struct resource *sc_res; - bus_space_handle_t sc_bsh; - bus_space_tag_t sc_bst; - int sc_rid; +#define DEBUG +#undef DEBUG - struct rman sc_rman; - vm_offset_t sc_kva[LBC_DEV_MAX]; -}; +#ifdef DEBUG +#define debugf(fmt, args...) do { printf("%s(): ", __func__); \ + printf(fmt,##args); } while (0) +#else +#define debugf(fmt, args...) +#endif -struct lbc_devinfo { - int lbc_devtype; - /* LBC child unit. It also represents resource table entry number */ - int lbc_unit; -}; +static __inline void +lbc_write_reg(struct lbc_softc *sc, bus_size_t off, uint32_t val) +{ -/* Resources for MPC8555CDS system */ -const struct lbc_resource mpc85xx_lbc_resources[] = { - /* Boot flash bank */ - { - LBC_DEVTYPE_CFI, 0, 0xff800000, 0x00800000, 16, - LBCRES_MSEL_GPCM, LBCRES_DECC_DISABLED, - LBCRES_ATOM_DISABLED, 0 - }, + bus_space_write_4(sc->sc_bst, sc->sc_bsh, off, val); +} - /* Second flash bank */ - { - LBC_DEVTYPE_CFI, 1, 0xff000000, 0x00800000, 16, - LBCRES_MSEL_GPCM, LBCRES_DECC_DISABLED, - LBCRES_ATOM_DISABLED, 0 - }, +static __inline uint32_t +lbc_read_reg(struct lbc_softc *sc, bus_size_t off) +{ - /* DS1553 RTC/NVRAM */ - { - LBC_DEVTYPE_RTC, 2, 0xf8000000, 0x8000, 8, - LBCRES_MSEL_GPCM, LBCRES_DECC_DISABLED, - LBCRES_ATOM_DISABLED, 0 - }, + return (bus_space_read_4(sc->sc_bst, sc->sc_bsh, off)); +} - {0} -}; +static MALLOC_DEFINE(M_LBC, "localbus", "localbus devices information"); static int lbc_probe(device_t); static int lbc_attach(device_t); static int lbc_shutdown(device_t); -static int lbc_get_resource(device_t, device_t, int, int, u_long *, - u_long *); static struct resource *lbc_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); static int lbc_print_child(device_t, device_t); static int lbc_release_resource(device_t, device_t, int, int, struct resource *); -static int lbc_read_ivar(device_t, device_t, int, uintptr_t *); +static const struct ofw_bus_devinfo *lbc_get_devinfo(device_t, device_t); /* * Bus interface definition @@ -115,16 +103,22 @@ /* Bus interface */ DEVMETHOD(bus_print_child, lbc_print_child), - DEVMETHOD(bus_read_ivar, lbc_read_ivar), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, NULL), - DEVMETHOD(bus_get_resource, NULL), DEVMETHOD(bus_alloc_resource, lbc_alloc_resource), DEVMETHOD(bus_release_resource, lbc_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + /* OFW bus interface */ + DEVMETHOD(ofw_bus_get_devinfo, lbc_get_devinfo), + DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat), + DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model), + DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), + DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), + DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), + { 0, 0 } }; @@ -133,23 +127,11 @@ lbc_methods, sizeof(struct lbc_softc) }; + devclass_t lbc_devclass; -DRIVER_MODULE(lbc, ocpbus, lbc_driver, lbc_devclass, 0, 0); -static __inline void -lbc_write_reg(struct lbc_softc *sc, bus_size_t off, uint32_t val) -{ - - bus_space_write_4(sc->sc_bst, sc->sc_bsh, off, val); -} +DRIVER_MODULE(lbc, fdtbus, lbc_driver, lbc_devclass, 0, 0); -static __inline uint32_t -lbc_read_reg(struct lbc_softc *sc, bus_size_t off) -{ - - return (bus_space_read_4(sc->sc_bst, sc->sc_bsh, off)); -} - /* * Calculate address mask used by OR(n) registers. Use memory region size to * determine mask value. The size must be a power of two and within the range @@ -176,103 +158,101 @@ return (0xffff8000 << (n - 15)); } -static device_t -lbc_mk_child(device_t dev, const struct lbc_resource *lbcres) +static void +lbc_banks_unmap(struct lbc_softc *sc) { - struct lbc_devinfo *dinfo; - device_t child; + int i; - if (lbcres->lbr_unit > LBC_DEV_MAX - 1) - return (NULL); + for (i = 0; i < LBC_DEV_MAX; i++) { + if (sc->sc_banks[i].size == 0) + continue; - child = device_add_child(dev, NULL, -1); - if (child == NULL) { - device_printf(dev, "could not add LBC child device\n"); - return (NULL); + law_disable(OCP85XX_TGTIF_LBC, sc->sc_banks[i].pa, + sc->sc_banks[i].size); + pmap_unmapdev(sc->sc_banks[i].va, sc->sc_banks[i].size); } - dinfo = malloc(sizeof(struct lbc_devinfo), M_DEVBUF, M_WAITOK | M_ZERO); - dinfo->lbc_devtype = lbcres->lbr_devtype; - dinfo->lbc_unit = lbcres->lbr_unit; - device_set_ivars(child, dinfo); - return (child); } static int -lbc_init_child(device_t dev, device_t child) +lbc_banks_map(struct lbc_softc *sc) { - struct lbc_softc *sc; - struct lbc_devinfo *dinfo; - const struct lbc_resource *res; u_long start, size; - uint32_t regbuff; - int error, unit; + int error, i; - sc = device_get_softc(dev); - dinfo = device_get_ivars(child); - - res = mpc85xx_lbc_resources; - - regbuff = 0; - unit = -1; - for (; res->lbr_devtype; res++) { - if (res->lbr_unit != dinfo->lbc_unit) + for (i = 0; i < LBC_DEV_MAX; i++) { + if (sc->sc_banks[i].size == 0) continue; - start = res->lbr_base_addr; - size = res->lbr_size; - unit = res->lbr_unit; + /* Physical address start/size. */ + start = sc->sc_banks[i].pa; + size = sc->sc_banks[i].size; /* - * Configure LAW for this LBC device and map its physical - * memory region into KVA + * Configure LAW for this LBC bank (CS) and map its physical + * memory region into KVA. */ error = law_enable(OCP85XX_TGTIF_LBC, start, size); if (error) return (error); - sc->sc_kva[unit] = (vm_offset_t)pmap_mapdev(start, size); - if (sc->sc_kva[unit] == 0) { - law_disable(OCP85XX_TGTIF_LBC, start, size); + sc->sc_banks[i].va = (vm_offset_t)pmap_mapdev(start, size); + if (sc->sc_banks[i].va == 0) { + lbc_banks_unmap(sc); return (ENOSPC); } + } + return (0); +} + +static int +lbc_banks_enable(struct lbc_softc *sc) +{ + u_long size; + uint32_t regval; + int error, i; + for (i = 0; i < LBC_DEV_MAX; i++) { + size = sc->sc_banks[i].size; + if (size == 0) + continue; /* - * Compute and program BR value + * Compute and program BR value. */ - regbuff |= start; + regval = 0; + regval |= sc->sc_banks[i].pa; - switch (res->lbr_port_size) { + switch (sc->sc_banks[i].width) { case 8: - regbuff |= (1 << 11); + regval |= (1 << 11); break; case 16: - regbuff |= (2 << 11); + regval |= (2 << 11); break; case 32: - regbuff |= (3 << 11); + regval |= (3 << 11); break; default: error = EINVAL; goto fail; } - regbuff |= (res->lbr_decc << 9); - regbuff |= (res->lbr_wp << 8); - regbuff |= (res->lbr_msel << 5); - regbuff |= (res->lbr_atom << 2); - regbuff |= 1; + regval |= (sc->sc_banks[i].decc << 9); + regval |= (sc->sc_banks[i].wp << 8); + regval |= (sc->sc_banks[i].msel << 5); + regval |= (sc->sc_banks[i].atom << 2); + regval |= 1; - lbc_write_reg(sc, LBC85XX_BR(unit), regbuff); + lbc_write_reg(sc, LBC85XX_BR(i), regval); /* - * Compute and program OR value + * Compute and program OR value. */ - regbuff = 0; - regbuff |= lbc_address_mask(size); + regval = 0; + regval |= lbc_address_mask(size); - switch (res->lbr_msel) { + switch (sc->sc_banks[i].msel) { case LBCRES_MSEL_GPCM: /* TODO Add flag support for option registers */ - regbuff |= 0x00000ff7; + regval |= 0x00000ff7; break; case LBCRES_MSEL_FCM: printf("FCM mode not supported yet!"); @@ -285,35 +265,119 @@ error = ENOSYS; goto fail; } + lbc_write_reg(sc, LBC85XX_OR(i), regval); + } + + /* + * Initialize configuration register: + * - enable Local Bus + * - set data buffer control signal function + * - disable parity byte select + * - set ECC parity type + * - set bus monitor timing and timer prescale + */ + lbc_write_reg(sc, LBC85XX_LBCR, 0); + + /* + * Initialize clock ratio register: + * - disable PLL bypass mode + * - configure LCLK delay cycles for the assertion of LALE + * - set system clock divider + */ + lbc_write_reg(sc, LBC85XX_LCRR, 0x00030008); + + return (0); + +fail: + lbc_banks_unmap(sc); + return (error); +} + +static void +fdt_lbc_fixup(phandle_t node, struct lbc_softc *sc, struct lbc_devinfo *di) +{ + pcell_t width; + int bank; + + if (OF_getprop(node, "bank-width", (void *)&width, sizeof(width)) <= 0) + return; - lbc_write_reg(sc, LBC85XX_OR(unit), regbuff); + bank = di->di_bank; + if (sc->sc_banks[bank].size == 0) + return; + + /* Express width in bits. */ + sc->sc_banks[bank].width = width * 8; +} + +static int +fdt_lbc_reg_decode(phandle_t node, struct lbc_softc *sc, + struct lbc_devinfo *di) +{ + u_long start, end, count; + pcell_t *reg, *regptr; + pcell_t addr_cells, size_cells; + int tuple_size, tuples; + int i, rv, bank; + + addr_cells = fdt_parent_addr_cells(node); + if (addr_cells > 0) { + rv = OF_searchprop(OF_parent(node), "#size-cells", + &size_cells, sizeof(size_cells)); + if (rv <= 0) + size_cells = 1; + } else + size_cells = 0; + tuple_size = sizeof(pcell_t) * (addr_cells + size_cells); + tuples = OF_getprop_alloc(node, "reg", tuple_size, (void **)®); + debugf("addr_cells = %d, size_cells = %d\n", addr_cells, size_cells); + debugf("tuples = %d, tuple size = %d\n", tuples, tuple_size); + if (tuples <= 0) + /* No 'reg' property in this node. */ return (0); + + regptr = reg; + for (i = 0; i < tuples; i++) { + + bank = fdt_data_get((void *)reg, 1); + di->di_bank = bank; + reg += 1; + + /* Get address/size. */ + rv = fdt_data_to_res(reg, addr_cells - 1, size_cells, &start, + &count); + if (rv != 0) { + resource_list_free(&di->di_res); + goto out; + } + reg += addr_cells - 1 + size_cells; + + /* Calculate address range relative to VA base. */ + start = sc->sc_banks[bank].va + start; + end = start + count - 1; + + debugf("reg addr bank = %d, start = %lx, end = %lx, " + "count = %lx\n", bank, start, end, count); + + /* Use bank (CS) cell as rid. */ + resource_list_add(&di->di_res, SYS_RES_MEMORY, bank, start, + end, count); } -fail: - if (unit != -1) { - law_disable(OCP85XX_TGTIF_LBC, start, size); - pmap_unmapdev(sc->sc_kva[unit], size); - return (error); - } else - return (ENOENT); + rv = 0; +out: + free(regptr, M_OFWPROP); + return (rv); } static int lbc_probe(device_t dev) { - device_t parent; - uintptr_t devtype; - int error; - parent = device_get_parent(dev); - error = BUS_READ_IVAR(parent, dev, OCPBUS_IVAR_DEVTYPE, &devtype); - if (error) - return (error); - if (devtype != OCPBUS_DEVTYPE_LBC) + if (!ofw_bus_is_compatible(dev, "fsl,lbc")) return (ENXIO); - device_set_desc(dev, "Freescale MPC85xx Local Bus Controller"); + device_set_desc(dev, "Freescale Local Bus Controller"); return (BUS_PROBE_DEFAULT); } @@ -321,9 +385,15 @@ lbc_attach(device_t dev) { struct lbc_softc *sc; + struct lbc_devinfo *di; struct rman *rm; - const struct lbc_resource *lbcres; - int error; + u_long offset, start, size; + device_t cdev; + phandle_t node, child; + pcell_t *ranges, *rangesptr; + int tuple_size, tuples; + int par_addr_cells; + int bank, error, i; sc = device_get_softc(dev); sc->sc_dev = dev; @@ -336,10 +406,11 @@ sc->sc_bst = rman_get_bustag(sc->sc_res); sc->sc_bsh = rman_get_bushandle(sc->sc_res); + rangesptr = NULL; rm = &sc->sc_rman; rm->rm_type = RMAN_ARRAY; - rm->rm_descr = "MPC85XX Local Bus Space"; + rm->rm_descr = "Local Bus Space"; rm->rm_start = 0UL; rm->rm_end = ~0UL; error = rman_init(rm); @@ -353,34 +424,142 @@ } /* - * Initialize configuration register: - * - enable Local Bus - * - set data buffer control signal function - * - disable parity byte select - * - set ECC parity type - * - set bus monitor timing and timer prescale + * Process 'ranges' property. + */ + node = ofw_bus_get_node(dev); + if ((fdt_addrsize_cells(node, &sc->sc_addr_cells, + &sc->sc_size_cells)) != 0) { + error = ENXIO; + goto fail; + } + + par_addr_cells = fdt_parent_addr_cells(node); + if (par_addr_cells > 2) { + device_printf(dev, "unsupported parent #addr-cells\n"); + error = ERANGE; + goto fail; + } + tuple_size = sizeof(pcell_t) * (sc->sc_addr_cells + par_addr_cells + + sc->sc_size_cells); + + tuples = OF_getprop_alloc(node, "ranges", tuple_size, + (void **)&ranges); + if (tuples < 0) { + device_printf(dev, "could not retrieve 'ranges' property\n"); + error = ENXIO; + goto fail; + } + rangesptr = ranges; + + debugf("par addr_cells = %d, addr_cells = %d, size_cells = %d, " + "tuple_size = %d, tuples = %d\n", par_addr_cells, + sc->sc_addr_cells, sc->sc_size_cells, tuple_size, tuples); + + if (tuples > 0) + fdt_ranges_dump(ranges, tuples, par_addr_cells, + sc->sc_addr_cells, sc->sc_size_cells); + start = 0; + size = 0; + for (i = 0; i < tuples; i++) { + + /* The first cell is the bank (chip select) number. */ + bank = fdt_data_get((void *)ranges, 1); + if (bank < 0 || bank > LBC_DEV_MAX) { + device_printf(dev, "bank out of range: %d\n", bank); + error = ERANGE; + goto fail; + } + ranges += 1; + + /* + * Remaining cells of the child address define offset into + * this CS. + */ + offset = fdt_data_get((void *)ranges, sc->sc_addr_cells - 1); + ranges += sc->sc_addr_cells - 1; + + /* Parent bus start address of this bank. */ + start = fdt_data_get((void *)ranges, par_addr_cells); + ranges += par_addr_cells; + + size = fdt_data_get((void *)ranges, sc->sc_size_cells); + ranges += sc->sc_size_cells; + debugf("bank = %d, start = %lx, size = %lx\n", bank, + start, size); + + sc->sc_banks[bank].pa = start + offset; + sc->sc_banks[bank].size = size; + + /* + * Attributes for the bank. + * + * XXX Note there are no DT bindings defined for them at the + * moment, so we need to provide some defaults. + */ + sc->sc_banks[bank].width = 16; + sc->sc_banks[bank].msel = LBCRES_MSEL_GPCM; + sc->sc_banks[bank].decc = LBCRES_DECC_DISABLED; + sc->sc_banks[bank].atom = LBCRES_ATOM_DISABLED; + sc->sc_banks[bank].wp = 0; + } + + /* + * Initialize mem-mappings for the LBC banks (i.e. chip selects). */ - lbc_write_reg(sc, LBC85XX_LBCR, 0x00000000); + error = lbc_banks_map(sc); + if (error) + goto fail; /* - * Initialize clock ratio register: - * - disable PLL bypass mode - * - configure LCLK delay cycles for the assertion of LALE - * - set system clock divider + * Walk the localbus and add direct subordinates as our children. */ - lbc_write_reg(sc, LBC85XX_LCRR, 0x00030008); + for (child = OF_child(node); child != 0; child = OF_peer(child)) { + + di = malloc(sizeof(*di), M_LBC, M_WAITOK | M_ZERO); + + if (ofw_bus_gen_setup_devinfo(&di->di_ofw, child) != 0) { + free(di, M_LBC); + device_printf(dev, "could not set up devinfo\n"); + continue; + } + + resource_list_init(&di->di_res); + + if (fdt_lbc_reg_decode(child, sc, di)) { + device_printf(dev, "could not process 'reg' " + "property\n"); + ofw_bus_gen_destroy_devinfo(&di->di_ofw); + free(di, M_LBC); + continue; + } - lbcres = mpc85xx_lbc_resources; + fdt_lbc_fixup(child, sc, di); - for (; lbcres->lbr_devtype; lbcres++) - if (!lbc_mk_child(dev, lbcres)) { - error = ENXIO; - goto fail; + /* Add newbus device for this FDT node */ + cdev = device_add_child(dev, NULL, -1); + if (cdev == NULL) { + device_printf(dev, "could not add child: %s\n", + di->di_ofw.obd_name); + resource_list_free(&di->di_res); + ofw_bus_gen_destroy_devinfo(&di->di_ofw); + free(di, M_LBC); + continue; } + debugf("added child name='%s', node=%p\n", di->di_ofw.obd_name, + (void *)child); + device_set_ivars(cdev, di); + } + + /* + * Enable the LBC. + */ + lbc_banks_enable(sc); + free(rangesptr, M_OFWPROP); return (bus_generic_attach(dev)); fail: + free(rangesptr, M_OFWPROP); bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rid, sc->sc_res); return (error); } @@ -394,137 +573,114 @@ } static struct resource * -lbc_alloc_resource(device_t dev, device_t child, int type, int *rid, +lbc_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { struct lbc_softc *sc; - struct lbc_devinfo *dinfo; - struct resource *rv; + struct lbc_devinfo *di; + struct resource_list_entry *rle; + struct resource *res; struct rman *rm; - int error; - - sc = device_get_softc(dev); - dinfo = device_get_ivars(child); - - if (type != SYS_RES_MEMORY && type != SYS_RES_IRQ) - return (NULL); + int needactivate; /* We only support default allocations. */ if (start != 0ul || end != ~0ul) return (NULL); + sc = device_get_softc(bus); if (type == SYS_RES_IRQ) - return (bus_alloc_resource(dev, type, rid, start, end, count, + return (bus_alloc_resource(bus, type, rid, start, end, count, flags)); - if (!sc->sc_kva[dinfo->lbc_unit]) { - error = lbc_init_child(dev, child); - if (error) - return (NULL); + /* + * Request for the default allocation with a given rid: use resource + * list stored in the local device info. + */ + if ((di = device_get_ivars(child)) == NULL) + return (NULL); + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + + rid = &di->di_bank; + + rle = resource_list_find(&di->di_res, type, *rid); + if (rle == NULL) { + device_printf(bus, "no default resources for " + "rid = %d, type = %d\n", *rid, type); + return (NULL); } + start = rle->start; + count = rle->count; + end = start + count - 1; - error = lbc_get_resource(dev, child, type, *rid, &start, &count); - if (error) - return (NULL); + sc = device_get_softc(bus); + + needactivate = flags & RF_ACTIVE; + flags &= ~RF_ACTIVE; rm = &sc->sc_rman; - end = start + count - 1; - rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv != NULL) { - rman_set_bustag(rv, &bs_be_tag); - rman_set_bushandle(rv, rman_get_start(rv)); + + res = rman_reserve_resource(rm, start, end, count, flags, child); + if (res == NULL) { + device_printf(bus, "failed to reserve resource %#lx - %#lx " + "(%#lx)\n", start, end, count); + return (NULL); } - return (rv); -} -static int -lbc_print_child(device_t dev, device_t child) -{ - u_long size, start; - int error, retval, rid; + rman_set_rid(res, *rid); + rman_set_bustag(res, &bs_be_tag); + rman_set_bushandle(res, rman_get_start(res)); - retval = bus_print_child_header(dev, child); + if (needactivate) + if (bus_activate_resource(child, type, *rid, res)) { + device_printf(child, "resource activation failed\n"); + rman_release_resource(res); + return (NULL); + } - rid = 0; - while (1) { - error = lbc_get_resource(dev, child, SYS_RES_MEMORY, rid, - &start, &size); - if (error) - break; - retval += (rid == 0) ? printf(" iomem ") : printf(","); - retval += printf("%#lx", start); - if (size > 1) - retval += printf("-%#lx", start + size - 1); - rid++; - } - - retval += bus_print_child_footer(dev, child); - return (retval); + return (res); } static int -lbc_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) +lbc_print_child(device_t dev, device_t child) { - struct lbc_devinfo *dinfo; + struct lbc_devinfo *di; + struct resource_list *rl; + int rv; - if (device_get_parent(child) != dev) - return (EINVAL); + di = device_get_ivars(child); + rl = &di->di_res; - dinfo = device_get_ivars(child); + rv = 0; + rv += bus_print_child_header(dev, child); + rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx"); + rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); + rv += bus_print_child_footer(dev, child); - switch (index) { - case LBC_IVAR_DEVTYPE: - *result = dinfo->lbc_devtype; - return (0); - default: - break; - } - return (EINVAL); + return (rv); } static int lbc_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { + int err; + + if (rman_get_flags(res) & RF_ACTIVE) { + err = bus_deactivate_resource(child, type, rid, res); + if (err) + return (err); + } return (rman_release_resource(res)); } -static int -lbc_get_resource(device_t dev, device_t child, int type, int rid, - u_long *startp, u_long *countp) +static const struct ofw_bus_devinfo * +lbc_get_devinfo(device_t bus, device_t child) { - struct lbc_softc *sc; - struct lbc_devinfo *dinfo; - const struct lbc_resource *lbcres; + struct lbc_devinfo *di; - if (type != SYS_RES_MEMORY) - return (ENOENT); - - /* Currently all LBC devices have a single RID per type. */ - if (rid != 0) - return (ENOENT); - - sc = device_get_softc(dev); - dinfo = device_get_ivars(child); - - if ((dinfo->lbc_unit < 0) || (dinfo->lbc_unit > (LBC_DEV_MAX - 1))) - return (EINVAL); - - lbcres = mpc85xx_lbc_resources; - - switch (dinfo->lbc_devtype) { - case LBC_DEVTYPE_CFI: - case LBC_DEVTYPE_RTC: - for (; lbcres->lbr_devtype; lbcres++) { - if (dinfo->lbc_unit == lbcres->lbr_unit) { - *startp = sc->sc_kva[lbcres->lbr_unit]; - *countp = lbcres->lbr_size; - return (0); - } - } - default: - return (EDOOFUS); - } - return (0); + di = device_get_ivars(child); + return (&di->di_ofw); } ==== //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.h#2 (text+ko) ==== @@ -29,15 +29,9 @@ #ifndef _MACHINE_LBC_H_ #define _MACHINE_LBC_H_ -#define LBC_IVAR_DEVTYPE 1 - /* Maximum number of devices on Local Bus */ #define LBC_DEV_MAX 8 -/* Device types. */ -#define LBC_DEVTYPE_CFI 1 -#define LBC_DEVTYPE_RTC 2 - /* Local access registers */ #define LBC85XX_BR(n) (8 * n) #define LBC85XX_OR(n) (4 + (8 * n)) @@ -61,18 +55,42 @@ #define LBCRES_ATOM_RAWA 1 #define LBCRES_ATOM_WARA 2 -struct lbc_resource { - int lbr_devtype; /* LBC device type */ - int lbr_unit; /* Resource table entry number */ - vm_paddr_t lbr_base_addr; /* Device mem region base address */ - size_t lbr_size; /* Device mem region size */ - int lbr_port_size; /* Data bus width */ - uint8_t lbr_msel; /* LBC machine select */ - uint8_t lbr_decc; /* Data error checking mode */ - uint8_t lbr_atom; /* Atomic operation mode */ - uint8_t lbr_wp; /* Write protect */ +struct lbc_bank { + u_long pa; /* physical addr of the bank */ + u_long size; /* bank size */ + vm_offset_t va; /* VA of the bank */ + + /* + * XXX the following bank attributes do not have properties specified + * in the LBC DTS bindings yet (11.2009), so they are mainly a + * placeholder for future extensions. + */ + int width; /* data bus width */ + uint8_t msel; /* machine select */ + uint8_t atom; /* atomic op mode */ + uint8_t wp; /* write protect */ + uint8_t decc; /* data error checking */ +}; + +struct lbc_softc { + device_t sc_dev; + struct resource *sc_res; + bus_space_handle_t sc_bsh; + bus_space_tag_t sc_bst; + int sc_rid; + + struct rman sc_rman; + + int sc_addr_cells; + int sc_size_cells; + + struct lbc_bank sc_banks[LBC_DEV_MAX]; }; -extern const struct lbc_resource mpc85xx_lbc_resources[]; +struct lbc_devinfo { + struct ofw_bus_devinfo di_ofw; + struct resource_list di_res; + int di_bank; +}; #endif /* _MACHINE_LBC_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jan 6 22:12:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC30F10656A5; Wed, 6 Jan 2010 22:12: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 703791065696 for ; Wed, 6 Jan 2010 22:12:23 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EEBF8FC16 for ; Wed, 6 Jan 2010 22:12: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 o06MCNGc044096 for ; Wed, 6 Jan 2010 22:12:23 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06MCNe6044094 for perforce@freebsd.org; Wed, 6 Jan 2010 22:12:23 GMT (envelope-from raj@freebsd.org) Date: Wed, 6 Jan 2010 22:12:23 GMT Message-Id: <201001062212.o06MCNe6044094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 22:12:23 -0000 http://p4web.freebsd.org/chv.cgi?CH=172677 Change 172677 by raj@raj_fdt on 2010/01/06 22:12:18 Convert cfi(4) LBC attachment to FDT convention. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#12 edit .. //depot/projects/fdt/sys/dev/cfi/cfi_bus_fdt.c#1 add .. //depot/projects/fdt/sys/dev/cfi/cfi_bus_lbc.c#2 delete Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#12 (text+ko) ==== @@ -29,7 +29,7 @@ dev/adb/adb_mouse.c optional adb dev/adb/adb_hb_if.m optional adb dev/adb/adb_if.m optional adb -#dev/cfi/cfi_bus_lbc.c optional cfi +dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc From owner-p4-projects@FreeBSD.ORG Wed Jan 6 22:16:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E30DA1065672; Wed, 6 Jan 2010 22:16: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 A7058106566B for ; Wed, 6 Jan 2010 22:16:27 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 955408FC14 for ; Wed, 6 Jan 2010 22:16: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 o06MGRRJ044409 for ; Wed, 6 Jan 2010 22:16:27 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06MGRZ8044407 for perforce@freebsd.org; Wed, 6 Jan 2010 22:16:27 GMT (envelope-from raj@freebsd.org) Date: Wed, 6 Jan 2010 22:16:27 GMT Message-Id: <201001062216.o06MGRZ8044407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 22:16:28 -0000 http://p4web.freebsd.org/chv.cgi?CH=172678 Change 172678 by raj@raj_fdt on 2010/01/06 22:15:48 Convert DS1553 RTC attachment to FDT convention. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#13 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/ds1553_bus_fdt.c#1 add .. //depot/projects/fdt/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#2 delete Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#13 (text+ko) ==== @@ -117,7 +117,7 @@ powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu powerpc/mpc85xx/atpic.c optional mpc85xx isa -#powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553 mpc85xx +powerpc/mpc85xx/ds1553_bus_fdt.c optional ds1553 fdt powerpc/mpc85xx/ds1553_core.c optional ds1553 powerpc/mpc85xx/fdt_common.c optional fdt powerpc/mpc85xx/fdtbus.c optional fdt From owner-p4-projects@FreeBSD.ORG Wed Jan 6 22:18:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A99E1065694; Wed, 6 Jan 2010 22:18:30 +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 F375F1065692 for ; Wed, 6 Jan 2010 22:18:29 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1FF98FC1A for ; Wed, 6 Jan 2010 22:18:29 +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 o06MITJZ044606 for ; Wed, 6 Jan 2010 22:18:29 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06MITca044604 for perforce@freebsd.org; Wed, 6 Jan 2010 22:18:29 GMT (envelope-from raj@freebsd.org) Date: Wed, 6 Jan 2010 22:18:29 GMT Message-Id: <201001062218.o06MITca044604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 22:18:30 -0000 http://p4web.freebsd.org/chv.cgi?CH=172680 Change 172680 by raj@raj_fdt on 2010/01/06 22:17:59 mpc85xx: Clean up LAW regs early, so we can start with a known state. Affected files ... .. //depot/projects/fdt/sys/powerpc/booke/platform_bare.c#3 edit Differences ... ==== //depot/projects/fdt/sys/powerpc/booke/platform_bare.c#3 (text+ko) ==== @@ -90,7 +90,8 @@ static int bare_probe(platform_t plat) { - uint32_t ver; + uint32_t ver, sr; + int i, law_max, tgt; ver = SVR_VER(mfspr(SPR_SVR)); if (ver == SVR_MPC8572E || ver == SVR_MPC8572) @@ -98,6 +99,23 @@ else maxcpu = 1; + /* + * Clear local access windows. Skip DRAM entries, so we don't shoot + * ourselves in the foot. + */ + law_max = law_getmax(); + for (i = 0; i < law_max; i++) { + sr = ccsr_read4(OCP85XX_LAWSR(i)); + if ((sr & 0x80000000) == 0) + continue; + tgt = (sr & 0x01f00000) >> 20; + if (tgt == OCP85XX_TGTIF_RAM1 || tgt == OCP85XX_TGTIF_RAM2 || + tgt == OCP85XX_TGTIF_RAM_INTL) + continue; + + ccsr_write4(OCP85XX_LAWSR(i), sr & 0x7fffffff); + } + return (BUS_PROBE_GENERIC); } From owner-p4-projects@FreeBSD.ORG Wed Jan 6 22:58:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9762610656A5; Wed, 6 Jan 2010 22:58: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 570C81065696 for ; Wed, 6 Jan 2010 22:58:13 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 436E28FC15 for ; Wed, 6 Jan 2010 22:58: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 o06MwD4H047705 for ; Wed, 6 Jan 2010 22:58:13 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06MwAVL047702 for perforce@freebsd.org; Wed, 6 Jan 2010 22:58:10 GMT (envelope-from raj@freebsd.org) Date: Wed, 6 Jan 2010 22:58:10 GMT Message-Id: <201001062258.o06MwAVL047702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2010 22:58:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=172686 Change 172686 by raj@raj_fdt on 2010/01/06 22:57:28 IFC @172681 Affected files ... .. //depot/projects/fdt/COPYRIGHT#2 integrate .. //depot/projects/fdt/MAINTAINERS#3 integrate .. //depot/projects/fdt/Makefile.inc1#6 integrate .. //depot/projects/fdt/ObsoleteFiles.inc#5 integrate .. //depot/projects/fdt/UPDATING#5 integrate .. //depot/projects/fdt/bin/kenv/kenv.c#2 integrate .. //depot/projects/fdt/bin/pax/ftree.c#2 integrate .. //depot/projects/fdt/bin/pax/sel_subs.c#2 integrate .. //depot/projects/fdt/bin/pkill/pkill.c#2 integrate .. //depot/projects/fdt/bin/setfacl/merge.c#2 integrate .. //depot/projects/fdt/bin/setfacl/remove.c#2 integrate .. //depot/projects/fdt/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/fdt/bin/setfacl/util.c#2 integrate .. //depot/projects/fdt/bin/sh/alias.c#2 integrate .. //depot/projects/fdt/bin/sh/alias.h#2 integrate .. //depot/projects/fdt/bin/sh/arith.h#2 integrate .. //depot/projects/fdt/bin/sh/arith.y#2 integrate .. //depot/projects/fdt/bin/sh/cd.c#3 integrate .. //depot/projects/fdt/bin/sh/error.c#3 integrate .. //depot/projects/fdt/bin/sh/error.h#3 integrate .. //depot/projects/fdt/bin/sh/eval.c#4 integrate .. //depot/projects/fdt/bin/sh/eval.h#2 integrate .. //depot/projects/fdt/bin/sh/exec.c#2 integrate .. //depot/projects/fdt/bin/sh/exec.h#2 integrate .. //depot/projects/fdt/bin/sh/expand.c#2 integrate .. //depot/projects/fdt/bin/sh/expand.h#2 integrate .. //depot/projects/fdt/bin/sh/histedit.c#3 integrate .. //depot/projects/fdt/bin/sh/input.c#3 integrate .. //depot/projects/fdt/bin/sh/input.h#3 integrate .. //depot/projects/fdt/bin/sh/jobs.c#3 integrate .. //depot/projects/fdt/bin/sh/mail.c#2 integrate .. //depot/projects/fdt/bin/sh/main.c#3 integrate .. //depot/projects/fdt/bin/sh/main.h#2 integrate .. //depot/projects/fdt/bin/sh/memalloc.c#2 integrate .. //depot/projects/fdt/bin/sh/memalloc.h#2 integrate .. //depot/projects/fdt/bin/sh/miscbltin.c#2 integrate .. //depot/projects/fdt/bin/sh/mkbuiltins#2 integrate .. //depot/projects/fdt/bin/sh/mkinit.c#2 integrate .. //depot/projects/fdt/bin/sh/mksyntax.c#2 integrate .. //depot/projects/fdt/bin/sh/myhistedit.h#2 integrate .. //depot/projects/fdt/bin/sh/mystring.c#2 integrate .. //depot/projects/fdt/bin/sh/options.c#2 integrate .. //depot/projects/fdt/bin/sh/options.h#2 integrate .. //depot/projects/fdt/bin/sh/output.c#3 integrate .. //depot/projects/fdt/bin/sh/output.h#3 integrate .. //depot/projects/fdt/bin/sh/parser.c#4 integrate .. //depot/projects/fdt/bin/sh/parser.h#2 integrate .. //depot/projects/fdt/bin/sh/sh.1#2 integrate .. //depot/projects/fdt/bin/sh/show.c#2 integrate .. //depot/projects/fdt/bin/sh/show.h#2 integrate .. //depot/projects/fdt/bin/sh/trap.h#2 integrate .. //depot/projects/fdt/bin/sh/var.c#3 integrate .. //depot/projects/fdt/bin/sh/var.h#2 integrate .. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/fdt/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/fdt/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/fdt/contrib/pf/pfctl/pf_print_state.c#2 integrate .. //depot/projects/fdt/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/fdt/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/fdt/contrib/top/username.c#2 integrate .. //depot/projects/fdt/crypto/heimdal/kcm/connect.c#2 integrate .. //depot/projects/fdt/etc/defaults/devfs.rules#2 integrate .. //depot/projects/fdt/etc/defaults/rc.conf#3 integrate .. //depot/projects/fdt/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/fdt/etc/network.subr#2 integrate .. //depot/projects/fdt/etc/rc.d/named#3 integrate .. //depot/projects/fdt/etc/rc.d/nsswitch#2 integrate .. //depot/projects/fdt/etc/rc.firewall#3 integrate .. //depot/projects/fdt/etc/rc.subr#2 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/fdt/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/fdt/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/fdt/games/number/number.c#2 integrate .. //depot/projects/fdt/games/pom/pom.6#2 integrate .. //depot/projects/fdt/games/pom/pom.c#2 integrate .. //depot/projects/fdt/include/Makefile#3 integrate .. //depot/projects/fdt/include/dirent.h#2 integrate .. //depot/projects/fdt/include/paths.h#2 integrate .. //depot/projects/fdt/include/semaphore.h#1 branch .. //depot/projects/fdt/include/signal.h#3 integrate .. //depot/projects/fdt/include/strings.h#2 integrate .. //depot/projects/fdt/lib/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/csu/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/csu/arm/Makefile#3 integrate .. //depot/projects/fdt/lib/csu/i386-elf/Makefile#3 integrate .. //depot/projects/fdt/lib/csu/mips/Makefile#3 integrate .. //depot/projects/fdt/lib/libarchive/Makefile#2 integrate .. //depot/projects/fdt/lib/libarchive/archive.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_crc32.h#1 branch .. //depot/projects/fdt/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_entry_link_resolver.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_entry_xattr.c#1 branch .. //depot/projects/fdt/lib/libarchive/archive_hash.h#1 branch .. //depot/projects/fdt/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_disk_entry_from_file.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_disk_private.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_disk_set_standard_lookup.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_open_fd.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_compression_uu.c#1 branch .. //depot/projects/fdt/lib/libarchive/archive_read_support_compression_xz.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_raw.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_virtual.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_disk_private.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_open_fd.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_compression_compress.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_compression_program.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_compression_xz.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_mtree.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_zip.c#1 branch .. //depot/projects/fdt/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/fdt/lib/libarchive/filter_fork.h#2 integrate .. //depot/projects/fdt/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/fdt/lib/libarchive/tar.5#2 integrate .. //depot/projects/fdt/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/fdt/lib/libarchive/test/main.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test.h#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_compat_bzip2.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_compat_cpio.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_compat_lzma.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_compat_solaris_tar_acl.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_entry_strmode.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_extattr_freebsd.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_fuzz.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_fuzz_1.iso.uu#2 delete .. //depot/projects/fdt/lib/libarchive/test/test_open_fd.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_open_file.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_pax_filename_encoding.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_disk.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_disk_entry_from_file.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_ar.ar.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#2 delete .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_multi_extent.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isojoliet_bz2.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#2 delete .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isojoliet_long.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isojoliet_rr.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#2 delete .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#2 delete .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isorr_ce.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_mtree.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_mtree.mtree.uu#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_format_tlz.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_read_uu.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_tar_large.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_disk_failures.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_disk_hardlink.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_disk_sparse.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_disk_symlink.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_write_disk_times.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/fdt/lib/libarchive/test/test_write_format_zip.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_write_format_zip_empty.c#1 branch .. //depot/projects/fdt/lib/libarchive/test/test_write_format_zip_no_compression.c#1 branch .. //depot/projects/fdt/lib/libauditd/Makefile#2 integrate .. //depot/projects/fdt/lib/libautofs/Makefile#2 integrate .. //depot/projects/fdt/lib/libbegemot/Makefile#2 integrate .. //depot/projects/fdt/lib/libbsm/Makefile#2 integrate .. //depot/projects/fdt/lib/libbz2/Makefile#2 integrate .. //depot/projects/fdt/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/fdt/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/fdt/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/fdt/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/sem.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/sem_new.c#1 branch .. //depot/projects/fdt/lib/libc/gen/time.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/time.c#2 integrate .. //depot/projects/fdt/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/fdt/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/libc/posix1e/acl_delete_entry.c#2 integrate .. //depot/projects/fdt/lib/libc/rpc/getnetpath.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/sscanf.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/fdt/lib/libc/stdtime/localtime.c#3 integrate .. //depot/projects/fdt/lib/libc/stdtime/tzfile.5#2 integrate .. //depot/projects/fdt/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/fdt/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/fdt/lib/libcalendar/Makefile#2 integrate .. //depot/projects/fdt/lib/libcam/Makefile#2 integrate .. //depot/projects/fdt/lib/libcompat/Makefile#2 integrate .. //depot/projects/fdt/lib/libcrypt/Makefile#2 integrate .. //depot/projects/fdt/lib/libdevinfo/Makefile#2 integrate .. //depot/projects/fdt/lib/libdevstat/Makefile#2 integrate .. //depot/projects/fdt/lib/libdwarf/Makefile#2 integrate .. //depot/projects/fdt/lib/libedit/Makefile#2 integrate .. //depot/projects/fdt/lib/libelf/Makefile#2 integrate .. //depot/projects/fdt/lib/libexpat/Makefile#2 integrate .. //depot/projects/fdt/lib/libexpat/libbsdxml.3#3 integrate .. //depot/projects/fdt/lib/libftpio/Makefile#2 integrate .. //depot/projects/fdt/lib/libgeom/geom_getxml.c#2 integrate .. //depot/projects/fdt/lib/libgpib/Makefile#2 integrate .. //depot/projects/fdt/lib/libgssapi/Makefile#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_mech_switch.c#2 integrate .. //depot/projects/fdt/lib/libipsec/Makefile#2 integrate .. //depot/projects/fdt/lib/libipx/Makefile#2 integrate .. //depot/projects/fdt/lib/libjail/Makefile#2 integrate .. //depot/projects/fdt/lib/libkiconv/Makefile#2 integrate .. //depot/projects/fdt/lib/libkvm/Makefile#2 integrate .. //depot/projects/fdt/lib/libmagic/Makefile#2 integrate .. //depot/projects/fdt/lib/libmd/Makefile#2 integrate .. //depot/projects/fdt/lib/libmilter/Makefile#2 integrate .. //depot/projects/fdt/lib/libmp/Makefile#2 integrate .. //depot/projects/fdt/lib/libncp/Makefile#2 integrate .. //depot/projects/fdt/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/fdt/lib/libngatm/Makefile#2 integrate .. //depot/projects/fdt/lib/libopie/Makefile#2 integrate .. //depot/projects/fdt/lib/libpam/modules/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_exec/Makefile#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_krb5/Makefile#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_radius/Makefile#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_ssh/Makefile#2 integrate .. //depot/projects/fdt/lib/libpcap/Makefile#2 integrate .. //depot/projects/fdt/lib/libpmc/Makefile#2 integrate .. //depot/projects/fdt/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/fdt/lib/libpmc/pmc.xscale.3#1 branch .. //depot/projects/fdt/lib/libproc/Makefile#2 integrate .. //depot/projects/fdt/lib/libradius/Makefile#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/Makefile#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpcsec_gss_conf.c#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/fdt/lib/librt/Makefile#3 integrate .. //depot/projects/fdt/lib/libsbuf/Makefile#2 integrate .. //depot/projects/fdt/lib/libsm/Makefile#2 integrate .. //depot/projects/fdt/lib/libsmdb/Makefile#2 integrate .. //depot/projects/fdt/lib/libsmutil/Makefile#2 integrate .. //depot/projects/fdt/lib/libstand/Makefile#2 integrate .. //depot/projects/fdt/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/fdt/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/fdt/lib/libtacplus/Makefile#2 integrate .. //depot/projects/fdt/lib/libthr/pthread.map#2 integrate .. //depot/projects/fdt/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/fdt/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/fdt/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/fdt/lib/libthread_db/Makefile#2 integrate .. //depot/projects/fdt/lib/libufs/Makefile#2 integrate .. //depot/projects/fdt/lib/libugidfw/Makefile#2 integrate .. //depot/projects/fdt/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/fdt/lib/libulog/Makefile#3 integrate .. //depot/projects/fdt/lib/libulog/ulog.h#3 integrate .. //depot/projects/fdt/lib/libulog/ulog_getutxent.c#3 integrate .. //depot/projects/fdt/lib/libulog/ulog_pututxline.c#2 integrate .. //depot/projects/fdt/lib/libulog/ulog_setutxfile.3#2 integrate .. //depot/projects/fdt/lib/libusb/Makefile#2 integrate .. //depot/projects/fdt/lib/libutil/Makefile#2 integrate .. //depot/projects/fdt/lib/libvgl/Makefile#2 integrate .. //depot/projects/fdt/lib/libwrap/Makefile#2 integrate .. //depot/projects/fdt/lib/liby/Makefile#2 integrate .. //depot/projects/fdt/lib/libypclnt/Makefile#2 integrate .. //depot/projects/fdt/lib/libz/Makefile#2 integrate .. //depot/projects/fdt/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/fdt/libexec/Makefile.inc#2 integrate .. //depot/projects/fdt/libexec/atrun/Makefile#2 integrate .. //depot/projects/fdt/libexec/atrun/atrun.c#2 integrate .. //depot/projects/fdt/libexec/bootpd/Makefile#2 integrate .. //depot/projects/fdt/libexec/bootpd/Makefile.inc#2 integrate .. //depot/projects/fdt/libexec/bootpd/tools/Makefile.inc#2 integrate .. //depot/projects/fdt/libexec/comsat/comsat.c#2 integrate .. //depot/projects/fdt/libexec/fingerd/Makefile#2 integrate .. //depot/projects/fdt/libexec/getty/Makefile#2 integrate .. //depot/projects/fdt/libexec/mail.local/Makefile#2 integrate .. //depot/projects/fdt/libexec/mknetid/Makefile#2 integrate .. //depot/projects/fdt/libexec/pppoed/Makefile#2 integrate .. //depot/projects/fdt/libexec/rbootd/Makefile#2 integrate .. //depot/projects/fdt/libexec/revnetgroup/Makefile#2 integrate .. //depot/projects/fdt/libexec/rpc.rquotad/Makefile#2 integrate .. //depot/projects/fdt/libexec/rpc.rstatd/Makefile#2 integrate .. //depot/projects/fdt/libexec/rpc.rusersd/Makefile#2 integrate .. //depot/projects/fdt/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/fdt/libexec/rpc.rusersd/rusersd.c#2 integrate .. //depot/projects/fdt/libexec/rpc.rwalld/Makefile#2 integrate .. //depot/projects/fdt/libexec/rpc.sprayd/Makefile#2 integrate .. //depot/projects/fdt/libexec/rshd/Makefile#2 integrate .. //depot/projects/fdt/libexec/rtld-aout/shlib.c#2 integrate .. //depot/projects/fdt/libexec/rtld-aout/support.c#2 integrate .. //depot/projects/fdt/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/fdt/libexec/smrsh/Makefile#2 integrate .. //depot/projects/fdt/libexec/talkd/Makefile#2 integrate .. //depot/projects/fdt/libexec/talkd/process.c#2 integrate .. //depot/projects/fdt/libexec/tcpd/Makefile#2 integrate .. //depot/projects/fdt/libexec/tftp-proxy/Makefile#2 integrate .. //depot/projects/fdt/libexec/tftpd/Makefile#2 integrate .. //depot/projects/fdt/libexec/ulog-helper/Makefile#2 integrate .. //depot/projects/fdt/libexec/ypxfr/Makefile#2 integrate .. //depot/projects/fdt/release/Makefile#2 integrate .. //depot/projects/fdt/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/fdt/release/picobsd/build/mfs.mtree#2 integrate .. //depot/projects/fdt/release/picobsd/build/picobsd#3 integrate .. //depot/projects/fdt/release/picobsd/floppy.tree/etc/master.passwd#2 integrate .. //depot/projects/fdt/release/picobsd/floppy.tree/sbin/dhclient-script#1 branch .. //depot/projects/fdt/release/picobsd/qemu/PICOBSD#1 branch .. //depot/projects/fdt/release/picobsd/qemu/PICOBSD.hints#1 branch .. //depot/projects/fdt/release/picobsd/qemu/config#1 branch .. //depot/projects/fdt/release/picobsd/qemu/crunch.conf#1 branch .. //depot/projects/fdt/release/picobsd/qemu/floppy.tree.exclude#1 branch .. //depot/projects/fdt/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/fdt/sbin/dumpfs/dumpfs.c#2 integrate .. //depot/projects/fdt/sbin/fsck_ffs/gjournal.c#2 integrate .. //depot/projects/fdt/sbin/geom/class/cache/Makefile#2 integrate .. //depot/projects/fdt/sbin/geom/class/cache/gcache.8#1 branch .. //depot/projects/fdt/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/fdt/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/fdt/sbin/geom/class/stripe/geom_stripe.c#2 integrate .. //depot/projects/fdt/sbin/geom/core/geom.8#2 integrate .. //depot/projects/fdt/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/fdt/sbin/growfs/growfs.c#2 integrate .. //depot/projects/fdt/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/fdt/sbin/mount/mntopts.h#2 integrate .. //depot/projects/fdt/sbin/mount/mount.8#3 integrate .. //depot/projects/fdt/sbin/mount/mount.c#2 integrate .. //depot/projects/fdt/sbin/mount/vfslist.c#2 integrate .. //depot/projects/fdt/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/fdt/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/fdt/sbin/mount_nullfs/mount_nullfs.c#2 integrate .. //depot/projects/fdt/sbin/natd/natd.c#2 integrate .. //depot/projects/fdt/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/fdt/sbin/nfsiod/nfsiod.8#2 integrate .. //depot/projects/fdt/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/fdt/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/fdt/sbin/rcorder/hash.c#2 integrate .. //depot/projects/fdt/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/fdt/sbin/reboot/reboot.c#4 integrate .. //depot/projects/fdt/sbin/routed/if.c#2 integrate .. //depot/projects/fdt/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/fdt/sbin/tunefs/tunefs.8#2 integrate .. //depot/projects/fdt/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/fdt/sbin/umount/Makefile#2 integrate .. //depot/projects/fdt/sbin/umount/umount.c#2 integrate .. //depot/projects/fdt/secure/Makefile#2 integrate .. //depot/projects/fdt/secure/Makefile.inc#2 integrate .. //depot/projects/fdt/share/examples/Makefile#3 integrate .. //depot/projects/fdt/share/examples/etc/make.conf#2 integrate .. //depot/projects/fdt/share/examples/pppd/auth-down.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/auth-up.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/chap-secrets.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/chat.sh.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/ip-down.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/ip-up.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/options.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/pap-secrets.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/ppp.deny.sample#2 delete .. //depot/projects/fdt/share/examples/pppd/ppp.shells.sample#2 delete .. //depot/projects/fdt/share/examples/slattach/unit-command.sh#2 delete .. //depot/projects/fdt/share/examples/sliplogin/slip.hosts#2 delete .. //depot/projects/fdt/share/examples/sliplogin/slip.login#2 delete .. //depot/projects/fdt/share/examples/sliplogin/slip.logout#2 delete .. //depot/projects/fdt/share/examples/sliplogin/slip.slparms#2 delete .. //depot/projects/fdt/share/examples/startslip/sldown.sh#2 delete .. //depot/projects/fdt/share/examples/startslip/slip.sh#2 delete .. //depot/projects/fdt/share/examples/startslip/slup.sh#2 delete .. //depot/projects/fdt/share/man/man4/Makefile#5 integrate .. //depot/projects/fdt/share/man/man4/gem.4#2 integrate .. //depot/projects/fdt/share/man/man4/ifmib.4#2 integrate .. //depot/projects/fdt/share/man/man4/mfi.4#3 integrate .. //depot/projects/fdt/share/man/man4/mk48txx.4#1 branch .. //depot/projects/fdt/share/man/man4/mwlfw.4#2 integrate .. //depot/projects/fdt/share/man/man4/psm.4#2 integrate .. //depot/projects/fdt/share/man/man4/ste.4#2 integrate .. //depot/projects/fdt/share/man/man4/termios.4#2 integrate .. //depot/projects/fdt/share/man/man4/tty.4#3 integrate .. //depot/projects/fdt/share/man/man4/u3g.4#2 integrate .. //depot/projects/fdt/share/man/man4/ucom.4#2 integrate .. //depot/projects/fdt/share/man/man4/vge.4#2 integrate .. //depot/projects/fdt/share/man/man4/watchdog.4#2 integrate .. //depot/projects/fdt/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/fdt/share/man/man7/security.7#2 integrate .. //depot/projects/fdt/share/man/man9/Makefile#2 integrate .. //depot/projects/fdt/share/man/man9/VFS.9#2 integrate .. //depot/projects/fdt/share/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/fdt/share/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/fdt/share/man/man9/usbdi.9#2 integrate .. //depot/projects/fdt/share/man/man9/vm_page_bits.9#2 integrate .. //depot/projects/fdt/share/misc/bsd-family-tree#3 integrate .. //depot/projects/fdt/share/misc/committers-doc.dot#2 integrate .. //depot/projects/fdt/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/fdt/share/zoneinfo/asia#3 integrate .. //depot/projects/fdt/share/zoneinfo/europe#3 integrate .. //depot/projects/fdt/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/fdt/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/fdt/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/fdt/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/fdt/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/fdt/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/fdt/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/mem.c#2 integrate .. //depot/projects/fdt/sys/arm/conf/AVILA#3 integrate .. //depot/projects/fdt/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/fdt/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/fdt/sys/arm/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/fdt/sys/arm/econa/econa.c#1 branch .. //depot/projects/fdt/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/fdt/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/fdt/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/fdt/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/fdt/sys/arm/econa/files.econa#1 branch .. //depot/projects/fdt/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/fdt/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/fdt/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/fdt/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/fdt/sys/arm/econa/std.econa#1 branch .. //depot/projects/fdt/sys/arm/econa/timer.c#1 branch .. //depot/projects/fdt/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/fdt/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/fdt/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/fdt/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/fdt/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/fdt/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/fdt/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/fdt/sys/boot/common/module.c#2 integrate .. //depot/projects/fdt/sys/boot/i386/Makefile#3 integrate .. //depot/projects/fdt/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/fdt/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/fdt/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/fdt/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/fdt/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/bios.S#3 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/boot.c#3 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/boot.h#3 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/fdt/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/fdt/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/disk.c#3 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/inode.h#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/io.c#3 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/serial_16550.S#3 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/sys.c#3 delete .. //depot/projects/fdt/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/fdt/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/fdt/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/fdt/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/fdt/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/fdt/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/fdt/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/fdt/sys/cam/ata/ata_all.c#6 integrate .. //depot/projects/fdt/sys/cam/ata/ata_da.c#4 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/fdt/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/fdt/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/fdt/sys/conf/Makefile.arm#2 integrate .. //depot/projects/fdt/sys/conf/NOTES#6 integrate .. //depot/projects/fdt/sys/conf/files#8 integrate .. //depot/projects/fdt/sys/conf/files.arm#2 integrate .. //depot/projects/fdt/sys/conf/files.ia64#3 integrate .. //depot/projects/fdt/sys/conf/files.sun4v#2 integrate .. //depot/projects/fdt/sys/conf/options.arm#2 integrate .. //depot/projects/fdt/sys/conf/options.sparc64#2 integrate .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#1 branch .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#2 delete .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu#1 branch .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#2 delete .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#1 branch .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#1 branch .. //depot/projects/fdt/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/fdt/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/fdt/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/fdt/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/fdt/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/fdt/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/fdt/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/fdt/sys/dev/agp/agp.c#2 integrate .. //depot/projects/fdt/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.c#6 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-amd.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-ite.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/fdt/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/fdt/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/fdt/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/fdt/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/fdt/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/fdt/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/fdt/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/fdt/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/fdt/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/fdt/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/fdt/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/fdt/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/fdt/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/fdt/sys/dev/fb/creator.c#2 integrate .. //depot/projects/fdt/sys/dev/fb/fb.c#2 integrate .. //depot/projects/fdt/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/fdt/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/fdt/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/fb/vesa.c#4 integrate .. //depot/projects/fdt/sys/dev/fb/vga.c#2 integrate .. //depot/projects/fdt/sys/dev/fb/vgareg.h#4 integrate .. //depot/projects/fdt/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/fdt/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/fdt/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_xscale.c#1 branch .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_xscale.h#1 branch .. //depot/projects/fdt/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/fdt/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/fdt/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/fdt/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/fdt/sys/dev/isp/isp.c#2 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/fdt/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/fdt/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/fdt/sys/dev/led/led.c#2 integrate .. //depot/projects/fdt/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/fdt/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/fdt/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/fdt/sys/dev/md/md.c#2 integrate .. //depot/projects/fdt/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/fdt/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/fdt/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/fdt/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/fdt/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/fdt/sys/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/fdt/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/fdt/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/fdt/sys/dev/pci/pci.c#4 integrate .. //depot/projects/fdt/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/fdt/sys/dev/siis/siis.c#6 integrate .. //depot/projects/fdt/sys/dev/siis/siis.h#5 integrate .. //depot/projects/fdt/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/fdt/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/fdt/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/fdt/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/fdt/sys/dev/ste/if_ste.c#3 integrate .. //depot/projects/fdt/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/fdt/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/fdt/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/twe/twe.c#2 integrate .. //depot/projects/fdt/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/fdt/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/fdt/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/fdt/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/fdt/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ehci_pci.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/quirk/usb_quirk.h#3 integrate .. //depot/projects/fdt/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/fdt/sys/dev/usb/usbdi.h#4 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/fdt/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/fdt/sys/dev/vge/if_vgereg.h#4 integrate .. //depot/projects/fdt/sys/dev/vge/if_vgevar.h#7 integrate .. //depot/projects/fdt/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/fdt/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/fdt/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/nfs/nfs_commonacl.c#3 integrate .. //depot/projects/fdt/sys/fs/nfs/nfs_var.h#4 integrate .. //depot/projects/fdt/sys/fs/nfsclient/nfs.h#2 integrate .. //depot/projects/fdt/sys/fs/nfsclient/nfs_clbio.c#2 integrate .. //depot/projects/fdt/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate .. //depot/projects/fdt/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/fdt/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate .. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate .. //depot/projects/fdt/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/fdt/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/fdt/sys/geom/geom_dev.c#2 integrate .. //depot/projects/fdt/sys/geom/geom_io.c#2 integrate .. //depot/projects/fdt/sys/geom/geom_slice.c#2 integrate .. //depot/projects/fdt/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/fdt/sys/geom/part/g_part.c#3 integrate .. //depot/projects/fdt/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/fdt/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/fdt/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/fdt/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/fdt/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/fdt/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/fdt/sys/i386/conf/NOTES#4 integrate .. //depot/projects/fdt/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/mem.c#2 integrate .. //depot/projects/fdt/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/fdt/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/fdt/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/bus_machdep.c#1 branch .. //depot/projects/fdt/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/fdt/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/fdt/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/fdt/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/fdt/sys/ia64/include/bus.h#3 integrate .. //depot/projects/fdt/sys/ia64/include/clock.h#2 integrate .. //depot/projects/fdt/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/fdt/sys/ia64/include/mca.h#2 integrate .. //depot/projects/fdt/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/fdt/sys/isa/vga_isa.c#5 integrate .. //depot/projects/fdt/sys/kern/kern_conf.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_event.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_exit.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_jail.c#5 integrate .. //depot/projects/fdt/sys/kern/kern_proc.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/fdt/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/fdt/sys/kern/sched_ule.c#4 integrate .. //depot/projects/fdt/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_bus.c#4 integrate .. //depot/projects/fdt/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_witness.c#2 integrate .. //depot/projects/fdt/sys/kern/tty.c#4 integrate .. //depot/projects/fdt/sys/kern/tty_compat.c#2 integrate .. //depot/projects/fdt/sys/kern/tty_pts.c#2 integrate .. //depot/projects/fdt/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/fdt/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/fdt/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/fdt/sys/mips/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/mips/mips/mem.c#2 integrate .. //depot/projects/fdt/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/iwnfw/iwn1000/Makefile#1 branch .. //depot/projects/fdt/sys/modules/iwnfw/iwn4965/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/iwnfw/iwn5000/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/iwnfw/iwn6000/Makefile#1 branch .. //depot/projects/fdt/sys/net/if.c#5 integrate .. //depot/projects/fdt/sys/net/if.h#4 integrate .. //depot/projects/fdt/sys/net/if_bridge.c#3 integrate .. //depot/projects/fdt/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/fdt/sys/net/if_llatbl.c#2 integrate .. //depot/projects/fdt/sys/net/if_llatbl.h#2 integrate .. //depot/projects/fdt/sys/net/if_var.h#5 integrate .. //depot/projects/fdt/sys/net/if_vlan.c#2 integrate .. //depot/projects/fdt/sys/net/netisr.c#2 integrate .. //depot/projects/fdt/sys/net/route.c#4 integrate .. //depot/projects/fdt/sys/net/route.h#2 integrate .. //depot/projects/fdt/sys/net/rtsock.c#3 integrate .. //depot/projects/fdt/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/fdt/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/fdt/sys/netinet/if_ether.c#2 integrate .. //depot/projects/fdt/sys/netinet/in.c#2 integrate .. //depot/projects/fdt/sys/netinet/in.h#4 integrate .. //depot/projects/fdt/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/fdt/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/fdt/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/fdt/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/fdt/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/fdt/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/fdt/sys/netinet/ip_output.c#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dummynet.c#6 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw2.c#5 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_dynamic.c#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_log.c#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_nat.c#4 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_table.c#3 integrate .. //depot/projects/fdt/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/fdt/sys/netinet/tcp.h#2 integrate .. //depot/projects/fdt/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/fdt/sys/netinet6/in6.c#2 integrate .. //depot/projects/fdt/sys/netinet6/mld6.c#3 integrate .. //depot/projects/fdt/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/fdt/sys/netinet6/nd6.c#4 integrate .. //depot/projects/fdt/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/fdt/sys/nfsclient/krpc_subr.c#3 integrate .. //depot/projects/fdt/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/fdt/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/fdt/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/fdt/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/fdt/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/fdt/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/fdt/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/fdt/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/fdt/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/fdt/sys/sparc64/central/central.c#2 integrate .. //depot/projects/fdt/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/fdt/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/fdt/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/fdt/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/fdt/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/fdt/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/fdt/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/fdt/sys/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/fdt/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/fire.c#1 branch .. //depot/projects/fdt/sys/sparc64/pci/firereg.h#1 branch .. //depot/projects/fdt/sys/sparc64/pci/firevar.h#1 branch .. //depot/projects/fdt/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/fdt/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/fdt/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/fdt/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/fdt/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/fdt/sys/sys/_semaphore.h#2 integrate .. //depot/projects/fdt/sys/sys/_umtx.h#1 branch .. //depot/projects/fdt/sys/sys/acl.h#2 integrate .. //depot/projects/fdt/sys/sys/ata.h#5 integrate .. //depot/projects/fdt/sys/sys/conf.h#3 integrate .. //depot/projects/fdt/sys/sys/copyright.h#2 integrate .. //depot/projects/fdt/sys/sys/disk.h#2 integrate .. //depot/projects/fdt/sys/sys/event.h#2 integrate .. //depot/projects/fdt/sys/sys/file.h#2 integrate .. //depot/projects/fdt/sys/sys/mount.h#2 integrate .. //depot/projects/fdt/sys/sys/param.h#7 integrate .. //depot/projects/fdt/sys/sys/pmc.h#2 integrate .. //depot/projects/fdt/sys/sys/proc.h#3 integrate .. //depot/projects/fdt/sys/sys/semaphore.h#2 delete .. //depot/projects/fdt/sys/sys/tty.h#3 integrate .. //depot/projects/fdt/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/fdt/sys/sys/umtx.h#2 integrate .. //depot/projects/fdt/sys/sys/vnode.h#2 integrate .. //depot/projects/fdt/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/fdt/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/fdt/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/fdt/sys/ufs/ufs/acl.h#2 integrate .. //depot/projects/fdt/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/fdt/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/fdt/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/fdt/sys/vm/device_pager.c#2 integrate .. //depot/projects/fdt/sys/vm/uma_core.c#2 integrate .. //depot/projects/fdt/sys/vm/vm_object.c#2 integrate .. //depot/projects/fdt/sys/vm/vm_object.h#2 integrate .. //depot/projects/fdt/sys/xen/gnttab.c#2 integrate .. //depot/projects/fdt/tools/regression/acct/Makefile#2 integrate .. //depot/projects/fdt/tools/regression/acct/regress.t#2 integrate .. //depot/projects/fdt/tools/regression/acltools/02.t#1 branch .. //depot/projects/fdt/tools/regression/acltools/tools-crossfs.test#2 integrate .. //depot/projects/fdt/tools/regression/bin/date/regress.sh#2 integrate .. //depot/projects/fdt/tools/regression/bin/mv/regress.sh#2 integrate .. //depot/projects/fdt/tools/regression/bin/sh/builtins/builtin1.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/builtins/command6.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/builtins/command6.0.stdout#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/builtins/command7.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/builtins/fc2.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/builtins/type2.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/arith1.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/arith2.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/cmdsubst1.0#1 branch .. //depot/projects/fdt/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/fdt/tools/regression/geom/ConfCmp/ConfCmp.c#2 integrate .. //depot/projects/fdt/tools/regression/posixsem2/Makefile#1 branch .. //depot/projects/fdt/tools/regression/posixsem2/semtest.c#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/Makefile#3 integrate .. //depot/projects/fdt/tools/regression/usr.bin/calendar/regress.sh#2 integrate .. //depot/projects/fdt/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/fdt/tools/regression/usr.bin/lastcomm/values.sh#2 integrate .. //depot/projects/fdt/tools/regression/usr.bin/make/common.sh#2 integrate .. //depot/projects/fdt/tools/regression/usr.bin/make/syntax/directive-t0/Makefile#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/syntax/directive-t0/test.t#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk#1 branch .. //depot/projects/fdt/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate .. //depot/projects/fdt/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate .. //depot/projects/fdt/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/fdt/tools/tools/README#2 integrate .. //depot/projects/fdt/tools/tools/notescheck/Makefile#1 branch .. //depot/projects/fdt/tools/tools/notescheck/notescheck.py#1 branch .. //depot/projects/fdt/usr.bin/Makefile.inc#2 integrate .. //depot/projects/fdt/usr.bin/apply/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/ar/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/ar/acpyacc.y#2 integrate .. //depot/projects/fdt/usr.bin/ar/ar.c#2 integrate .. //depot/projects/fdt/usr.bin/ar/read.c#2 integrate .. //depot/projects/fdt/usr.bin/at/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/at/at.c#2 integrate .. //depot/projects/fdt/usr.bin/atm/sscop/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/awk/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/banner/banner.c#2 integrate .. //depot/projects/fdt/usr.bin/biff/biff.c#2 integrate .. //depot/projects/fdt/usr.bin/bluetooth/bthost/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/bsdiff/Makefile.inc#2 integrate .. //depot/projects/fdt/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/calendar/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/fdt/usr.bin/catman/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/catman/catman.c#2 integrate .. //depot/projects/fdt/usr.bin/chkey/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/chpass/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/colldef/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/compile_et/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/compress/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/cpio/test/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/cpuset/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/ctags/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/ctags/ctags.c#2 integrate .. //depot/projects/fdt/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/fdt/usr.bin/dig/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/du/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/elf2aout/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/elfdump/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/env/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/fetch/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/fetch/fetch.c#3 integrate .. //depot/projects/fdt/usr.bin/file2c/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/find/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/find/function.c#2 integrate .. //depot/projects/fdt/usr.bin/finger/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/finger/extern.h#2 integrate .. //depot/projects/fdt/usr.bin/finger/finger.c#2 integrate .. //depot/projects/fdt/usr.bin/finger/finger.h#2 integrate .. //depot/projects/fdt/usr.bin/finger/lprint.c#3 integrate .. //depot/projects/fdt/usr.bin/finger/net.c#3 integrate .. //depot/projects/fdt/usr.bin/finger/sprint.c#2 integrate .. //depot/projects/fdt/usr.bin/finger/util.c#3 integrate .. //depot/projects/fdt/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/fsync/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/ftp/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/fdt/usr.bin/gencat/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/gencat/gencat.c#3 integrate .. //depot/projects/fdt/usr.bin/getent/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/gprof/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/gprof/aout.c#2 integrate .. //depot/projects/fdt/usr.bin/gzip/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 7 00:06:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE2731065697; Thu, 7 Jan 2010 00:06: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 71A3A1065694 for ; Thu, 7 Jan 2010 00:06:22 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DEB68FC20 for ; Thu, 7 Jan 2010 00:06:22 +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 o0706MwE055175 for ; Thu, 7 Jan 2010 00:06:22 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0706L10055173 for perforce@freebsd.org; Thu, 7 Jan 2010 00:06:21 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 7 Jan 2010 00:06:21 GMT Message-Id: <201001070006.o0706L10055173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 00:06:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=172692 Change 172692 by thompsa@thompsa_pea on 2010/01/07 00:06:04 IFC @172690 Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#7 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#13 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#33 integrate .. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#12 integrate .. //depot/projects/usb/src/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/usb/src/sys/arm/conf/DEFAULTS#4 integrate .. //depot/projects/usb/src/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/files.econa#1 branch .. //depot/projects/usb/src/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/std.econa#1 branch .. //depot/projects/usb/src/sys/arm/econa/timer.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/usb/src/sys/arm/include/cpuconf.h#5 integrate .. //depot/projects/usb/src/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/usb/src/sys/boot/common/module.c#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot0.5/selector.s#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/bios.S#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.c#6 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.h#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/usb/src/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/disk.c#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/inode.h#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/io.c#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial_16550.S#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/sys.c#4 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/usb/src/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/usb/src/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#8 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#7 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#6 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#11 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#10 integrate .. //depot/projects/usb/src/sys/conf/options.arm#12 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#11 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#34 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#12 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#13 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#8 integrate .. //depot/projects/usb/src/sys/dev/exca/excareg.h#3 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#36 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#10 integrate .. //depot/projects/usb/src/sys/dev/mii/tdkphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mk48txx/mk48txx.c#6 integrate .. //depot/projects/usb/src/sys/dev/pccard/card_if.m#4 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#33 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#62 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#95 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#8 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#6 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#9 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#8 integrate .. //depot/projects/usb/src/sys/geom/geom_slice.c#5 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#23 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#18 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/usb/src/sys/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#14 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#32 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#12 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#10 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#15 integrate .. //depot/projects/usb/src/sys/ia64/include/bus.h#4 integrate .. //depot/projects/usb/src/sys/kern/kern_event.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#23 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty.c#35 integrate .. //depot/projects/usb/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#21 integrate .. //depot/projects/usb/src/sys/kern/uipc_sem.c#11 integrate .. //depot/projects/usb/src/sys/mips/conf/DEFAULTS#4 integrate .. //depot/projects/usb/src/sys/net/if.c#44 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#23 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/usb/src/sys/net/if_var.h#33 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#21 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#7 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#33 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_nat.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#29 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#25 integrate .. //depot/projects/usb/src/sys/pc98/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#23 integrate .. //depot/projects/usb/src/sys/powerpc/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#16 integrate .. //depot/projects/usb/src/sys/sparc64/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#14 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psychovar.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/eeprom.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#19 integrate .. //depot/projects/usb/src/sys/sun4v/conf/DEFAULTS#6 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/sys/_semaphore.h#2 integrate .. //depot/projects/usb/src/sys/sys/_umtx.h#1 branch .. //depot/projects/usb/src/sys/sys/copyright.h#6 integrate .. //depot/projects/usb/src/sys/sys/event.h#9 integrate .. //depot/projects/usb/src/sys/sys/param.h#49 integrate .. //depot/projects/usb/src/sys/sys/semaphore.h#3 delete .. //depot/projects/usb/src/sys/sys/tty.h#14 integrate .. //depot/projects/usb/src/sys/sys/umtx.h#9 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libusb/Makefile,v 1.7 2009/07/19 17:25:24 kensmith Exp $ +# $FreeBSD: src/lib/libusb/Makefile,v 1.8 2010/01/02 09:58:07 ed Exp $ # # Makefile for the FreeBSD specific LibUSB 2.0 # @@ -16,6 +16,8 @@ MKLINT= no NOGCCERROR= +WARNS?= 2 + MLINKS+= libusb.3 usb.3 # libusb 0.1 compat ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.20 2009/12/16 02:17:43 dougb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.21 2010/01/04 21:30:04 imp Exp $ machine amd64 @@ -20,10 +20,3 @@ options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR - -# Store the plain version of the configuration file in the kernel itself. -# To store the entire file, including comments, put this in /etc/src.conf: -# CONFIGARGS= -C -# See config(8) for more details. -# -options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#33 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.534 2009/10/13 19:02:03 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.535 2010/01/03 20:40:54 brooks Exp $ cpu HAMMER ident GENERIC @@ -274,6 +274,7 @@ device loop # Network loopback device random # Entropy device device ether # Ethernet support +device vlan # 802.1Q VLAN support device tun # Packet tunnel. device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" ==== //depot/projects/usb/src/sys/amd64/include/cpufunc.h#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.155 2009/09/30 16:34:50 avg Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.156 2010/01/01 20:55:11 obrien Exp $ */ /* @@ -190,28 +190,28 @@ } static __inline void -insb(u_int port, void *addr, size_t cnt) +insb(u_int port, void *addr, size_t count) { __asm __volatile("cld; rep; insb" - : "+D" (addr), "+c" (cnt) + : "+D" (addr), "+c" (count) : "d" (port) : "memory"); } static __inline void -insw(u_int port, void *addr, size_t cnt) +insw(u_int port, void *addr, size_t count) { __asm __volatile("cld; rep; insw" - : "+D" (addr), "+c" (cnt) + : "+D" (addr), "+c" (count) : "d" (port) : "memory"); } static __inline void -insl(u_int port, void *addr, size_t cnt) +insl(u_int port, void *addr, size_t count) { __asm __volatile("cld; rep; insl" - : "+D" (addr), "+c" (cnt) + : "+D" (addr), "+c" (count) : "d" (port) : "memory"); } @@ -244,26 +244,26 @@ } static __inline void -outsb(u_int port, const void *addr, size_t cnt) +outsb(u_int port, const void *addr, size_t count) { __asm __volatile("cld; rep; outsb" - : "+S" (addr), "+c" (cnt) + : "+S" (addr), "+c" (count) : "d" (port)); } static __inline void -outsw(u_int port, const void *addr, size_t cnt) +outsw(u_int port, const void *addr, size_t count) { __asm __volatile("cld; rep; outsw" - : "+S" (addr), "+c" (cnt) + : "+S" (addr), "+c" (count) : "d" (port)); } static __inline void -outsl(u_int port, const void *addr, size_t cnt) +outsl(u_int port, const void *addr, size_t count) { __asm __volatile("cld; rep; outsl" - : "+S" (addr), "+c" (cnt) + : "+S" (addr), "+c" (count) : "d" (port)); } @@ -670,9 +670,9 @@ void ia32_pause(void); u_char inb(u_int port); u_int inl(u_int port); -void insb(u_int port, void *addr, size_t cnt); -void insl(u_int port, void *addr, size_t cnt); -void insw(u_int port, void *addr, size_t cnt); +void insb(u_int port, void *addr, size_t count); +void insl(u_int port, void *addr, size_t count); +void insw(u_int port, void *addr, size_t count); register_t intr_disable(void); void intr_restore(register_t rf); void invd(void); @@ -697,9 +697,9 @@ void ltr(u_short sel); void outb(u_int port, u_char data); void outl(u_int port, u_int data); -void outsb(u_int port, const void *addr, size_t cnt); -void outsl(u_int port, const void *addr, size_t cnt); -void outsw(u_int port, const void *addr, size_t cnt); +void outsb(u_int port, const void *addr, size_t count); +void outsl(u_int port, const void *addr, size_t count); +void outsw(u_int port, const void *addr, size_t count); void outw(u_int port, u_short data); u_long rcr0(void); u_long rcr2(void); ==== //depot/projects/usb/src/sys/arm/arm/cpufunc.c#12 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.29 2009/10/03 13:59:15 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.30 2010/01/04 03:35:45 rpaulo Exp $"); #include #include @@ -781,6 +781,73 @@ xscale_setup /* cpu setup */ }; #endif /* CPU_XSCALE_81342 */ + + +#if defined(CPU_FA526) +struct cpu_functions fa526_cpufuncs = { + /* CPU functions */ + + .cf_id = cpufunc_id, + .cf_cpwait = cpufunc_nullop, + + /* MMU functions */ + + .cf_control = cpufunc_control, + .cf_domains = cpufunc_domains, + .cf_setttb = fa526_setttb, + .cf_faultstatus = cpufunc_faultstatus, + .cf_faultaddress = cpufunc_faultaddress, + + /* TLB functions */ + + .cf_tlb_flushID = armv4_tlb_flushID, + .cf_tlb_flushID_SE = fa526_tlb_flushID_SE, + .cf_tlb_flushI = armv4_tlb_flushI, + .cf_tlb_flushI_SE = fa526_tlb_flushI_SE, + .cf_tlb_flushD = armv4_tlb_flushD, + .cf_tlb_flushD_SE = armv4_tlb_flushD_SE, + + /* Cache operations */ + + .cf_icache_sync_all = fa526_icache_sync_all, + .cf_icache_sync_range = fa526_icache_sync_range, + + .cf_dcache_wbinv_all = fa526_dcache_wbinv_all, + .cf_dcache_wbinv_range = fa526_dcache_wbinv_range, + .cf_dcache_inv_range = fa526_dcache_inv_range, + .cf_dcache_wb_range = fa526_dcache_wb_range, + + .cf_idcache_wbinv_all = fa526_idcache_wbinv_all, + .cf_idcache_wbinv_range = fa526_idcache_wbinv_range, + + + .cf_l2cache_wbinv_all = cpufunc_nullop, + .cf_l2cache_wbinv_range = (void *)cpufunc_nullop, + .cf_l2cache_inv_range = (void *)cpufunc_nullop, + .cf_l2cache_wb_range = (void *)cpufunc_nullop, + + + /* Other functions */ + + .cf_flush_prefetchbuf = fa526_flush_prefetchbuf, + .cf_drain_writebuf = armv4_drain_writebuf, + .cf_flush_brnchtgt_C = cpufunc_nullop, + .cf_flush_brnchtgt_E = fa526_flush_brnchtgt_E, + + .cf_sleep = fa526_cpu_sleep, + + /* Soft functions */ + + .cf_dataabt_fixup = cpufunc_null_fixup, + .cf_prefetchabt_fixup = cpufunc_null_fixup, + + .cf_context_switch = fa526_context_switch, + + .cf_setup = fa526_setup +}; +#endif /* CPU_FA526 */ + + /* * Global constants also used by locore.s */ @@ -793,6 +860,7 @@ defined (CPU_ARM9E) || defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_FA526) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -1073,6 +1141,19 @@ goto out; } #endif /* CPU_SA1110 */ +#ifdef CPU_FA526 + if (cputype == CPU_ID_FA526) { + cpufuncs = fa526_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* SA needs it */ + get_cachetype_cp15(); + pmap_pte_init_generic(); + + /* Use powersave on this CPU. */ + cpu_do_powersave = 1; + + goto out; + } +#endif /* CPU_FA526 */ #ifdef CPU_IXP12X0 if (cputype == CPU_ID_IXP1200) { cpufuncs = ixp12x0_cpufuncs; @@ -1547,7 +1628,8 @@ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ - defined(CPU_ARM10) || defined(CPU_ARM11) + defined(CPU_ARM10) || defined(CPU_ARM11) || \ + defined(CPU_FA526) #define IGN 0 #define OR 1 @@ -2013,6 +2095,62 @@ } #endif /* CPU_SA1100 || CPU_SA1110 */ +#if defined(CPU_FA526) +struct cpu_option fa526_options[] = { +#ifdef COMPAT_12 + { "nocache", IGN, BIC, (CPU_CONTROL_IC_ENABLE | + CPU_CONTROL_DC_ENABLE) }, + { "nowritebuf", IGN, BIC, CPU_CONTROL_WBUF_ENABLE }, +#endif /* COMPAT_12 */ + { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | + CPU_CONTROL_DC_ENABLE) }, + { "cpu.nocache", OR, BIC, (CPU_CONTROL_IC_ENABLE | + CPU_CONTROL_DC_ENABLE) }, + { "cpu.writebuf", BIC, OR, CPU_CONTROL_WBUF_ENABLE }, + { "cpu.nowritebuf", OR, BIC, CPU_CONTROL_WBUF_ENABLE }, + { NULL, IGN, IGN, 0 } +}; + +void +fa526_setup(char *args) +{ + int cpuctrl, cpuctrlmask; + + cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE + | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE; + cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE + | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE + | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE + | CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE + | CPU_CONTROL_CPCLK | CPU_CONTROL_VECRELOC; + +#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS + cpuctrl |= CPU_CONTROL_AFLT_ENABLE; +#endif + + cpuctrl = parse_cpu_options(args, fa526_options, cpuctrl); + +#ifdef __ARMEB__ + cpuctrl |= CPU_CONTROL_BEND_ENABLE; +#endif + + if (vector_page == ARM_VECTORS_HIGH) + cpuctrl |= CPU_CONTROL_VECRELOC; + + /* Clear out the cache */ + cpu_idcache_wbinv_all(); + + /* Set the control register */ + ctrl = cpuctrl; + cpu_control(0xffffffff, cpuctrl); +} +#endif /* CPU_FA526 */ + + #if defined(CPU_IXP12X0) struct cpu_option ixp12x0_options[] = { { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, ==== //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.25 2009/06/21 21:38:12 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.26 2010/01/04 03:35:45 rpaulo Exp $"); #include #include #include @@ -57,6 +57,8 @@ #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_FA526) +#define cpu_idcache_wbinv_all fa526_idcache_wbinv_all #elif defined(CPU_ARM9E) #define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) ==== //depot/projects/usb/src/sys/arm/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/arm # -# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.3 2009/12/16 02:17:43 dougb Exp $ +# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.4 2010/01/04 21:30:04 imp Exp $ machine arm @@ -9,10 +9,3 @@ options GEOM_PART_BSD options GEOM_PART_MBR - -# Store the plain version of the configuration file in the kernel itself. -# To store the entire file, including comments, put this in /etc/src.conf: -# CONFIGARGS= -C -# See config(8) for more details. -# -options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/arm/include/cpuconf.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.12 2007/11/01 10:01:15 kevlo Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.13 2010/01/04 03:35:45 rpaulo Exp $ * */ @@ -61,6 +61,7 @@ defined(CPU_XSCALE_80200) + \ defined(CPU_XSCALE_80321) + \ defined(CPU_XSCALE_PXA2X0) + \ + defined(CPU_FA526) + \ defined(CPU_XSCALE_IXP425)) /* @@ -68,7 +69,7 @@ */ #if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ - defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425)) + defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425) || defined(CPU_FA526)) #define ARM_ARCH_4 1 #else #define ARM_ARCH_4 0 @@ -125,7 +126,7 @@ #if (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) || \ defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM9E) || \ - defined(CPU_ARM10) || defined(CPU_ARM11)) + defined(CPU_ARM10) || defined(CPU_ARM11) || defined(CPU_FA526)) #define ARM_MMU_GENERIC 1 #else #define ARM_MMU_GENERIC 0 ==== //depot/projects/usb/src/sys/arm/include/cpufunc.h#8 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.15 2009/01/09 10:45:04 raj Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.16 2010/01/04 03:35:45 rpaulo Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -283,6 +283,28 @@ u_int arm8_clock_config (u_int, u_int); #endif + +#ifdef CPU_FA526 +void fa526_setup (char *arg); +void fa526_setttb (u_int ttb); +void fa526_context_switch (void); +void fa526_cpu_sleep (int); +void fa526_tlb_flushI_SE (u_int); +void fa526_tlb_flushID_SE (u_int); +void fa526_flush_prefetchbuf (void); +void fa526_flush_brnchtgt_E (u_int); + +void fa526_icache_sync_all (void); +void fa526_icache_sync_range(vm_offset_t start, vm_size_t end); +void fa526_dcache_wbinv_all (void); +void fa526_dcache_wbinv_range(vm_offset_t start, vm_size_t end); +void fa526_dcache_inv_range (vm_offset_t start, vm_size_t end); +void fa526_dcache_wb_range (vm_offset_t start, vm_size_t end); +void fa526_idcache_wbinv_all(void); +void fa526_idcache_wbinv_range(vm_offset_t start, vm_size_t end); +#endif + + #ifdef CPU_SA110 void sa110_setup (char *string); void sa110_context_switch (void); @@ -445,6 +467,7 @@ #if defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_ARM10) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_FA526) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) ==== //depot/projects/usb/src/sys/boot/common/module.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.28 2009/02/16 02:42:17 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.29 2009/12/31 12:17:38 nyan Exp $"); /* * file/module function dispatcher, support, etc. @@ -351,6 +351,9 @@ char *cp; int fd, got; vm_offset_t laddr; +#ifdef PC98 + struct stat st; +#endif /* We can't load first */ if ((file_findfile(NULL, NULL)) == NULL) { @@ -372,6 +375,14 @@ return(CMD_ERROR); } +#ifdef PC98 + /* We cannot use 15M-16M area on pc98. */ + if (loadaddr < 0x1000000 && + fstat(fd, &st) == 0 && + (st.st_size == -1 || loadaddr + st.st_size > 0xf00000)) + loadaddr = 0x1000000; +#endif + laddr = loadaddr; for (;;) { /* read in 4k chunks; size is not really important */ @@ -477,6 +488,14 @@ ; do { +#ifdef PC98 + /* We cannot use 15M-16M area on pc98. */ + struct stat st; + if (loadaddr < 0x1000000 && + stat(filename, &st) == 0 && + (st.st_size == -1 || loadaddr + st.st_size > 0xf00000)) + loadaddr = 0x1000000; +#endif err = file_load(filename, loadaddr, &fp); if (err) break; ==== //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#5 (text+ko) ==== @@ -1,13 +1,13 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.9 2009/09/13 11:20:17 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.10 2009/12/31 12:17:38 nyan Exp $ BINDIR?= /boot LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ - -Os + -Os -DPC98 LDFLAGS+= -nostdlib # BTX components ==== //depot/projects/usb/src/sys/boot/pc98/boot0.5/selector.s#3 (text+ko) ==== @@ -25,7 +25,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/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.4 2010/01/02 17:32:40 mbr Exp $ # .code16 @@ -35,7 +35,7 @@ # Display partition table. # showpartitions: - # Clear partion table area + # Clear partition table area movw $16, %cx clear_part: push %cx ==== //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#4 (text+ko) ==== @@ -1,119 +1,104 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.25 2009/12/11 12:36:59 nyan Exp $ -# +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.26 2009/12/31 15:03:33 nyan Exp $ + +FILES= boot boot1 boot2 + +NM?= nm -PROG= boot -# Order is very important on the SRCS line for this prog -SRCS= start.S table.c boot2.S boot.c asm.S bios.S serial.S -SRCS+= probe_keyboard.c io.c disk.c sys.c +BOOT_COMCONSOLE_PORT?= 0x238 +BOOT_COMCONSOLE_SPEED?= 9600 +B2SIOFMT?= 0x3 -BINMODE= 444 -CFLAGS= -Os -mrtd \ - -fno-guess-branch-probability \ - -fno-unit-at-a-time \ - -D_KERNEL -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT} -CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} -CFLAGS+= -I${.CURDIR}/../../.. -I. +REL1= 0x700 +ORG1= 0 +ORG2= 0x2000 -# By default, if a serial port is going to be used as console, use COM1 -# (aka /dev/ttyd0). -#BOOT_COMCONSOLE_PORT?=0x30 -BOOT_COMCONSOLE_PORT?=0x238 -BOOT_COMCONSOLE_CLK?=16 -BOOT_COMCONSOLE_MODE=0x0c -CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \ - -DCOMCONSOLE_CLK=${BOOT_COMCONSOLE_CLK} \ - -DCOMCONSOLE_MODE=${BOOT_COMCONSOLE_MODE} +# Decide level of UFS support. +BOOT2_UFS?= UFS1_AND_UFS2 +#BOOT2_UFS?= UFS2_ONLY +#BOOT2_UFS?= UFS1_ONLY -# feature not implemented -BOOT_COMCONSOLE_SPEED?=9600 -CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} +CFLAGS= -Os \ + -fno-guess-branch-probability \ + -fomit-frame-pointer \ + -fno-unit-at-a-time \ + -mno-align-long-strings \ + -mrtd \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ + -D${BOOT2_UFS} \ + -DFLAGS=${BOOT_BOOT1_FLAGS} \ + -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ + -DSIOFMT=${B2SIOFMT} \ + -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ + -I${.CURDIR}/../../.. \ + -I${.CURDIR}/../../i386/boot2 \ + -I${.CURDIR}/../../common \ + -I${.CURDIR}/../btx/lib -I. \ + -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 # Set machine type to PC98_SYSTEM_PARAMETER -CFLAGS+= -DSET_MACHINE_TYPE +#CFLAGS+= -DSET_MACHINE_TYPE # Initialize the bi_bios_geom using the BIOS geometry -CFLAGS+= -DGET_BIOSGEOM +#CFLAGS+= -DGET_BIOSGEOM -# Enable code to take the default boot string from a fixed location on the -# disk. See nextboot(8) and README.386BSD for more info. -#CFLAGS+= -DNAMEBLOCK -#CFLAGS+= -DNAMEBLOCK_WRITEBACK +LDFLAGS=-static -N --gc-sections -# Bias the conversion from the BIOS drive number to the FreeBSD unit number -# for hard disks. This may be useful for people booting in a mixed IDE/SCSI -# environment (set BOOT_HD_BIAS to the number of IDE drives). -#CFLAGS+= -DBOOT_HD_BIAS=1 -# -# Details: this only applies if BOOT_HD_BIAS > 0. If the BIOS drive number -# for the boot drive is >= BOOT_HD_BIAS, then the boot drive is assumed to -# be SCSI and have unit number (BIOS_drive_number - BOOT_HD_BIAS). E.g., -# BOOT_HD_BIAS=1 makes BIOS drive 1 correspond to 1:da(0,a) instead of -# 1:wd(1,a). If `da' is given explicitly, then the drive is assumed to be -# SCSI and have BIOS drive number (da_unit_number + BOOT_HD_BIAS). E.g., -# BOOT_HD_BIAS=1 makes da(0,a) correspond to 1:da(0,a) instead of 0:da(0,a). +# Pick up ../Makefile.inc early. +.include -CLEANFILES+= boot.nohdr boot.strip boot.ldr boot1 boot2 sizetest -LDFLAGS+= -N -Ttext 0 -e start -NO_SHARED= YES -NO_MAN= -STRIP= +.PATH: ${.CURDIR}/../../i386/boot2 -# tunable timeout parameter, waiting for keypress, calibrated in ms -BOOTWAIT?= 5000 -# tunable timeout during string input, calibrated in ms -#TIMEOUT?= 30000 +CLEANFILES= boot -# Location that boot2 is loaded at -BOOTSEG= 0x1000 +boot: boot1 boot2 + cat boot1 boot2 > boot -# Offset in BOOTSEG for the top of the stack, keep this 16 byte aligned -BOOTSTACK= 0xFFF0 +CLEANFILES+= boot1 boot1.out boot1.o -boot.nohdr: boot - objcopy -S -O binary boot boot.nohdr - ls -l boot.nohdr +boot1: boot1.out + objcopy -S -O binary boot1.out ${.TARGET} -boot.ldr: boot.nohdr - dd if=boot.nohdr of=boot.ldr bs=8192 count=1 conv=sync +boot1.out: boot1.o + ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o -boot1: boot.nohdr - dd if=boot.nohdr of=boot1 bs=512 count=1 +CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ + boot2.s boot2.s.tmp boot2.h sio.o -boot2: boot.nohdr - dd if=boot.nohdr of=boot2 bs=512 skip=1 - @dd if=boot2 skip=14 of=sizetest 2> /dev/null - @if [ -s sizetest ] ; then \ - echo "boot2 is too big" >&2 ; \ - rm boot2 ; \ - exit 2 ; \ - fi +boot2: boot2.ld + @set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \ + echo "$$x bytes available"; test $$x -ge 0 + dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync -all: boot.ldr boot1 boot2 +boot2.ld: boot2.ldr boot2.bin ${BTXKERN} + btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \ + -o ${.TARGET} -P 1 boot2.bin -install: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - boot.ldr ${DESTDIR}${BINDIR}/boot - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - boot1 boot2 ${DESTDIR}${BINDIR} +boot2.ldr: + dd if=/dev/zero of=${.TARGET} bs=276 count=1 -# If it's not there, don't consider it a target -.if exists(${.CURDIR}/../../../pc98/include) -beforedepend ${OBJS}: machine +boot2.bin: boot2.out + objcopy -S -O binary boot2.out ${.TARGET} -machine: - ln -sf ${.CURDIR}/../../../pc98/include machine +boot2.out: ${BTXCRT} boot2.o sio.o + ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} -.endif +boot2.o: boot2.s -.if exists(${.CURDIR}/../../../i386/include) -beforedepend ${OBJS}: i386 +SRCS= boot2.c boot2.h -i386: - ln -sf ${.CURDIR}/../../../i386/include i386 +boot2.s: boot2.c boot2.h ${.CURDIR}/../../common/ufsread.c + ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.CURDIR}/boot2.c + sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s + rm -f boot2.s.tmp -.endif +boot2.h: boot1.out + ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T (read|putc)/ \ + { x = $$1 - ORG1; \ + printf("#define %sORG %#x\n", toupper($$3), REL1 + x) }' \ + ORG1=`printf "%d" ${ORG1}` \ + REL1=`printf "%d" ${REL1}` > ${.TARGET} -CLEANFILES+= machine i386 - -CWARNFLAGS!= ${MAKE} -f bsd.own.mk -f ${.CURDIR}/../../../conf/kern.mk -V CWARNFLAGS .include ==== //depot/projects/usb/src/sys/boot/pc98/libpc98/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.26 2009/03/19 13:53:42 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.27 2009/12/31 12:05:48 nyan Exp $ # LIB= pc98 INTERNALLIB= @@ -8,7 +8,7 @@ SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c \ comconsole.c devicename.c elf32_freebsd.c \ - i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ + i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \ time.c vidconsole.c # Enable PXE TFTP or NFS support, not both. ==== //depot/projects/usb/src/sys/boot/pc98/loader/main.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.29 2009/12/08 13:06:35 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.30 2009/12/31 12:05:48 nyan Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -40,6 +40,7 @@ #include "bootstrap.h" #include "libi386/libi386.h" +#include "libpc98/libpc98.h" #include "btxv86.h" #define KARGS_FLAGS_CD 0x1 @@ -81,6 +82,9 @@ { int i; + /* Set machine type to PC98_SYSTEM_PARAMETER. */ + set_machine_type(); + /* Pick up arguments */ kargs = (void *)__args; initial_howto = kargs->howto; ==== //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.7 2009/12/09 20:36:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.9 2010/01/06 23:11:56 delphij Exp $"); /* * Stand-alone ZFS file reader. @@ -404,7 +404,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 7 11:28:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B21E106568B; Thu, 7 Jan 2010 11:28: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 3FC941065676 for ; Thu, 7 Jan 2010 11:28:47 +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 2DAEF8FC19 for ; Thu, 7 Jan 2010 11:28: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 o07BSljR049386 for ; Thu, 7 Jan 2010 11:28:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07BSlni049384 for perforce@freebsd.org; Thu, 7 Jan 2010 11:28:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 7 Jan 2010 11:28:47 GMT Message-Id: <201001071128.o07BSlni049384@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 Precedence: bulk Cc: Subject: PERFORCE change 172720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 11:28:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=172720 Change 172720 by hselasky@hselasky_laptop001 on 2010/01/07 11:28:38 Add new USB ID. PR: usb/142387 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#96 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#96 (text+ko) ==== @@ -2011,6 +2011,7 @@ product NETGEAR3 WG111T_NF 0x4251 WG111T (no firmware) product NETGEAR3 WPN111 0x5f00 WPN111 product NETGEAR3 WPN111_NF 0x5f01 WPN111 (no firmware) +product NETGEAR3 WPN111_2 0x5f02 WPN111 /* Nikon products */ product NIKON E990 0x0102 Digital Camera E990 ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#17 (text+ko) ==== @@ -188,6 +188,7 @@ UATH_DEV(NETGEAR, WG111U), UATH_DEV(NETGEAR3, WG111T), UATH_DEV(NETGEAR3, WPN111), + UATH_DEV(NETGEAR3, WPN111_2), UATH_DEV(UMEDIA, TEW444UBEU), UATH_DEV(UMEDIA, AR5523_2), UATH_DEV(UMEDIA, AR5523_3), From owner-p4-projects@FreeBSD.ORG Thu Jan 7 11:51:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18F481065670; Thu, 7 Jan 2010 11:51: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 D1A7A106566B for ; Thu, 7 Jan 2010 11:51:09 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFCF18FC12 for ; Thu, 7 Jan 2010 11:51: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 o07Bp90j051222 for ; Thu, 7 Jan 2010 11:51:09 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07Bp9iQ051220 for perforce@freebsd.org; Thu, 7 Jan 2010 11:51:09 GMT (envelope-from raj@freebsd.org) Date: Thu, 7 Jan 2010 11:51:09 GMT Message-Id: <201001071151.o07Bp9iQ051220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 11:51:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=172722 Change 172722 by raj@raj_fdt on 2010/01/07 11:50:47 Unobfuscate the code. Submitted by: imp Affected files ... .. //depot/projects/fdt/sys/dev/tsec/if_tsec_fdt.c#2 edit .. //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#2 edit Differences ... ==== //depot/projects/fdt/sys/dev/tsec/if_tsec_fdt.c#2 (text+ko) ==== @@ -232,8 +232,8 @@ { int error; - (*ires) = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, irid, RF_ACTIVE); - if ((*ires) == NULL) { + *ires = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, irid, RF_ACTIVE); + if (*ires == NULL) { device_printf(sc->dev, "could not allocate %s IRQ\n", iname); return (ENXIO); } @@ -243,7 +243,7 @@ device_printf(sc->dev, "failed to set up %s IRQ\n", iname); if (bus_release_resource(sc->dev, SYS_RES_IRQ, *irid, *ires)) device_printf(sc->dev, "could not release %s IRQ\n", iname); - (*ires) = NULL; + *ires = NULL; return (error); } return (0); ==== //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#2 (text+ko) ==== @@ -63,15 +63,15 @@ phandle_t node; pcell_t clock, shift; - if (ofw_bus_is_compatible(dev, "ns16550")) { - sc = device_get_softc(dev); - sc->sc_class = &uart_ns8250_class; + if (!ofw_bus_is_compatible(dev, "ns16550")) + return (ENXIO); + + sc = device_get_softc(dev); + sc->sc_class = &uart_ns8250_class; - node = ofw_bus_get_node(dev); - if ((OF_getprop(node, "clock-frequency", &clock, - sizeof(clock))) <= 0) - return (ENXIO); - } else + node = ofw_bus_get_node(dev); + if ((OF_getprop(node, "clock-frequency", &clock, + sizeof(clock))) <= 0) return (ENXIO); if (clock == 0) From owner-p4-projects@FreeBSD.ORG Thu Jan 7 16:59:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F8E51065670; Thu, 7 Jan 2010 16:59:19 +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 5253E106566B for ; Thu, 7 Jan 2010 16:59:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F0088FC08 for ; Thu, 7 Jan 2010 16:59:19 +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 o07GxJ4c000733 for ; Thu, 7 Jan 2010 16:59:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07GxJw3000731 for perforce@freebsd.org; Thu, 7 Jan 2010 16:59:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 7 Jan 2010 16:59:19 GMT Message-Id: <201001071659.o07GxJw3000731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 16:59:19 -0000 http://p4web.freebsd.org/chv.cgi?CH=172735 Change 172735 by rwatson@rwatson_fledge on 2010/01/07 16:59:06 Allow 0% minspace to be specified by the admin without crashing auditd. Submitted by: Andrew Pantyukhin Affected files ... .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#12 $ */ #include @@ -606,7 +606,7 @@ while (getacdir(cur_dir, MAXNAMLEN) >= 0) { if (statfs(cur_dir, &sfs) < 0) continue; /* XXX should warn */ - soft = (sfs.f_bfree < (sfs.f_blocks / (100 / auditd_minval))) ? + soft = (sfs.f_bfree < (sfs.f_blocks * auditd_minval / 100 )) ? 1 : 0; hard = (sfs.f_bfree < AUDIT_HARD_LIMIT_FREE_BLOCKS) ? 1 : 0; if (soft) { From owner-p4-projects@FreeBSD.ORG Thu Jan 7 17:12:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 037651065697; Thu, 7 Jan 2010 17:12:33 +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 BBF90106566B for ; Thu, 7 Jan 2010 17:12:32 +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 A9E098FC20 for ; Thu, 7 Jan 2010 17:12: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 o07HCWtI002852 for ; Thu, 7 Jan 2010 17:12:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07HCWZs002850 for perforce@freebsd.org; Thu, 7 Jan 2010 17:12:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 7 Jan 2010 17:12:32 GMT Message-Id: <201001071712.o07HCWZs002850@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 Precedence: bulk Cc: Subject: PERFORCE change 172736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 17:12:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=172736 Change 172736 by hselasky@hselasky_laptop001 on 2010/01/07 17:12:11 Add new USB ID. PR: usb/142427 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#97 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#97 (text+ko) ==== @@ -667,6 +667,7 @@ vendor SITECOM 0x6189 Sitecom vendor ARKMICRO 0x6547 Arkmicro Technologies Inc. vendor 3COM2 0x6891 3Com +vendor EDIMAX 0x7392 Edimax vendor INTEL 0x8086 Intel vendor INTEL2 0x8087 Intel vendor SITECOM2 0x9016 Sitecom @@ -1257,6 +1258,9 @@ /* Dynastream Innovations */ product DYNASTREAM ANTDEVBOARD 0x1003 ANT dev board +/* Edimax products */ +product EDIMAX EW7318USG 0x7318 USB Wireless dongle + /* Eicon Networks */ product EICON DIVA852 0x4905 Diva 852 ISDN TA ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#21 (text+ko) ==== @@ -104,6 +104,7 @@ RUM_DEV(COREGA, CGWLUSB2GPX), RUM_DEV(DICKSMITH, CWD854F), RUM_DEV(DICKSMITH, RT2573), + RUM_DEV(EDIMAX, EW7318USG), RUM_DEV(DLINK2, DWLG122C1), RUM_DEV(DLINK2, WUA1340), RUM_DEV(DLINK2, DWA111), From owner-p4-projects@FreeBSD.ORG Fri Jan 8 16:25:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0F8D1065679; Fri, 8 Jan 2010 16:25: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 A2931106566C for ; Fri, 8 Jan 2010 16:25:15 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D6B18FC15 for ; Fri, 8 Jan 2010 16:25: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 o08GPFw3082793 for ; Fri, 8 Jan 2010 16:25:15 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o08GP1wk082717 for perforce@freebsd.org; Fri, 8 Jan 2010 16:25:01 GMT (envelope-from bz@freebsd.org) Date: Fri, 8 Jan 2010 16:25:01 GMT Message-Id: <201001081625.o08GP1wk082717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 16:25:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=172775 Change 172775 by bz@bz_dumpster on 2010/01/08 16:24:49 IFC @172774 Affected files ... .. //depot/projects/s390/COPYRIGHT#7 integrate .. //depot/projects/s390/MAINTAINERS#18 integrate .. //depot/projects/s390/Makefile.inc1#32 integrate .. //depot/projects/s390/ObsoleteFiles.inc#12 integrate .. //depot/projects/s390/UPDATING#24 integrate .. //depot/projects/s390/bin/Makefile#8 integrate .. //depot/projects/s390/bin/date/Makefile#3 integrate .. //depot/projects/s390/bin/date/date.c#6 integrate .. //depot/projects/s390/bin/getfacl/getfacl.1#9 integrate .. //depot/projects/s390/bin/kenv/kenv.c#5 integrate .. //depot/projects/s390/bin/pax/ftree.c#5 integrate .. //depot/projects/s390/bin/pax/sel_subs.c#5 integrate .. //depot/projects/s390/bin/pkill/pkill.c#3 integrate .. //depot/projects/s390/bin/ps/keyword.c#12 integrate .. //depot/projects/s390/bin/pwait/Makefile#1 branch .. //depot/projects/s390/bin/pwait/pwait.1#1 branch .. //depot/projects/s390/bin/pwait/pwait.c#1 branch .. //depot/projects/s390/bin/setfacl/merge.c#4 integrate .. //depot/projects/s390/bin/setfacl/remove.c#4 integrate .. //depot/projects/s390/bin/setfacl/setfacl.h#5 integrate .. //depot/projects/s390/bin/setfacl/util.c#3 integrate .. //depot/projects/s390/bin/sh/alias.c#8 integrate .. //depot/projects/s390/bin/sh/alias.h#3 integrate .. //depot/projects/s390/bin/sh/arith.h#6 integrate .. //depot/projects/s390/bin/sh/arith.y#7 integrate .. //depot/projects/s390/bin/sh/arith_lex.l#6 integrate .. //depot/projects/s390/bin/sh/cd.c#6 integrate .. //depot/projects/s390/bin/sh/error.c#5 integrate .. //depot/projects/s390/bin/sh/error.h#4 integrate .. //depot/projects/s390/bin/sh/eval.c#13 integrate .. //depot/projects/s390/bin/sh/eval.h#6 integrate .. //depot/projects/s390/bin/sh/exec.c#12 integrate .. //depot/projects/s390/bin/sh/exec.h#7 integrate .. //depot/projects/s390/bin/sh/expand.c#13 integrate .. //depot/projects/s390/bin/sh/expand.h#4 integrate .. //depot/projects/s390/bin/sh/histedit.c#8 integrate .. //depot/projects/s390/bin/sh/input.c#7 integrate .. //depot/projects/s390/bin/sh/input.h#4 integrate .. //depot/projects/s390/bin/sh/jobs.c#11 integrate .. //depot/projects/s390/bin/sh/mail.c#3 integrate .. //depot/projects/s390/bin/sh/main.c#7 integrate .. //depot/projects/s390/bin/sh/main.h#3 integrate .. //depot/projects/s390/bin/sh/memalloc.c#9 integrate .. //depot/projects/s390/bin/sh/memalloc.h#5 integrate .. //depot/projects/s390/bin/sh/miscbltin.c#9 integrate .. //depot/projects/s390/bin/sh/mkbuiltins#6 integrate .. //depot/projects/s390/bin/sh/mkinit.c#4 integrate .. //depot/projects/s390/bin/sh/mksyntax.c#7 integrate .. //depot/projects/s390/bin/sh/myhistedit.h#4 integrate .. //depot/projects/s390/bin/sh/mystring.c#3 integrate .. //depot/projects/s390/bin/sh/options.c#6 integrate .. //depot/projects/s390/bin/sh/options.h#4 integrate .. //depot/projects/s390/bin/sh/output.c#7 integrate .. //depot/projects/s390/bin/sh/output.h#3 integrate .. //depot/projects/s390/bin/sh/parser.c#10 integrate .. //depot/projects/s390/bin/sh/parser.h#4 integrate .. //depot/projects/s390/bin/sh/redir.c#6 integrate .. //depot/projects/s390/bin/sh/sh.1#15 integrate .. //depot/projects/s390/bin/sh/show.c#7 integrate .. //depot/projects/s390/bin/sh/show.h#3 integrate .. //depot/projects/s390/bin/sh/trap.c#7 integrate .. //depot/projects/s390/bin/sh/trap.h#5 integrate .. //depot/projects/s390/bin/sh/var.c#10 integrate .. //depot/projects/s390/bin/sh/var.h#6 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#3 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#3 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#4 integrate .. //depot/projects/s390/contrib/bind9/CHANGES#7 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/s390/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/types.h#4 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/masterdump.c#5 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/rbtdb.c#6 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/validator.c#7 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#3 integrate .. //depot/projects/s390/contrib/bind9/version#7 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.c#8 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.h#4 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII_tree.def#3 integrate .. //depot/projects/s390/contrib/ee/ee.c#3 integrate .. //depot/projects/s390/contrib/expat/lib/xmlparse.c#3 integrate .. //depot/projects/s390/contrib/expat/lib/xmltok_impl.c#3 integrate .. //depot/projects/s390/contrib/gcc/config/freebsd-spec.h#11 integrate .. //depot/projects/s390/contrib/groff/tmac/doc-syms#8 integrate .. //depot/projects/s390/contrib/ipfilter/man/ipf.8#5 integrate .. //depot/projects/s390/contrib/libpcap/inet.c#5 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/s390/contrib/netcat/FREEBSD-vendor#4 integrate .. //depot/projects/s390/contrib/ntp/COPYRIGHT#5 integrate .. //depot/projects/s390/contrib/ntp/ChangeLog#5 integrate .. //depot/projects/s390/contrib/ntp/CommitLog#2 integrate .. //depot/projects/s390/contrib/ntp/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/NEWS#5 integrate .. //depot/projects/s390/contrib/ntp/README#4 integrate .. //depot/projects/s390/contrib/ntp/README.bk#4 integrate .. //depot/projects/s390/contrib/ntp/README.patches#3 integrate .. //depot/projects/s390/contrib/ntp/WHERE-TO-START#3 integrate .. //depot/projects/s390/contrib/ntp/aclocal.m4#5 integrate .. //depot/projects/s390/contrib/ntp/adjtimed/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/arlib/Makefile.in#3 integrate .. //depot/projects/s390/contrib/ntp/arlib/aclocal.m4#3 integrate .. //depot/projects/s390/contrib/ntp/arlib/configure#3 integrate .. //depot/projects/s390/contrib/ntp/build#4 integrate .. //depot/projects/s390/contrib/ntp/clockstuff/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/config.h.in#5 integrate .. //depot/projects/s390/contrib/ntp/configure#5 integrate .. //depot/projects/s390/contrib/ntp/configure.ac#2 integrate .. //depot/projects/s390/contrib/ntp/flock-build#5 integrate .. //depot/projects/s390/contrib/ntp/html/build/hints/solaris.xtra.4095849#1 branch .. //depot/projects/s390/contrib/ntp/html/copyright.html#3 integrate .. //depot/projects/s390/contrib/ntp/html/drivers/driver40.html#3 integrate .. //depot/projects/s390/contrib/ntp/include/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/include/copyright.def#2 integrate .. //depot/projects/s390/contrib/ntp/include/isc/Makefile.in#3 integrate .. //depot/projects/s390/contrib/ntp/include/ntp_debug.h#2 integrate .. //depot/projects/s390/contrib/ntp/include/version.def#2 integrate .. //depot/projects/s390/contrib/ntp/kernel/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/kernel/sys/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/libntp/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/libopts/Makefile.in#2 integrate .. //depot/projects/s390/contrib/ntp/libparse/Makefile.am#3 integrate .. //depot/projects/s390/contrib/ntp/libparse/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/s390/contrib/ntp/ntpd/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/ntpd/cmd_args.c#4 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntp_crypto.c#7 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntp_intres.c#5 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntp_io.c#5 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntp_request.c#5 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntp_timer.c#5 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpd-opts.c#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpd-opts.h#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpd-opts.texi#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpd.1#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpd.c#5 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpdsim-opts.c#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpdsim-opts.h#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpdsim-opts.texi#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/ntpdsim.1#2 integrate .. //depot/projects/s390/contrib/ntp/ntpd/refclock_dumbclock.c#3 integrate .. //depot/projects/s390/contrib/ntp/ntpd/refclock_hopfser.c#4 integrate .. //depot/projects/s390/contrib/ntp/ntpd/refclock_jjy.c#4 integrate .. //depot/projects/s390/contrib/ntp/ntpd/refclock_nmea.c#4 integrate .. //depot/projects/s390/contrib/ntp/ntpd/refclock_palisade.c#5 integrate .. //depot/projects/s390/contrib/ntp/ntpdate/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/ntpdc/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/ntpdc/ntpdc-opts.c#2 integrate .. //depot/projects/s390/contrib/ntp/ntpdc/ntpdc-opts.h#2 integrate .. //depot/projects/s390/contrib/ntp/ntpdc/ntpdc-opts.texi#2 integrate .. //depot/projects/s390/contrib/ntp/ntpdc/ntpdc.1#2 integrate .. //depot/projects/s390/contrib/ntp/ntpq/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/ntpq/ntpq-opts.c#2 integrate .. //depot/projects/s390/contrib/ntp/ntpq/ntpq-opts.h#2 integrate .. //depot/projects/s390/contrib/ntp/ntpq/ntpq-opts.texi#2 integrate .. //depot/projects/s390/contrib/ntp/ntpq/ntpq.1#2 integrate .. //depot/projects/s390/contrib/ntp/ntpq/ntpq.c#6 integrate .. //depot/projects/s390/contrib/ntp/packageinfo.sh#2 integrate .. //depot/projects/s390/contrib/ntp/parseutil/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/scripts/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/sntp/Makefile.in#3 integrate .. //depot/projects/s390/contrib/ntp/sntp/aclocal.m4#3 integrate .. //depot/projects/s390/contrib/ntp/sntp/config.h.in#2 integrate .. //depot/projects/s390/contrib/ntp/sntp/configure#3 integrate .. //depot/projects/s390/contrib/ntp/sntp/configure.ac#3 integrate .. //depot/projects/s390/contrib/ntp/sntp/libopts/Makefile.in#2 integrate .. //depot/projects/s390/contrib/ntp/sntp/sntp-opts.c#2 integrate .. //depot/projects/s390/contrib/ntp/sntp/sntp-opts.def#2 integrate .. //depot/projects/s390/contrib/ntp/sntp/sntp-opts.h#2 integrate .. //depot/projects/s390/contrib/ntp/sntp/sntp-opts.texi#2 integrate .. //depot/projects/s390/contrib/ntp/sntp/sntp.1#2 integrate .. //depot/projects/s390/contrib/ntp/sntp/version.def#2 integrate .. //depot/projects/s390/contrib/ntp/util/Makefile.in#5 integrate .. //depot/projects/s390/contrib/ntp/util/ntp-keygen-opts.c#2 integrate .. //depot/projects/s390/contrib/ntp/util/ntp-keygen-opts.h#2 integrate .. //depot/projects/s390/contrib/ntp/util/ntp-keygen-opts.texi#2 integrate .. //depot/projects/s390/contrib/ntp/util/ntp-keygen.1#2 integrate .. //depot/projects/s390/contrib/ntp/version#4 integrate .. //depot/projects/s390/contrib/ntp/version.m4#2 integrate .. //depot/projects/s390/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/s390/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/s390/contrib/pf/pfctl/pf_print_state.c#3 integrate .. //depot/projects/s390/contrib/pf/pfctl/pfctl_parser.c#3 integrate .. //depot/projects/s390/contrib/tcp_wrappers/hosts_access.c#3 integrate .. //depot/projects/s390/contrib/telnet/telnet/externs.h#3 integrate .. //depot/projects/s390/contrib/telnet/telnetd/sys_term.c#4 integrate .. //depot/projects/s390/contrib/top/username.c#2 integrate .. //depot/projects/s390/crypto/heimdal/kcm/connect.c#2 integrate .. //depot/projects/s390/crypto/openssh/ssh_namespace.h#6 integrate .. //depot/projects/s390/crypto/openssh/sshd.c#13 integrate .. //depot/projects/s390/crypto/openssl/ssl/s3_lib.c#7 integrate .. //depot/projects/s390/crypto/openssl/ssl/s3_pkt.c#8 integrate .. //depot/projects/s390/crypto/openssl/ssl/s3_srvr.c#9 integrate .. //depot/projects/s390/etc/Makefile#21 integrate .. //depot/projects/s390/etc/defaults/devfs.rules#5 integrate .. //depot/projects/s390/etc/defaults/rc.conf#23 integrate .. //depot/projects/s390/etc/etc.amd64/ttys#6 integrate .. //depot/projects/s390/etc/etc.arm/ttys#5 integrate .. //depot/projects/s390/etc/etc.i386/ttys#6 integrate .. //depot/projects/s390/etc/etc.ia64/ttys#7 integrate .. //depot/projects/s390/etc/etc.mips/ttys#5 integrate .. //depot/projects/s390/etc/etc.pc98/ttys#1 branch .. //depot/projects/s390/etc/etc.powerpc/ttys#6 integrate .. //depot/projects/s390/etc/etc.sparc64/ttys#10 integrate .. //depot/projects/s390/etc/mtree/BIND.chroot.dist#2 integrate .. //depot/projects/s390/etc/mtree/BSD.usr.dist#15 integrate .. //depot/projects/s390/etc/mtree/BSD.var.dist#6 integrate .. //depot/projects/s390/etc/namedb/named.conf#8 integrate .. //depot/projects/s390/etc/namedb/named.root#5 integrate .. //depot/projects/s390/etc/network.subr#12 integrate .. //depot/projects/s390/etc/rc.d/Makefile#16 integrate .. //depot/projects/s390/etc/rc.d/ip6fw#8 delete .. //depot/projects/s390/etc/rc.d/ipfw#12 integrate .. //depot/projects/s390/etc/rc.d/jail#9 integrate .. //depot/projects/s390/etc/rc.d/named#11 integrate .. //depot/projects/s390/etc/rc.d/nsswitch#4 integrate .. //depot/projects/s390/etc/rc.firewall#6 integrate .. //depot/projects/s390/etc/rc.firewall6#7 delete .. //depot/projects/s390/etc/rc.subr#15 integrate .. //depot/projects/s390/etc/root/dot.profile#3 integrate .. //depot/projects/s390/etc/termcap.small#4 integrate .. //depot/projects/s390/games/factor/factor.c#3 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes#19 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes-o.real#7 integrate .. //depot/projects/s390/games/fortune/strfile/strfile.c#6 integrate .. //depot/projects/s390/games/fortune/unstr/unstr.c#4 integrate .. //depot/projects/s390/games/number/number.c#4 integrate .. //depot/projects/s390/games/pom/pom.6#2 integrate .. //depot/projects/s390/games/pom/pom.c#4 integrate .. //depot/projects/s390/gnu/lib/libgcc/Makefile#10 integrate .. //depot/projects/s390/gnu/lib/libgcov/Makefile#5 integrate .. //depot/projects/s390/include/Makefile#18 integrate .. //depot/projects/s390/include/dirent.h#5 integrate .. //depot/projects/s390/include/paths.h#9 integrate .. //depot/projects/s390/include/semaphore.h#1 branch .. //depot/projects/s390/include/signal.h#7 integrate .. //depot/projects/s390/include/strings.h#6 integrate .. //depot/projects/s390/include/termios.h#1 branch .. //depot/projects/s390/lib/Makefile#20 integrate .. //depot/projects/s390/lib/Makefile.inc#6 integrate .. //depot/projects/s390/lib/bind/config.h#6 integrate .. //depot/projects/s390/lib/csu/Makefile.inc#3 integrate .. //depot/projects/s390/lib/csu/amd64/Makefile#4 integrate .. //depot/projects/s390/lib/csu/arm/Makefile#2 integrate .. //depot/projects/s390/lib/csu/i386-elf/Makefile#6 integrate .. //depot/projects/s390/lib/csu/i386-elf/crt1.c#7 delete .. //depot/projects/s390/lib/csu/i386-elf/crt1_c.c#1 branch .. //depot/projects/s390/lib/csu/i386-elf/crt1_s.S#1 branch .. //depot/projects/s390/lib/csu/ia64/Makefile#4 integrate .. //depot/projects/s390/lib/csu/mips/Makefile#2 integrate .. //depot/projects/s390/lib/csu/powerpc/Makefile#3 integrate .. //depot/projects/s390/lib/csu/sparc64/Makefile#3 integrate .. //depot/projects/s390/lib/libarchive/Makefile#8 integrate .. //depot/projects/s390/lib/libarchive/archive.h#5 integrate .. //depot/projects/s390/lib/libarchive/archive_check_magic.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_crc32.h#1 branch .. //depot/projects/s390/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/s390/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/s390/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/s390/lib/libarchive/archive_entry_link_resolver.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/s390/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_entry_xattr.c#1 branch .. //depot/projects/s390/lib/libarchive/archive_hash.h#1 branch .. //depot/projects/s390/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/s390/lib/libarchive/archive_private.h#6 integrate .. //depot/projects/s390/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/s390/lib/libarchive/archive_read_disk_entry_from_file.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read_disk_private.h#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_disk_set_standard_lookup.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_open_fd.c#7 integrate .. //depot/projects/s390/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/s390/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/s390/lib/libarchive/archive_read_private.h#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_all.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_uu.c#1 branch .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_xz.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_iso9660.c#10 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_raw.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/s390/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/s390/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/s390/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/s390/lib/libarchive/archive_virtual.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/s390/lib/libarchive/archive_write.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/s390/lib/libarchive/archive_write_disk_private.h#2 integrate .. //depot/projects/s390/lib/libarchive/archive_write_disk_set_standard_lookup.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_private.h#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_compression_compress.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_compression_none.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_compression_program.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_compression_xz.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format_cpio.c#6 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format_mtree.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/s390/lib/libarchive/archive_write_set_format_zip.c#1 branch .. //depot/projects/s390/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/s390/lib/libarchive/filter_fork.h#2 integrate .. //depot/projects/s390/lib/libarchive/libarchive-formats.5#6 integrate .. //depot/projects/s390/lib/libarchive/tar.5#6 integrate .. //depot/projects/s390/lib/libarchive/test/Makefile#7 integrate .. //depot/projects/s390/lib/libarchive/test/main.c#6 integrate .. //depot/projects/s390/lib/libarchive/test/test.h#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_compat_bzip2.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_compat_cpio.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_lzma.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_solaris_tar_acl.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_entry_strmode.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_extattr_freebsd.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_fuzz.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_fuzz_1.iso.uu#2 delete .. //depot/projects/s390/lib/libarchive/test/test_open_fd.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_open_file.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_pax_filename_encoding.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_compress_program.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_disk.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_disk_entry_from_file.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_ar.ar.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_gz.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#2 delete .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_multi_extent.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_isojoliet_bz2.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#2 delete .. //depot/projects/s390/lib/libarchive/test/test_read_format_isojoliet_long.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_isojoliet_rr.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#2 delete .. //depot/projects/s390/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#3 delete .. //depot/projects/s390/lib/libarchive/test/test_read_format_isorr_ce.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_mtree.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_mtree.mtree.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_pax_bz2.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_tbz.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_tlz.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_large.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_uu.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_compress_program.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk_failures.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk_secure.c#4 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk_sparse.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk_symlink.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_write_disk_times.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_format_cpio_newc.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_format_cpio_odc.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_format_tar_ustar.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_format_zip.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_write_format_zip_empty.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_write_format_zip_no_compression.c#1 branch .. //depot/projects/s390/lib/libauditd/Makefile#2 integrate .. //depot/projects/s390/lib/libautofs/Makefile#4 integrate .. //depot/projects/s390/lib/libbegemot/Makefile#4 integrate .. //depot/projects/s390/lib/libbluetooth/bluetooth.3#4 integrate .. //depot/projects/s390/lib/libbluetooth/bluetooth.h#4 integrate .. //depot/projects/s390/lib/libbsm/Makefile#6 integrate .. //depot/projects/s390/lib/libbz2/Makefile#7 integrate .. //depot/projects/s390/lib/libc/compat-43/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/compat-43/Symbol.map#3 integrate .. //depot/projects/s390/lib/libc/compat-43/sigcompat.c#3 integrate .. //depot/projects/s390/lib/libc/compat-43/sigpause.2#5 integrate .. //depot/projects/s390/lib/libc/gen/Makefile.inc#17 integrate .. //depot/projects/s390/lib/libc/gen/Symbol.map#8 integrate .. //depot/projects/s390/lib/libc/gen/_once_stub.c#1 branch .. //depot/projects/s390/lib/libc/gen/_pthread_stubs.c#8 integrate .. //depot/projects/s390/lib/libc/gen/exec.c#5 integrate .. //depot/projects/s390/lib/libc/gen/fdevname.c#2 integrate .. //depot/projects/s390/lib/libc/gen/fmtmsg.c#3 integrate .. //depot/projects/s390/lib/libc/gen/fts.3#10 integrate .. //depot/projects/s390/lib/libc/gen/fts.c#8 integrate .. //depot/projects/s390/lib/libc/gen/getcap.c#6 integrate .. //depot/projects/s390/lib/libc/gen/getlogin.c#4 integrate .. //depot/projects/s390/lib/libc/gen/getttyent.c#6 integrate .. //depot/projects/s390/lib/libc/gen/getusershell.c#4 integrate .. //depot/projects/s390/lib/libc/gen/nlist.c#7 integrate .. //depot/projects/s390/lib/libc/gen/opendir.c#6 integrate .. //depot/projects/s390/lib/libc/gen/pause.c#3 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawn.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate .. //depot/projects/s390/lib/libc/gen/posix_spawnattr_init.3#2 integrate .. //depot/projects/s390/lib/libc/gen/pselect.3#5 delete .. //depot/projects/s390/lib/libc/gen/pselect.c#3 delete .. //depot/projects/s390/lib/libc/gen/pwcache.c#3 integrate .. //depot/projects/s390/lib/libc/gen/raise.c#4 integrate .. //depot/projects/s390/lib/libc/gen/scandir.3#4 integrate .. //depot/projects/s390/lib/libc/gen/scandir.c#3 integrate .. //depot/projects/s390/lib/libc/gen/sem.c#3 integrate .. //depot/projects/s390/lib/libc/gen/sem_init.3#2 integrate .. //depot/projects/s390/lib/libc/gen/sem_new.c#1 branch .. //depot/projects/s390/lib/libc/gen/sleep.c#3 integrate .. //depot/projects/s390/lib/libc/gen/termios.c#4 integrate .. //depot/projects/s390/lib/libc/gen/time.3#5 integrate .. //depot/projects/s390/lib/libc/gen/time.c#4 integrate .. //depot/projects/s390/lib/libc/gen/timezone.c#3 integrate .. //depot/projects/s390/lib/libc/gen/tzset.3#5 integrate .. //depot/projects/s390/lib/libc/gen/usleep.c#5 integrate .. //depot/projects/s390/lib/libc/gen/wordexp.c#4 integrate .. //depot/projects/s390/lib/libc/gmon/gmon.c#10 integrate .. //depot/projects/s390/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/s390/lib/libc/locale/isblank.3#8 integrate .. //depot/projects/s390/lib/libc/locale/isgraph.3#7 integrate .. //depot/projects/s390/lib/libc/locale/isprint.3#7 integrate .. //depot/projects/s390/lib/libc/locale/nl_langinfo.3#4 integrate .. //depot/projects/s390/lib/libc/net/gai_strerror.c#3 integrate .. //depot/projects/s390/lib/libc/net/getnameinfo.c#7 integrate .. //depot/projects/s390/lib/libc/net/ip6opt.c#4 integrate .. //depot/projects/s390/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/s390/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/s390/lib/libc/nls/C.msg#3 integrate .. //depot/projects/s390/lib/libc/nls/Makefile.inc#7 integrate .. //depot/projects/s390/lib/libc/nls/es_ES.ISO8859-1.msg#2 integrate .. //depot/projects/s390/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate .. //depot/projects/s390/lib/libc/nls/ja_JP.UTF-8.msg#1 branch .. //depot/projects/s390/lib/libc/nls/ja_JP.eucJP.msg#1 branch .. //depot/projects/s390/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/s390/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/s390/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/s390/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/s390/lib/libc/posix1e/Makefile.inc#10 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_delete_entry.c#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_from_text.c#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_to_text.c#5 integrate .. //depot/projects/s390/lib/libc/rpc/clnt_raw.c#5 integrate .. //depot/projects/s390/lib/libc/rpc/getnetconfig.c#9 integrate .. //depot/projects/s390/lib/libc/rpc/getnetpath.c#5 integrate .. //depot/projects/s390/lib/libc/rpc/getrpcent.c#5 integrate .. //depot/projects/s390/lib/libc/rpc/key_call.c#5 integrate .. //depot/projects/s390/lib/libc/rpc/svc.c#6 integrate .. //depot/projects/s390/lib/libc/rpc/svc_raw.c#5 integrate .. //depot/projects/s390/lib/libc/stdio/fgetws.c#4 integrate .. //depot/projects/s390/lib/libc/stdio/findfp.c#8 integrate .. //depot/projects/s390/lib/libc/stdio/funopen.c#3 integrate .. //depot/projects/s390/lib/libc/stdio/fvwrite.c#4 integrate .. //depot/projects/s390/lib/libc/stdio/getline.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/printf.3#11 integrate .. //depot/projects/s390/lib/libc/stdio/sprintf.c#4 integrate .. //depot/projects/s390/lib/libc/stdio/sscanf.c#4 integrate .. //depot/projects/s390/lib/libc/stdio/vfwprintf.c#11 integrate .. //depot/projects/s390/lib/libc/stdio/vsscanf.c#5 integrate .. //depot/projects/s390/lib/libc/stdio/xprintf_time.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/getenv.3#5 integrate .. //depot/projects/s390/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/s390/lib/libc/stdlib/system.c#3 integrate .. //depot/projects/s390/lib/libc/stdtime/localtime.c#9 integrate .. //depot/projects/s390/lib/libc/stdtime/tzfile.5#3 integrate .. //depot/projects/s390/lib/libc/string/strcat.3#6 integrate .. //depot/projects/s390/lib/libc/string/strcmp.3#4 integrate .. //depot/projects/s390/lib/libc/sys/Makefile.inc#13 integrate .. //depot/projects/s390/lib/libc/sys/Symbol.map#7 integrate .. //depot/projects/s390/lib/libc/sys/__error.c#3 integrate .. //depot/projects/s390/lib/libc/sys/accept.2#6 integrate .. //depot/projects/s390/lib/libc/sys/clock_gettime.2#9 integrate .. //depot/projects/s390/lib/libc/sys/cpuset.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kqueue.2#9 integrate .. //depot/projects/s390/lib/libc/sys/mmap.2#11 integrate .. //depot/projects/s390/lib/libc/sys/pselect.2#1 branch .. //depot/projects/s390/lib/libc/sys/sendfile.2#8 integrate .. //depot/projects/s390/lib/libc/sys/setpgid.2#5 integrate .. //depot/projects/s390/lib/libc/sys/vfork.2#7 integrate .. //depot/projects/s390/lib/libc/yp/yplib.c#5 integrate .. //depot/projects/s390/lib/libcalendar/Makefile#2 integrate .. //depot/projects/s390/lib/libcam/Makefile#5 integrate .. //depot/projects/s390/lib/libcompat/Makefile#6 integrate .. //depot/projects/s390/lib/libcrypt/Makefile#8 integrate .. //depot/projects/s390/lib/libdevinfo/Makefile#2 integrate .. //depot/projects/s390/lib/libdevinfo/devinfo.h#5 integrate .. //depot/projects/s390/lib/libdevstat/Makefile#8 integrate .. //depot/projects/s390/lib/libdwarf/Makefile#3 integrate .. //depot/projects/s390/lib/libedit/Makefile#7 integrate .. //depot/projects/s390/lib/libelf/Makefile#3 integrate .. //depot/projects/s390/lib/libexpat/Makefile#6 integrate .. //depot/projects/s390/lib/libexpat/libbsdxml.3#4 integrate .. //depot/projects/s390/lib/libfetch/ftp.c#11 integrate .. //depot/projects/s390/lib/libftpio/Makefile#6 integrate .. //depot/projects/s390/lib/libgeom/geom_getxml.c#3 integrate .. //depot/projects/s390/lib/libgpib/Makefile#5 integrate .. //depot/projects/s390/lib/libgssapi/Makefile#3 integrate .. //depot/projects/s390/lib/libgssapi/gss_mech_switch.c#4 integrate .. //depot/projects/s390/lib/libipsec/Makefile#8 integrate .. //depot/projects/s390/lib/libipx/Makefile#3 integrate .. //depot/projects/s390/lib/libjail/Makefile#2 integrate .. //depot/projects/s390/lib/libjail/jail.c#2 integrate .. //depot/projects/s390/lib/libkiconv/Makefile#4 integrate .. //depot/projects/s390/lib/libkvm/Makefile#7 integrate .. //depot/projects/s390/lib/libkvm/kvm_i386.c#7 integrate .. //depot/projects/s390/lib/libkvm/kvm_proc.c#13 integrate .. //depot/projects/s390/lib/libmagic/Makefile#6 integrate .. //depot/projects/s390/lib/libmd/Makefile#6 integrate .. //depot/projects/s390/lib/libmilter/Makefile#6 integrate .. //depot/projects/s390/lib/libmp/Makefile#8 integrate .. //depot/projects/s390/lib/libncp/Makefile#8 integrate .. //depot/projects/s390/lib/libnetgraph/debug.c#4 integrate .. //depot/projects/s390/lib/libngatm/Makefile#4 integrate .. //depot/projects/s390/lib/libopie/Makefile#6 integrate .. //depot/projects/s390/lib/libpam/modules/Makefile.inc#7 integrate .. //depot/projects/s390/lib/libpam/modules/pam_exec/Makefile#3 integrate .. //depot/projects/s390/lib/libpam/modules/pam_krb5/Makefile#5 integrate .. //depot/projects/s390/lib/libpam/modules/pam_lastlog/Makefile#3 integrate .. //depot/projects/s390/lib/libpam/modules/pam_lastlog/pam_lastlog.c#7 integrate .. //depot/projects/s390/lib/libpam/modules/pam_radius/Makefile#4 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ssh/Makefile#8 integrate .. //depot/projects/s390/lib/libpam/modules/pam_unix/pam_unix.8#6 integrate .. //depot/projects/s390/lib/libpcap/Makefile#8 integrate .. //depot/projects/s390/lib/libpmc/Makefile#4 integrate .. //depot/projects/s390/lib/libpmc/libpmc.c#8 integrate .. //depot/projects/s390/lib/libpmc/pmc.xscale.3#1 branch .. //depot/projects/s390/lib/libpmc/pmc_attach.3#2 integrate .. //depot/projects/s390/lib/libproc/Makefile#3 integrate .. //depot/projects/s390/lib/libradius/Makefile#8 integrate .. //depot/projects/s390/lib/librpcsec_gss/Makefile#2 integrate .. //depot/projects/s390/lib/librpcsec_gss/rpcsec_gss_conf.c#2 integrate .. //depot/projects/s390/lib/librpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/s390/lib/librt/Makefile#3 integrate .. //depot/projects/s390/lib/librt/mq.c#2 integrate .. //depot/projects/s390/lib/librt/sigev_thread.c#3 integrate .. //depot/projects/s390/lib/libsbuf/Makefile#3 integrate .. //depot/projects/s390/lib/libsm/Makefile#6 integrate .. //depot/projects/s390/lib/libsmdb/Makefile#4 integrate .. //depot/projects/s390/lib/libsmutil/Makefile#4 integrate .. //depot/projects/s390/lib/libstand/Makefile#11 integrate .. //depot/projects/s390/lib/libstand/bzipfs.c#4 integrate .. //depot/projects/s390/lib/libstand/gzipfs.c#4 integrate .. //depot/projects/s390/lib/libstand/open.c#3 integrate .. //depot/projects/s390/lib/libstand/udp.c#4 integrate .. //depot/projects/s390/lib/libtacplus/Makefile#6 integrate .. //depot/projects/s390/lib/libtacplus/libtacplus.3#7 integrate .. //depot/projects/s390/lib/libtacplus/taclib.c#4 integrate .. //depot/projects/s390/lib/libtacplus/taclib.h#3 integrate .. //depot/projects/s390/lib/libtacplus/taclib_private.h#3 integrate .. //depot/projects/s390/lib/libthr/Makefile#10 integrate .. //depot/projects/s390/lib/libthr/pthread.map#6 integrate .. //depot/projects/s390/lib/libthr/thread/Makefile.inc#7 integrate .. //depot/projects/s390/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/s390/lib/libthr/thread/thr_private.h#10 integrate .. //depot/projects/s390/lib/libthr/thread/thr_sem.c#6 integrate .. //depot/projects/s390/lib/libthr/thread/thr_syscalls.c#9 integrate .. //depot/projects/s390/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/s390/lib/libthread_db/Makefile#4 integrate .. //depot/projects/s390/lib/libufs/Makefile#8 integrate .. //depot/projects/s390/lib/libugidfw/Makefile#6 integrate .. //depot/projects/s390/lib/libugidfw/ugidfw.c#5 integrate .. //depot/projects/s390/lib/libulog/Makefile#1 branch .. //depot/projects/s390/lib/libulog/Symbol.map#1 branch .. //depot/projects/s390/lib/libulog/ulog.h#1 branch .. //depot/projects/s390/lib/libulog/ulog_getutxent.3#1 branch .. //depot/projects/s390/lib/libulog/ulog_getutxent.c#1 branch .. //depot/projects/s390/lib/libulog/ulog_internal.h#1 branch .. //depot/projects/s390/lib/libulog/ulog_login.3#1 branch .. //depot/projects/s390/lib/libulog/ulog_login.c#1 branch .. //depot/projects/s390/lib/libulog/ulog_login_pseudo.c#1 branch .. //depot/projects/s390/lib/libulog/ulog_pututxline.c#1 branch .. //depot/projects/s390/lib/libulog/ulog_setutxfile.3#1 branch .. //depot/projects/s390/lib/libulog/ulog_util.c#1 branch .. //depot/projects/s390/lib/libulog/utempter.c#1 branch .. //depot/projects/s390/lib/libulog/utempter.h#1 branch .. //depot/projects/s390/lib/libulog/utempter_add_record.3#1 branch .. //depot/projects/s390/lib/libusb/Makefile#3 integrate .. //depot/projects/s390/lib/libusb/libusb.h#2 integrate .. //depot/projects/s390/lib/libusb/libusb10.c#2 integrate .. //depot/projects/s390/lib/libusb/libusb10.h#2 integrate .. //depot/projects/s390/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/s390/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/s390/lib/libusb/libusb20.3#2 integrate .. //depot/projects/s390/lib/libusb/libusb20.c#3 integrate .. //depot/projects/s390/lib/libusb/libusb20.h#3 integrate .. //depot/projects/s390/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/s390/lib/libusb/libusb20_ugen20.c#4 integrate .. //depot/projects/s390/lib/libutil/Makefile#10 integrate .. //depot/projects/s390/lib/libutil/gr_util.c#3 integrate .. //depot/projects/s390/lib/libutil/libutil.h#6 integrate .. //depot/projects/s390/lib/libutil/pw_util.c#7 integrate .. //depot/projects/s390/lib/libvgl/Makefile#6 integrate .. //depot/projects/s390/lib/libwrap/Makefile#9 integrate .. //depot/projects/s390/lib/liby/Makefile#4 integrate .. //depot/projects/s390/lib/libypclnt/Makefile#7 integrate .. //depot/projects/s390/lib/libz/Makefile#4 integrate .. //depot/projects/s390/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/s390/libexec/Makefile#14 integrate .. //depot/projects/s390/libexec/Makefile.inc#2 integrate .. //depot/projects/s390/libexec/atrun/Makefile#3 integrate .. //depot/projects/s390/libexec/atrun/atrun.c#5 integrate .. //depot/projects/s390/libexec/bootpd/Makefile#2 integrate .. //depot/projects/s390/libexec/bootpd/Makefile.inc#2 integrate .. //depot/projects/s390/libexec/bootpd/tools/Makefile.inc#2 integrate .. //depot/projects/s390/libexec/comsat/comsat.c#4 integrate .. //depot/projects/s390/libexec/fingerd/Makefile#3 integrate .. //depot/projects/s390/libexec/getty/Makefile#2 integrate .. //depot/projects/s390/libexec/mail.local/Makefile#4 integrate .. //depot/projects/s390/libexec/mknetid/Makefile#2 integrate .. //depot/projects/s390/libexec/pppoed/Makefile#3 integrate .. //depot/projects/s390/libexec/rbootd/Makefile#2 integrate .. //depot/projects/s390/libexec/revnetgroup/Makefile#2 integrate .. //depot/projects/s390/libexec/rpc.rquotad/Makefile#3 integrate .. //depot/projects/s390/libexec/rpc.rstatd/Makefile#4 integrate .. //depot/projects/s390/libexec/rpc.rusersd/Makefile#2 integrate .. //depot/projects/s390/libexec/rpc.rusersd/rusers_proc.c#3 integrate .. //depot/projects/s390/libexec/rpc.rusersd/rusersd.c#4 integrate .. //depot/projects/s390/libexec/rpc.rwalld/Makefile#3 integrate .. //depot/projects/s390/libexec/rpc.sprayd/Makefile#2 integrate .. //depot/projects/s390/libexec/rshd/Makefile#3 integrate .. //depot/projects/s390/libexec/rtld-aout/shlib.c#5 integrate .. //depot/projects/s390/libexec/rtld-aout/support.c#3 integrate .. //depot/projects/s390/libexec/rtld-elf/Makefile#11 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld.c#18 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld.h#10 integrate .. //depot/projects/s390/libexec/smrsh/Makefile#4 integrate .. //depot/projects/s390/libexec/talkd/Makefile#2 integrate .. //depot/projects/s390/libexec/talkd/process.c#3 integrate .. //depot/projects/s390/libexec/tcpd/Makefile#6 integrate .. //depot/projects/s390/libexec/tftp-proxy/Makefile#2 integrate .. //depot/projects/s390/libexec/tftpd/Makefile#3 integrate .. //depot/projects/s390/libexec/ulog-helper/Makefile#1 branch .. //depot/projects/s390/libexec/ulog-helper/ulog-helper.c#1 branch .. //depot/projects/s390/libexec/ypxfr/Makefile#2 integrate .. //depot/projects/s390/release/Makefile#27 integrate .. //depot/projects/s390/release/i386/fixit_crunch.conf#7 integrate .. //depot/projects/s390/release/pc98/fixit-small_crunch.conf#6 integrate .. //depot/projects/s390/release/pc98/fixit_crunch.conf#7 integrate .. //depot/projects/s390/release/picobsd/bridge/PICOBSD#7 integrate .. //depot/projects/s390/release/picobsd/bridge/crunch.conf#9 integrate .. //depot/projects/s390/release/picobsd/build/mfs.mtree#2 integrate .. //depot/projects/s390/release/picobsd/build/picobsd#8 integrate .. //depot/projects/s390/release/picobsd/floppy.tree/etc/master.passwd#3 integrate .. //depot/projects/s390/release/picobsd/floppy.tree/etc/ttys#3 integrate .. //depot/projects/s390/release/picobsd/floppy.tree/sbin/dhclient-script#1 branch .. //depot/projects/s390/release/picobsd/qemu/PICOBSD#1 branch .. //depot/projects/s390/release/picobsd/qemu/PICOBSD.hints#1 branch .. //depot/projects/s390/release/picobsd/qemu/config#1 branch .. //depot/projects/s390/release/picobsd/qemu/crunch.conf#1 branch .. //depot/projects/s390/release/picobsd/qemu/floppy.tree.exclude#1 branch .. //depot/projects/s390/release/picobsd/tinyware/oinit/oinit.c#3 integrate .. //depot/projects/s390/rescue/rescue/Makefile#8 integrate .. //depot/projects/s390/sbin/atacontrol/atacontrol.c#12 integrate .. //depot/projects/s390/sbin/camcontrol/camcontrol.8#8 integrate .. //depot/projects/s390/sbin/camcontrol/camcontrol.c#11 integrate .. //depot/projects/s390/sbin/comcontrol/comcontrol.c#4 integrate .. //depot/projects/s390/sbin/ddb/ddb_capture.c#2 integrate .. //depot/projects/s390/sbin/dumpfs/dumpfs.c#11 integrate .. //depot/projects/s390/sbin/fsck/fsck.c#9 integrate .. //depot/projects/s390/sbin/fsck_ffs/fsutil.c#10 integrate .. //depot/projects/s390/sbin/fsck_ffs/gjournal.c#3 integrate .. //depot/projects/s390/sbin/fsck_ffs/main.c#8 integrate .. //depot/projects/s390/sbin/fsck_ffs/pass1.c#7 integrate .. //depot/projects/s390/sbin/geom/class/cache/Makefile#2 integrate .. //depot/projects/s390/sbin/geom/class/cache/gcache.8#1 branch .. //depot/projects/s390/sbin/geom/class/mirror/geom_mirror.c#6 integrate .. //depot/projects/s390/sbin/geom/class/mirror/gmirror.8#6 integrate .. //depot/projects/s390/sbin/geom/class/part/Makefile#3 integrate .. //depot/projects/s390/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/s390/sbin/geom/class/raid3/geom_raid3.c#5 integrate .. //depot/projects/s390/sbin/geom/class/raid3/graid3.8#3 integrate .. //depot/projects/s390/sbin/geom/class/stripe/geom_stripe.c#5 integrate .. //depot/projects/s390/sbin/geom/core/geom.8#5 integrate .. //depot/projects/s390/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/s390/sbin/growfs/growfs.c#9 integrate .. //depot/projects/s390/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/s390/sbin/ifconfig/ifconfig.c#15 integrate .. //depot/projects/s390/sbin/ifconfig/regdomain.c#5 integrate .. //depot/projects/s390/sbin/init/Makefile#6 integrate .. //depot/projects/s390/sbin/init/init.c#8 integrate .. //depot/projects/s390/sbin/ipfw/dummynet.c#4 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#20 integrate .. //depot/projects/s390/sbin/ipfw/ipfw2.c#18 integrate .. //depot/projects/s390/sbin/ipfw/ipfw2.h#4 integrate .. //depot/projects/s390/sbin/ldconfig/ldconfig.c#6 integrate .. //depot/projects/s390/sbin/mknod/mknod.8#6 integrate .. //depot/projects/s390/sbin/mount/mntopts.h#6 integrate .. //depot/projects/s390/sbin/mount/mount.8#14 integrate .. //depot/projects/s390/sbin/mount/mount.c#16 integrate .. //depot/projects/s390/sbin/mount/vfslist.c#4 integrate .. //depot/projects/s390/sbin/mount_cd9660/mount_cd9660.c#5 integrate .. //depot/projects/s390/sbin/mount_msdosfs/mount_msdosfs.8#7 integrate .. //depot/projects/s390/sbin/mount_msdosfs/mount_msdosfs.c#8 integrate .. //depot/projects/s390/sbin/mount_nfs/mount_nfs.c#13 integrate .. //depot/projects/s390/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/s390/sbin/natd/natd.c#7 integrate .. //depot/projects/s390/sbin/newfs/mkfs.c#13 integrate .. //depot/projects/s390/sbin/nfsiod/nfsiod.8#5 integrate .. //depot/projects/s390/sbin/nfsiod/nfsiod.c#5 integrate .. //depot/projects/s390/sbin/rcorder/ealloc.c#3 integrate .. //depot/projects/s390/sbin/rcorder/hash.c#3 integrate .. //depot/projects/s390/sbin/rcorder/rcorder.c#7 integrate .. //depot/projects/s390/sbin/reboot/Makefile#6 integrate .. //depot/projects/s390/sbin/reboot/reboot.c#8 integrate .. //depot/projects/s390/sbin/routed/if.c#7 integrate .. //depot/projects/s390/sbin/shutdown/shutdown.c#5 integrate .. //depot/projects/s390/sbin/sysctl/sysctl.c#13 integrate .. //depot/projects/s390/sbin/tunefs/tunefs.8#11 integrate .. //depot/projects/s390/sbin/tunefs/tunefs.c#10 integrate .. //depot/projects/s390/sbin/umount/Makefile#4 integrate .. //depot/projects/s390/sbin/umount/umount.c#8 integrate .. //depot/projects/s390/secure/Makefile#5 integrate .. //depot/projects/s390/secure/Makefile.inc#5 integrate .. //depot/projects/s390/secure/lib/libssh/Makefile#11 integrate .. //depot/projects/s390/secure/usr.bin/bdes/bdes.c#6 integrate .. //depot/projects/s390/share/examples/Makefile#7 integrate .. //depot/projects/s390/share/examples/etc/make.conf#14 integrate .. //depot/projects/s390/share/examples/pppd/auth-down.sample#2 delete .. //depot/projects/s390/share/examples/pppd/auth-up.sample#2 delete .. //depot/projects/s390/share/examples/pppd/chap-secrets.sample#2 delete .. //depot/projects/s390/share/examples/pppd/chat.sh.sample#2 delete .. //depot/projects/s390/share/examples/pppd/ip-down.sample#2 delete .. //depot/projects/s390/share/examples/pppd/ip-up.sample#2 delete .. //depot/projects/s390/share/examples/pppd/options.sample#3 delete .. //depot/projects/s390/share/examples/pppd/pap-secrets.sample#2 delete .. //depot/projects/s390/share/examples/pppd/ppp.deny.sample#4 delete .. //depot/projects/s390/share/examples/pppd/ppp.shells.sample#2 delete .. //depot/projects/s390/share/examples/ses/srcs/chpmon.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/eltsub.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/eltsub.h#1 branch .. //depot/projects/s390/share/examples/ses/srcs/getencstat.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/getnobj.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/getobjmap.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/getobjstat.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/inienc.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/sesd.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/setencstat.c#2 integrate .. //depot/projects/s390/share/examples/ses/srcs/setobjstat.c#2 integrate .. //depot/projects/s390/share/examples/slattach/unit-command.sh#2 delete .. //depot/projects/s390/share/examples/sliplogin/slip.hosts#2 delete .. //depot/projects/s390/share/examples/sliplogin/slip.login#2 delete .. //depot/projects/s390/share/examples/sliplogin/slip.logout#2 delete .. //depot/projects/s390/share/examples/sliplogin/slip.slparms#2 delete .. //depot/projects/s390/share/examples/startslip/sldown.sh#2 delete .. //depot/projects/s390/share/examples/startslip/slip.sh#3 delete .. //depot/projects/s390/share/examples/startslip/slup.sh#2 delete .. //depot/projects/s390/share/man/man3/queue.3#8 integrate .. //depot/projects/s390/share/man/man3/tree.3#6 integrate .. //depot/projects/s390/share/man/man4/Makefile#26 integrate .. //depot/projects/s390/share/man/man4/ada.4#1 branch .. //depot/projects/s390/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/s390/share/man/man4/ata.4#11 integrate .. //depot/projects/s390/share/man/man4/atapicam.4#6 integrate .. //depot/projects/s390/share/man/man4/atp.4#1 branch .. //depot/projects/s390/share/man/man4/bge.4#15 integrate .. //depot/projects/s390/share/man/man4/gem.4#6 integrate .. //depot/projects/s390/share/man/man4/hptrr.4#2 integrate .. //depot/projects/s390/share/man/man4/ifmib.4#6 integrate .. //depot/projects/s390/share/man/man4/ipsec.4#6 integrate .. //depot/projects/s390/share/man/man4/iwn.4#3 integrate .. //depot/projects/s390/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.powerpc/Makefile#5 integrate .. //depot/projects/s390/share/man/man4/man4.powerpc/adb.4#1 branch .. //depot/projects/s390/share/man/man4/man4.powerpc/akbd.4#1 branch .. //depot/projects/s390/share/man/man4/man4.powerpc/ams.4#1 branch .. //depot/projects/s390/share/man/man4/man4.powerpc/cuda.4#1 branch .. //depot/projects/s390/share/man/man4/man4.powerpc/pmu.4#3 integrate .. //depot/projects/s390/share/man/man4/mfi.4#5 integrate .. //depot/projects/s390/share/man/man4/mk48txx.4#1 branch .. //depot/projects/s390/share/man/man4/msk.4#4 integrate .. //depot/projects/s390/share/man/man4/mwlfw.4#2 integrate .. //depot/projects/s390/share/man/man4/netintro.4#5 integrate .. //depot/projects/s390/share/man/man4/psm.4#7 integrate .. //depot/projects/s390/share/man/man4/sctp.4#2 integrate .. //depot/projects/s390/share/man/man4/snd_hda.4#7 integrate .. //depot/projects/s390/share/man/man4/ste.4#6 integrate .. //depot/projects/s390/share/man/man4/termios.4#6 integrate .. //depot/projects/s390/share/man/man4/tty.4#6 integrate .. //depot/projects/s390/share/man/man4/u3g.4#6 integrate .. //depot/projects/s390/share/man/man4/ucom.4#5 integrate .. //depot/projects/s390/share/man/man4/umass.4#14 integrate .. //depot/projects/s390/share/man/man4/vge.4#4 integrate .. //depot/projects/s390/share/man/man4/watchdog.4#5 integrate .. //depot/projects/s390/share/man/man4/wi.4#19 integrate .. //depot/projects/s390/share/man/man5/ar.5#2 integrate .. //depot/projects/s390/share/man/man5/make.conf.5#18 integrate .. //depot/projects/s390/share/man/man5/msdosfs.5#5 integrate .. //depot/projects/s390/share/man/man5/rc.conf.5#24 integrate .. //depot/projects/s390/share/man/man5/regdomain.5#2 integrate .. //depot/projects/s390/share/man/man7/adding_user.7#2 integrate .. //depot/projects/s390/share/man/man7/build.7#8 integrate .. //depot/projects/s390/share/man/man7/security.7#10 integrate .. //depot/projects/s390/share/man/man8/Makefile#9 integrate .. //depot/projects/s390/share/man/man8/rc.8#8 integrate .. //depot/projects/s390/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/projects/s390/share/man/man9/Makefile#19 integrate .. //depot/projects/s390/share/man/man9/VFS.9#4 integrate .. //depot/projects/s390/share/man/man9/VFS_CHECKEXP.9#5 integrate .. //depot/projects/s390/share/man/man9/VFS_FHTOVP.9#5 integrate .. //depot/projects/s390/share/man/man9/VOP_OPENCLOSE.9#8 integrate .. //depot/projects/s390/share/man/man9/get_cyclecount.9#3 integrate .. //depot/projects/s390/share/man/man9/ifnet.9#11 integrate .. //depot/projects/s390/share/man/man9/sleep.9#11 integrate .. //depot/projects/s390/share/man/man9/sleepqueue.9#4 integrate .. //depot/projects/s390/share/man/man9/usbdi.9#4 integrate .. //depot/projects/s390/share/man/man9/vm_page_bits.9#3 integrate .. //depot/projects/s390/share/misc/bsd-family-tree#20 integrate .. //depot/projects/s390/share/misc/committers-doc.dot#3 integrate .. //depot/projects/s390/share/misc/committers-ports.dot#4 integrate .. //depot/projects/s390/share/misc/committers-src.dot#7 integrate .. //depot/projects/s390/share/misc/iso3166#10 integrate .. //depot/projects/s390/share/misc/organization.dot#2 integrate .. //depot/projects/s390/share/mk/bsd.libnames.mk#15 integrate .. //depot/projects/s390/share/mk/bsd.subdir.mk#5 integrate .. //depot/projects/s390/share/mk/bsd.sys.mk#10 integrate .. //depot/projects/s390/share/skel/dot.profile#4 integrate .. //depot/projects/s390/share/termcap/termcap.5#5 integrate .. //depot/projects/s390/share/termcap/termcap.src#13 integrate .. //depot/projects/s390/share/timedef/ja_JP.SJIS.src#4 integrate .. //depot/projects/s390/share/timedef/ja_JP.UTF-8.src#4 integrate .. //depot/projects/s390/share/timedef/ja_JP.eucJP.src#4 integrate .. //depot/projects/s390/share/zoneinfo/antarctica#8 integrate .. //depot/projects/s390/share/zoneinfo/asia#14 integrate .. //depot/projects/s390/share/zoneinfo/australasia#11 integrate .. //depot/projects/s390/share/zoneinfo/etcetera#5 integrate .. //depot/projects/s390/share/zoneinfo/europe#10 integrate .. //depot/projects/s390/share/zoneinfo/southamerica#13 integrate .. //depot/projects/s390/share/zoneinfo/zone.tab#12 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/s390/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/s390/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/s390/sys/amd64/amd64/initcpu.c#11 integrate .. //depot/projects/s390/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/s390/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/s390/sys/amd64/amd64/mem.c#5 integrate .. //depot/projects/s390/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/s390/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/s390/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/s390/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/s390/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/s390/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/s390/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/s390/sys/amd64/ia32/ia32_signal.c#9 integrate .. //depot/projects/s390/sys/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/s390/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/s390/sys/amd64/include/mca.h#2 integrate .. //depot/projects/s390/sys/amd64/include/md_var.h#12 integrate .. //depot/projects/s390/sys/amd64/include/param.h#10 integrate .. //depot/projects/s390/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/s390/sys/amd64/isa/isa_dma.c#4 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/s390/sys/arm/arm/cpufunc.c#10 integrate .. //depot/projects/s390/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/s390/sys/arm/arm/db_trace.c#4 integrate .. //depot/projects/s390/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/s390/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/s390/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/s390/sys/arm/arm/mem.c#4 integrate .. //depot/projects/s390/sys/arm/arm/trap.c#6 integrate .. //depot/projects/s390/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/s390/sys/arm/at91/at91_machdep.c#4 integrate .. //depot/projects/s390/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/s390/sys/arm/conf/AVILA#7 integrate .. //depot/projects/s390/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/s390/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/s390/sys/arm/conf/DEFAULTS#3 integrate .. //depot/projects/s390/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/s390/sys/arm/econa/econa.c#1 branch .. //depot/projects/s390/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/s390/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/s390/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/s390/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/s390/sys/arm/econa/files.econa#1 branch .. //depot/projects/s390/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/s390/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/s390/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/s390/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/s390/sys/arm/econa/std.econa#1 branch .. //depot/projects/s390/sys/arm/econa/timer.c#1 branch .. //depot/projects/s390/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/s390/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/s390/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/s390/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/s390/sys/arm/include/pmc_mdep.h#3 integrate .. //depot/projects/s390/sys/arm/mv/mv_machdep.c#8 integrate .. //depot/projects/s390/sys/arm/mv/mv_sata.c#2 integrate .. //depot/projects/s390/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/files.ixp425#6 integrate .. //depot/projects/s390/sys/boot/Makefile#14 integrate .. //depot/projects/s390/sys/boot/common/Makefile.inc#9 integrate .. //depot/projects/s390/sys/boot/common/boot.c#5 integrate .. //depot/projects/s390/sys/boot/common/commands.c#5 integrate .. //depot/projects/s390/sys/boot/common/dev_net.c#6 integrate .. //depot/projects/s390/sys/boot/common/md.c#1 branch .. //depot/projects/s390/sys/boot/common/module.c#7 integrate .. //depot/projects/s390/sys/boot/forth/loader.conf.5#6 integrate .. //depot/projects/s390/sys/boot/i386/Makefile#6 integrate .. //depot/projects/s390/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/s390/sys/boot/i386/libi386/Makefile#11 integrate .. //depot/projects/s390/sys/boot/i386/libi386/biosacpi.c#8 integrate .. //depot/projects/s390/sys/boot/i386/libi386/biosdisk.c#13 integrate .. //depot/projects/s390/sys/boot/i386/libi386/biosmem.c#6 integrate .. //depot/projects/s390/sys/boot/i386/libi386/elf32_freebsd.c#5 integrate .. //depot/projects/s390/sys/boot/i386/libi386/elf64_freebsd.c#5 integrate .. //depot/projects/s390/sys/boot/i386/libi386/libi386.h#8 integrate .. //depot/projects/s390/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/s390/sys/boot/i386/libi386/vidconsole.c#4 integrate .. //depot/projects/s390/sys/boot/i386/loader/Makefile#12 integrate .. //depot/projects/s390/sys/boot/i386/loader/conf.c#9 integrate .. //depot/projects/s390/sys/boot/i386/loader/main.c#10 integrate .. //depot/projects/s390/sys/boot/i386/zfsboot/zfsboot.c#4 integrate .. //depot/projects/s390/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/s390/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/s390/sys/boot/ofw/libofw/ofw_disk.c#8 integrate .. //depot/projects/s390/sys/boot/pc98/Makefile.inc#6 integrate .. //depot/projects/s390/sys/boot/pc98/boot0.5/selector.s#3 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/Makefile#7 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/s390/sys/boot/pc98/boot2/asm.h#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/bios.S#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/boot.c#7 delete .. //depot/projects/s390/sys/boot/pc98/boot2/boot.h#4 delete .. //depot/projects/s390/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/s390/sys/boot/pc98/boot2/boot2.S#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/s390/sys/boot/pc98/boot2/dinode.h#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/disk.c#7 delete .. //depot/projects/s390/sys/boot/pc98/boot2/fs.h#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/inode.h#4 delete .. //depot/projects/s390/sys/boot/pc98/boot2/io.c#6 delete .. //depot/projects/s390/sys/boot/pc98/boot2/probe_keyboard.c#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/quota.h#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/s390/sys/boot/pc98/boot2/serial_16550.S#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/serial_8251.S#3 delete .. //depot/projects/s390/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/s390/sys/boot/pc98/boot2/sys.c#7 delete .. //depot/projects/s390/sys/boot/pc98/boot2/table.c#4 delete .. //depot/projects/s390/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/s390/sys/boot/pc98/kgzldr/crt.s#4 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/Makefile#10 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/biosdisk.c#11 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/biosmem.c#6 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/s390/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/s390/sys/boot/pc98/loader/conf.c#4 integrate .. //depot/projects/s390/sys/boot/pc98/loader/main.c#7 integrate .. //depot/projects/s390/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/s390/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/s390/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/s390/sys/boot/zfs/zfsimpl.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 8 17:56:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAB1A1065676; Fri, 8 Jan 2010 17:56:48 +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 6DA761065670 for ; Fri, 8 Jan 2010 17:56:48 +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 5A8BE8FC08 for ; Fri, 8 Jan 2010 17:56:48 +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 o08HumnR002456 for ; Fri, 8 Jan 2010 17:56:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o08HumIo002454 for perforce@freebsd.org; Fri, 8 Jan 2010 17:56:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 8 Jan 2010 17:56:48 GMT Message-Id: <201001081756.o08HumIo002454@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 Precedence: bulk Cc: Subject: PERFORCE change 172784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 17:56:48 -0000 http://p4web.freebsd.org/chv.cgi?CH=172784 Change 172784 by hselasky@hselasky_laptop001 on 2010/01/08 17:56:39 USB core: - fix compile warning on AMD64. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#14 (text+ko) ==== @@ -468,7 +468,7 @@ sc->cmd_len = cmd_len; bzero(&sc->cbw.CBWCDB, sizeof(sc->cbw.CBWCDB)); bcopy(cmd_ptr, &sc->cbw.CBWCDB, cmd_len); - DPRINTFN(1, "SCSI cmd = %*D\n", cmd_len, &sc->cbw.CBWCDB, ":"); + DPRINTFN(1, "SCSI cmd = %*D\n", (int)cmd_len, &sc->cbw.CBWCDB, ":"); mtx_lock(&sc->mtx); usbd_transfer_start(sc->xfer[sc->state]); From owner-p4-projects@FreeBSD.ORG Fri Jan 8 21:44:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55D64106568D; Fri, 8 Jan 2010 21:44: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 19E6A106566B for ; Fri, 8 Jan 2010 21:44:47 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0883F8FC15 for ; Fri, 8 Jan 2010 21:44: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 o08LiktP034808 for ; Fri, 8 Jan 2010 21:44:46 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o08LikYp034806 for perforce@freebsd.org; Fri, 8 Jan 2010 21:44:46 GMT (envelope-from bz@freebsd.org) Date: Fri, 8 Jan 2010 21:44:46 GMT Message-Id: <201001082144.o08LikYp034806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 21:44:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=172803 Change 172803 by bz@bz_dumpster on 2010/01/08 21:44:34 Reflect SVN r199868: Simplify the invocation of vm_fault(). Specifically, eliminate the flag VM_FAULT_DIRTY. The information provided by this flag can be trivially inferred by vm_fault(). Affected files ... .. //depot/projects/s390/sys/s390/s390/trap.c#13 edit .. //depot/projects/s390/sys/s390/s390/trap.h#3 edit Differences ... ==== //depot/projects/s390/sys/s390/s390/trap.c#13 (text+ko) ==== @@ -258,7 +258,6 @@ vm_prot_t fault_type; struct thread *td; struct pcb *pcb; - int fault_flags; vm_offset_t va; struct proc *p; int tei, rv; @@ -273,12 +272,10 @@ if (!usermode) printf("Protection exception in kernel"); fault_type = VM_PROT_WRITE; - fault_flags = VM_FAULT_DIRTY; tf->tf_psw.addr -= sysarea.program_ilc & 0x7; } else { /* How to figure out actual type of access? */ fault_type = VM_PROT_READ; - fault_flags = VM_FAULT_NORMAL; } /* if (sysarea.trans_exc_ident & 0x2) { */ @@ -294,7 +291,7 @@ p->p_lock++; PROC_UNLOCK(p); - rv = vm_fault(&p->p_vmspace->vm_map, va, fault_type, fault_flags); + rv = vm_fault(&p->p_vmspace->vm_map, va, fault_type, VM_FAULT_NORMAL); PROC_LOCK(p); p->p_lock--; ==== //depot/projects/s390/sys/s390/s390/trap.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jan 8 21:47:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82E381065679; Fri, 8 Jan 2010 21:47: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 4711C106566B for ; Fri, 8 Jan 2010 21:47:50 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 35B078FC12 for ; Fri, 8 Jan 2010 21:47: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 o08Llo38035034 for ; Fri, 8 Jan 2010 21:47:50 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o08LloBI035032 for perforce@freebsd.org; Fri, 8 Jan 2010 21:47:50 GMT (envelope-from bz@freebsd.org) Date: Fri, 8 Jan 2010 21:47:50 GMT Message-Id: <201001082147.o08LloBI035032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 21:47:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=172804 Change 172804 by bz@bz_dumpster on 2010/01/08 21:46:49 Make WARNS=6 save. For now ignore the fact that it seems that we still have an unsued BSD specialty in a register that we might no longer need but flag with XXX-BZ. Affected files ... .. //depot/projects/s390/lib/csu/s390/Makefile#2 edit .. //depot/projects/s390/lib/csu/s390/crt1.c#3 edit .. //depot/projects/s390/lib/csu/s390/crti.S#3 edit .. //depot/projects/s390/lib/csu/s390/crtn.S#2 edit Differences ... ==== //depot/projects/s390/lib/csu/s390/Makefile#2 (text+ko) ==== ==== //depot/projects/s390/lib/csu/s390/crt1.c#3 (text+ko) ==== @@ -40,6 +40,7 @@ extern void _fini(void); extern void _init(void); extern int main(int, char **, char **); +extern void _do_start(char **, struct ps_strings *, void (*)(void)); #ifdef GCRT extern void _mcleanup(void); @@ -58,8 +59,9 @@ char **environ; const char *__progname = ""; +/* XXX-BZ can't we just get rid of ps_strings - also for other archs? */ void -_do_start(char **ap, struct ps_strings *ps_strings, void (*cleanup)(void)) +_do_start(char **ap, struct ps_strings *ps_strings __unused, void (*cleanup)(void)) { int argc; char **argv; ==== //depot/projects/s390/lib/csu/s390/crti.S#3 (text+ko) ==== ==== //depot/projects/s390/lib/csu/s390/crtn.S#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jan 8 21:49:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC095106568B; Fri, 8 Jan 2010 21:49: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 70D7A106566B for ; Fri, 8 Jan 2010 21:49:52 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F9578FC22 for ; Fri, 8 Jan 2010 21:49: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 o08Lnqmi035152 for ; Fri, 8 Jan 2010 21:49:52 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o08LnqaL035150 for perforce@freebsd.org; Fri, 8 Jan 2010 21:49:52 GMT (envelope-from bz@freebsd.org) Date: Fri, 8 Jan 2010 21:49:52 GMT Message-Id: <201001082149.o08LnqaL035150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172805 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 21:49:52 -0000 http://p4web.freebsd.org/chv.cgi?CH=172805 Change 172805 by bz@bz_dumpster on 2010/01/08 21:48:53 Reflect SVN r201223: Update d_mmap() to accept vm_ooffset_t and vm_memattr_t. Affected files ... .. //depot/projects/s390/sys/s390/s390/mem.c#9 edit Differences ... ==== //depot/projects/s390/sys/s390/s390/mem.c#9 (text+ko) ==== @@ -143,7 +143,8 @@ } int -memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { switch (dev2unit(dev)) { case CDEV_MINOR_MEM: From owner-p4-projects@FreeBSD.ORG Fri Jan 8 22:29:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FBD11065692; Fri, 8 Jan 2010 22:29:33 +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 AEE06106568F for ; Fri, 8 Jan 2010 22:29:32 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5208F8FC1B for ; Fri, 8 Jan 2010 22:29: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 o08MTW6w039422 for ; Fri, 8 Jan 2010 22:29:32 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o08MTWv7039420 for perforce@freebsd.org; Fri, 8 Jan 2010 22:29:32 GMT (envelope-from bz@freebsd.org) Date: Fri, 8 Jan 2010 22:29:32 GMT Message-Id: <201001082229.o08MTWv7039420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 22:29:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=172808 Change 172808 by bz@bz_dumpster on 2010/01/08 22:29:11 Reflect SVN r199135: Extract the code that records syscall results in the frame into MD function cpu_set_syscall_retval(). Affected files ... .. //depot/projects/s390/sys/s390/include/pcb.h#3 edit .. //depot/projects/s390/sys/s390/s390/trap.c#14 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#12 edit Differences ... ==== //depot/projects/s390/sys/s390/include/pcb.h#3 (text+ko) ==== ==== //depot/projects/s390/sys/s390/s390/trap.c#14 (text+ko) ==== @@ -482,7 +482,6 @@ struct sysentvec *sv; struct sysent *callp; struct thread *td; - int be32_hack = 0; struct proc *p; caddr_t params; u_int code; @@ -520,7 +519,6 @@ code = *argp++; nreg = 4; } else if (code == SYS___syscall) { - be32_hack = 1; argp++; code = *argp++; nreg = 3; @@ -555,32 +553,7 @@ error = (*callp->sy_call)(td, argp); } - switch (error) { - case 0: - if (be32_hack) { - tf->tf_gpr[3] = td->td_retval[0]; - } else { - tf->tf_gpr[2] = td->td_retval[0]; - tf->tf_gpr[3] = td->td_retval[1]; - } - tf->tf_psw.mask &= ~PSW_CC3; - break; - case ERESTART: - tf->tf_psw.addr -= 2; - break; - case EJUSTRETURN: - break; - default: - if (sv->sv_errsize) { - error = (error >= sv->sv_errsize) - ? -1 - : sv->sv_errtbl[error]; - } - tf->tf_gpr[2] = error; - tf->tf_psw.mask |= PSW_CC3; - break; - } - + cpu_set_syscall_retval(td, error); userret(td, tf); #ifdef KTRACE ==== //depot/projects/s390/sys/s390/s390/vm_machdep.c#12 (text+ko) ==== @@ -60,7 +60,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -75,6 +77,7 @@ #include #include #include +#include #include @@ -158,6 +161,53 @@ } void +cpu_set_syscall_retval(struct thread *td, int error) +{ + struct trapframe *tf; + struct proc *p; + struct sysentvec *sv; + u_int code; + int be32_hack; + + tf = td->td_frame; + p = td->td_proc; + sv = p->p_sysent; + + code = tf->tf_gpr[0]; + be32_hack = 0; +#ifndef __s390x__ + if (code == SYS___syscall) + be32_hack = 1; +#endif + + switch (error) { + case 0: + if (be32_hack) { + tf->tf_gpr[3] = td->td_retval[0]; + } else { + tf->tf_gpr[2] = td->td_retval[0]; + tf->tf_gpr[3] = td->td_retval[1]; + } + tf->tf_psw.mask &= ~PSW_CC3; + break; + case ERESTART: + tf->tf_psw.addr -= 2; + break; + case EJUSTRETURN: + break; + default: + if (sv->sv_errsize) { + error = (error >= sv->sv_errsize) + ? -1 + : sv->sv_errtbl[error]; + } + tf->tf_gpr[2] = error; + tf->tf_psw.mask |= PSW_CC3; + break; + } +} + +void cpu_set_upcall(struct thread *td, struct thread *td0) { struct trapframe *tf; From owner-p4-projects@FreeBSD.ORG Sat Jan 9 09:44:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 666DF106568D; Sat, 9 Jan 2010 09:44: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 2A9C91065670 for ; Sat, 9 Jan 2010 09:44:52 +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 1811F8FC12 for ; Sat, 9 Jan 2010 09:44: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 o099ip2p032446 for ; Sat, 9 Jan 2010 09:44:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o099ip05032444 for perforce@freebsd.org; Sat, 9 Jan 2010 09:44:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 9 Jan 2010 09:44:51 GMT Message-Id: <201001090944.o099ip05032444@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 Precedence: bulk Cc: Subject: PERFORCE change 172838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 09:44:52 -0000 http://p4web.freebsd.org/chv.cgi?CH=172838 Change 172838 by hselasky@hselasky_laptop001 on 2010/01/09 09:44:46 usbconfig: - Print some error codes and usage to stderr instead of stdout. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#20 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#20 (text+ko) ==== @@ -175,7 +175,7 @@ error = libusb20_be_remove_dev_quirk(pbe, &q); if (error) { - printf("Removing quirk '%s' failed, continuing.\n", str); + fprintf(stderr, "Removing quirk '%s' failed, continuing.\n", str); } return; } @@ -198,7 +198,7 @@ error = libusb20_be_add_dev_quirk(pbe, &q); if (error) { - printf("Adding quirk '%s' failed, continuing.\n", str); + fprintf(stderr, "Adding quirk '%s' failed, continuing.\n", str); } return; } @@ -257,7 +257,7 @@ static void duplicate_option(const char *ptr) { - printf("Syntax error: " + fprintf(stderr, "Syntax error: " "Duplicate option: '%s'\n", ptr); exit(1); } @@ -265,7 +265,7 @@ static void usage(void) { - printf("" + fprintf(stderr, "" "usbconfig - configure the USB subsystem" "\n" "usage: usbconfig -u -a -i [cmds...]" "\n" "usage: usbconfig -d [ugen]. -i [cmds...]" "\n" @@ -349,7 +349,7 @@ if (opt->got_set_template) { opt->got_any--; if (libusb20_be_set_template(pbe, opt->template)) { - printf("Setting USB template %u failed, " + fprintf(stderr, "Setting USB template %u failed, " "continuing.\n", opt->template); } } From owner-p4-projects@FreeBSD.ORG Sat Jan 9 18:51:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A0DB106568B; Sat, 9 Jan 2010 18:51:06 +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 2D9E4106566B for ; Sat, 9 Jan 2010 18:51:06 +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 1A1D08FC0C for ; Sat, 9 Jan 2010 18:51:06 +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 o09Ip6xt003837 for ; Sat, 9 Jan 2010 18:51:06 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09Ip6LS003835 for perforce@freebsd.org; Sat, 9 Jan 2010 18:51:06 GMT (envelope-from mav@freebsd.org) Date: Sat, 9 Jan 2010 18:51:06 GMT Message-Id: <201001091851.o09Ip6LS003835@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 Precedence: bulk Cc: Subject: PERFORCE change 172860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 18:51:06 -0000 http://p4web.freebsd.org/chv.cgi?CH=172860 Change 172860 by mav@mav_mavtest on 2010/01/09 18:50:43 Improve device queue freezeing. Improvement consists of two parts: - Add support for multiple freeze levels (run levels). Freeze with level X blocks execution of requests with priority of X00h and bigger. Requests with priorities numerically less then X00h are allowed. This allows, for example, to delay regular requests until device initialization or complicated error recovery will be completed. For now I've defined such levels: CAM_RL_NORMAL - regular payload requests, CAM_RL_DEV - device driver level (cache control, ...), CAM_RL_XPT - XPT level (probing, transfer negotiation), CAM_RL_BUS - BUS level (bus topology management), CAM_RL_HOST - absolute priority (no requests use this). - To avoid deadlocks, when frozen regular low-priority requests block high-priority managemen request, which need to be run first, exclude frozen requests from allocation busy counters. On release these counters are restored. It may cause a bit more requests to be allocated then device can handle simultanously, but there is no problem, as send counters are working as before and will control it. All together this allows to correctly recover from SATA hard reset in complicated environment with Port Multiplier used. It works in that way: - Hard reset happens for some reason, like command timeout, - XPT receives Reset Async event and freezes PMP management device, - PMP driver receives Reset Async event and freezes child devices, - device drivers receive Reset Async event and freeze their devices, - everything is stalled, ready to unwind levels one by one, - XPT completes probe sequence for PMP control device and releases it, - PMP driver initializes Multiplier, enables it's ports, runs probe sequences for child devices and releases them, - probe routines freeze devices from driver requests, proceed probe sequence, then release, - device drivers proceed initialization and release devices, - payload traffic is free to run! :) Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#47 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#26 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#67 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam.h#12 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#37 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#45 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#24 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#7 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#134 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#16 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#6 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#36 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#18 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#26 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#47 (text+ko) ==== @@ -689,7 +689,7 @@ /* Check if the SIM does not want queued commands */ bzero(&cpi, sizeof(cpi)); - xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NONE); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); if (cpi.ccb_h.status != CAM_REQ_CMP || ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#26 (text+ko) ==== @@ -179,7 +179,8 @@ i, 0) == CAM_REQ_CMP) { softc->frozen |= (1 << i); xpt_acquire_device(dpath->device); - cam_freeze_devq(dpath); + cam_freeze_devq_arg(dpath, + RELSIM_RELEASE_RUNLEVEL, CAM_RL_BUS + 1); xpt_free_path(dpath); } } @@ -200,7 +201,8 @@ xpt_path_path_id(periph->path), i, 0) == CAM_REQ_CMP) { softc->frozen &= ~(1 << i); - cam_release_devq(dpath, 0, 0, 0, FALSE); + cam_release_devq(dpath, + RELSIM_RELEASE_RUNLEVEL, 0, CAM_RL_BUS + 1, FALSE); xpt_release_device(dpath->device); xpt_free_path(dpath); } @@ -310,7 +312,7 @@ if (softc->state == PMP_STATE_NORMAL) { softc->state = PMP_STATE_PORTS; cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_BUS); + xpt_schedule(periph, CAM_PRIORITY_DEV); } else softc->restart = 1; break; @@ -383,7 +385,7 @@ /* Check if the SIM does not want queued commands */ bzero(&cpi, sizeof(cpi)); - xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NONE); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -408,7 +410,7 @@ * the end of probe. */ (void)cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_BUS); + xpt_schedule(periph, CAM_PRIORITY_DEV); return(CAM_REQ_CMP); } @@ -436,7 +438,7 @@ xpt_path_path_id(periph->path), softc->pm_step, 0) == CAM_REQ_CMP) { bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, dpath, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, dpath, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_USER_SETTINGS; xpt_action((union ccb *)&cts); @@ -539,7 +541,6 @@ struct ccb_trans_settings cts; struct pmp_softc *softc; struct ccb_ataio *ataio; - union ccb *work_ccb; struct cam_path *path, *dpath; u_int32_t priority, res; @@ -569,13 +570,11 @@ softc->restart = 0; if (softc->state == PMP_STATE_SCAN) { pmpfreeze(periph, 1 << softc->pm_step); - work_ccb = done_ccb; - done_ccb = (union ccb*)work_ccb->ccb_h.ppriv_ptr0; /* Free the current request path- we're done with it. */ - xpt_free_path(work_ccb->ccb_h.path); - xpt_free_ccb(work_ccb); - } - xpt_release_ccb(done_ccb); + xpt_free_path(done_ccb->ccb_h.path); + xpt_free_ccb(done_ccb); + } else + xpt_release_ccb(done_ccb); softc->state = PMP_STATE_PORTS; xpt_schedule(periph, priority); return; @@ -665,7 +664,7 @@ xpt_path_path_id(periph->path), softc->pm_step, 0) == CAM_REQ_CMP) { bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, dpath, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, dpath, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; cts.xport_specific.sata.revision = (res & 0x0f0) >> 4; @@ -728,17 +727,16 @@ if (softc->found) { softc->pm_step = 0; softc->state = PMP_STATE_SCAN; - work_ccb = xpt_alloc_ccb_nowait(); - if (work_ccb != NULL) - goto do_scan; xpt_release_ccb(done_ccb); + done_ccb = xpt_alloc_ccb_nowait(); + if (done_ccb == NULL) + goto done1; + goto do_scan; } break; case PMP_STATE_SCAN: - work_ccb = done_ccb; - done_ccb = (union ccb*)work_ccb->ccb_h.ppriv_ptr0; /* Free the current request path- we're done with it. */ - xpt_free_path(work_ccb->ccb_h.path); + xpt_free_path(done_ccb->ccb_h.path); softc->pm_step++; do_scan: while (softc->pm_step < softc->pm_ports && @@ -746,24 +744,22 @@ softc->pm_step++; } if (softc->pm_step >= softc->pm_ports) { - xpt_free_ccb(work_ccb); - break; + xpt_free_ccb(done_ccb); + goto done1; } if (xpt_create_path(&dpath, periph, - done_ccb->ccb_h.path_id, + xpt_path_path_id(periph->path), softc->pm_step, 0) != CAM_REQ_CMP) { printf("pmpdone: xpt_create_path failed" ", bus scan halted\n"); - xpt_free_ccb(work_ccb); - break; + xpt_free_ccb(done_ccb); + goto done1; } - xpt_setup_ccb(&work_ccb->ccb_h, dpath, - done_ccb->ccb_h.pinfo.priority); - work_ccb->ccb_h.func_code = XPT_SCAN_LUN; - work_ccb->ccb_h.cbfcnp = pmpdone; - work_ccb->ccb_h.ppriv_ptr0 = done_ccb; - work_ccb->crcn.flags = done_ccb->crcn.flags; - xpt_action(work_ccb); + xpt_setup_ccb(&done_ccb->ccb_h, dpath, CAM_PRIORITY_XPT); + done_ccb->ccb_h.func_code = XPT_SCAN_LUN; + done_ccb->ccb_h.cbfcnp = pmpdone; + done_ccb->crcn.flags = done_ccb->crcn.flags; + xpt_action(done_ccb); pmprelease(periph, 1 << softc->pm_step); return; default: @@ -771,6 +767,7 @@ } done: xpt_release_ccb(done_ccb); +done1: softc->state = PMP_STATE_NORMAL; pmprelease(periph, -1); cam_periph_release_locked(periph); ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#67 (text+ko) ==== @@ -232,7 +232,6 @@ return (status); } - /* * Ensure we've waited at least a bus settle * delay before attempting to probe the device. @@ -240,6 +239,11 @@ */ cam_periph_freeze_after_event(periph, &periph->path->bus->last_reset, scsi_delay); + /* + * Ensure nobody slip in until probe finish. + */ + cam_freeze_devq_arg(periph->path, + RELSIM_RELEASE_RUNLEVEL, CAM_RL_XPT + 1); probeschedule(periph); return(CAM_REQ_CMP); } @@ -254,7 +258,7 @@ softc = (probe_softc *)periph->softc; ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); - xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cpi.ccb_h, periph->path, CAM_PRIORITY_NONE); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -269,7 +273,7 @@ else softc->flags &= ~PROBE_NO_ANNOUNCE; - xpt_schedule(periph, CAM_PRIORITY_HOST); + xpt_schedule(periph, CAM_PRIORITY_XPT); } static void @@ -339,7 +343,7 @@ mode = 0; /* Fetch user modes from SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_USER_SETTINGS; xpt_action((union ccb *)&cts); @@ -355,7 +359,7 @@ wantmode = mode = ata_max_mode(ident_buf, mode); /* Report modes to SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; if (path->device->transport == XPORT_ATA) { @@ -368,7 +372,7 @@ xpt_action((union ccb *)&cts); /* Fetch current modes from SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb *)&cts); @@ -400,7 +404,7 @@ bytecount = 8192; /* SATA maximum */ /* Fetch user bytecount from SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_USER_SETTINGS; xpt_action((union ccb *)&cts); @@ -416,7 +420,7 @@ bytecount / ata_logical_sector_size(ident_buf))); /* Report bytecount to SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; if (path->device->transport == XPORT_ATA) { @@ -431,7 +435,7 @@ xpt_action((union ccb *)&cts); /* Fetch current bytecount from SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb *)&cts); @@ -462,7 +466,7 @@ bytecount = 8192; /* SATA maximum */ /* Fetch user bytecount from SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_USER_SETTINGS; xpt_action((union ccb *)&cts); @@ -482,7 +486,7 @@ } /* Report bytecount to SIM. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; if (path->device->transport == XPORT_ATA) { @@ -560,7 +564,7 @@ { struct ccb_trans_settings cts; - xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_USER_SETTINGS; xpt_action((union ccb *)&cts); @@ -582,7 +586,7 @@ struct ccb_trans_settings_spi *spi; memset(&cts, 0, sizeof (cts)); - xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb *)&cts); @@ -739,7 +743,7 @@ done_ccb->ccb_h.target_id == 15) { /* Report SIM that PM is present. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; cts.xport_specific.sata.pm_present = 1; @@ -836,7 +840,7 @@ path->bus->sim->max_tagged_dev_openings != 0) { /* Report SIM which tags are allowed. */ bzero(&cts, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; cts.xport_specific.sata.tags = path->device->maxtags; @@ -964,6 +968,8 @@ done_ccb->ccb_h.ppriv_field1 = found; xpt_done(done_ccb); if (TAILQ_FIRST(&softc->request_ccbs) == NULL) { + cam_release_devq(periph->path, + RELSIM_RELEASE_RUNLEVEL, 0, CAM_RL_XPT + 1, FALSE); cam_periph_invalidate(periph); cam_periph_release_locked(periph); } else { @@ -1147,7 +1153,7 @@ CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_scan_lun\n")); - xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -1185,7 +1191,7 @@ free(new_path, M_CAMXPT); return; } - xpt_setup_ccb(&request_ccb->ccb_h, new_path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&request_ccb->ccb_h, new_path, CAM_PRIORITY_XPT); request_ccb->ccb_h.cbfcnp = xptscandone; request_ccb->ccb_h.func_code = XPT_SCAN_LUN; request_ccb->crcn.flags = flags; @@ -1284,7 +1290,7 @@ struct ata_params *ident_buf = NULL; /* Get transport information from the SIM */ - xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -1304,7 +1310,7 @@ ata_version(ident_buf->version_major) : cpi.transport_version; /* Tell the controller what we think */ - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; cts.transport = path->device->transport; @@ -1432,7 +1438,7 @@ inq_data = &device->inq_data; scsi = &cts->proto_specific.scsi; - xpt_setup_ccb(&cpi.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cpi.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NONE); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -1453,7 +1459,7 @@ * Perform sanity checking against what the * controller and device can do. */ - xpt_setup_ccb(&cur_cts.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cur_cts.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NONE); cur_cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cur_cts.type = cts->type; xpt_action((union ccb *)&cur_cts); ==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#12 (text+ko) ==== @@ -60,18 +60,29 @@ struct cam_periph; /* - * Priority information for a CAM structure. The generation number is - * incremented everytime a new entry is entered into the queue giving round - * robin per priority level scheduling. + * Priority information for a CAM structure. + */ +typedef enum { + CAM_RL_HOST, + CAM_RL_BUS, + CAM_RL_XPT, + CAM_RL_DEV, + CAM_RL_NORMAL, + CAM_RL_VALUES +} cam_rl; +/* + * The generation number is incremented everytime a new entry is entered into + * the queue giving round robin per priority level scheduling. */ typedef struct { u_int32_t priority; -#define CAM_PRIORITY_HOST 100 -#define CAM_PRIORITY_BUS 200 -#define CAM_PRIORITY_DEV 300 -#define CAM_PRIORITY_HIGH 400 -#define CAM_PRIORITY_NORMAL 500 +#define CAM_PRIORITY_HOST ((CAM_RL_HOST << 8) + 0x80) +#define CAM_PRIORITY_BUS ((CAM_RL_BUS << 8) + 0x80) +#define CAM_PRIORITY_XPT ((CAM_RL_XPT << 8) + 0x80) +#define CAM_PRIORITY_DEV ((CAM_RL_DEV << 8) + 0x80) +#define CAM_PRIORITY_NORMAL ((CAM_RL_NORMAL << 8) + 0x80) #define CAM_PRIORITY_NONE (u_int32_t)-1 +#define CAM_PRIORITY_TO_RL(x) ((x) >> 8) u_int32_t generation; int index; #define CAM_UNQUEUED_INDEX -1 ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#37 (text+ko) ==== @@ -126,7 +126,7 @@ XPT_PATH_INQ = 0x04, /* Path routing inquiry */ XPT_REL_SIMQ = 0x05, - /* Release a frozen SIM queue */ + /* Release a frozen device queue */ XPT_SASYNC_CB = 0x06, /* Set Asynchronous Callback Parameters */ XPT_SDEV_TYPE = 0x07, @@ -142,6 +142,8 @@ /* Path statistics (error counts, etc.) */ XPT_GDEV_STATS = 0x0c, /* Device statistics (error counts, etc.) */ + XPT_FREEZE_QUEUE = 0x0d, + /* Freeze device queue */ /* SCSI Control Functions: 0x10->0x1F */ XPT_ABORT = 0x10, /* Abort the specified CCB */ @@ -685,8 +687,9 @@ #define RELSIM_RELEASE_AFTER_TIMEOUT 0x02 #define RELSIM_RELEASE_AFTER_CMDCMPLT 0x04 #define RELSIM_RELEASE_AFTER_QEMPTY 0x08 +#define RELSIM_RELEASE_RUNLEVEL 0x10 u_int32_t openings; - u_int32_t release_timeout; + u_int32_t release_timeout; /* Abstract argument. */ u_int32_t qfrozen_cnt; }; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#45 (text+ko) ==== @@ -950,17 +950,26 @@ void cam_freeze_devq(struct cam_path *path) { - struct ccb_hdr ccb_h; + + cam_freeze_devq_arg(path, 0, 0); +} + +void +cam_freeze_devq_arg(struct cam_path *path, uint32_t flags, uint32_t arg) +{ + struct ccb_relsim crs; - xpt_setup_ccb(&ccb_h, path, CAM_PRIORITY_NORMAL); - ccb_h.func_code = XPT_NOOP; - ccb_h.flags = CAM_DEV_QFREEZE; - xpt_action((union ccb *)&ccb_h); + xpt_setup_ccb(&crs.ccb_h, path, CAM_PRIORITY_NONE); + crs.ccb_h.func_code = XPT_FREEZE_QUEUE; + crs.release_flags = flags; + crs.openings = arg; + crs.release_timeout = arg; + xpt_action((union ccb *)&crs); } u_int32_t cam_release_devq(struct cam_path *path, u_int32_t relsim_flags, - u_int32_t openings, u_int32_t timeout, + u_int32_t openings, u_int32_t arg, int getcount_only) { struct ccb_relsim crs; @@ -970,7 +979,7 @@ crs.ccb_h.flags = getcount_only ? CAM_DEV_QFREEZE : 0; crs.release_flags = relsim_flags; crs.openings = openings; - crs.release_timeout = timeout; + crs.release_timeout = arg; xpt_action((union ccb *)&crs); return (crs.qfrozen_cnt); } @@ -1580,7 +1589,7 @@ * the proper order before we release normal * transactions to the device. */ - ccb->ccb_h.pinfo.priority = CAM_PRIORITY_DEV; + ccb->ccb_h.pinfo.priority--; ccb->ccb_h.flags |= CAM_DEV_QFREEZE; ccb->ccb_h.saved_ccb_ptr = save_ccb; error = ERESTART; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#24 (text+ko) ==== @@ -165,8 +165,10 @@ cam_flags camflags, u_int32_t sense_flags)); void cam_freeze_devq(struct cam_path *path); +void cam_freeze_devq_arg(struct cam_path *path, u_int32_t flags, + uint32_t arg); u_int32_t cam_release_devq(struct cam_path *path, u_int32_t relsim_flags, - u_int32_t opening_reduction, u_int32_t timeout, + u_int32_t opening_reduction, u_int32_t arg, int getcount_only); void cam_periph_async(struct cam_periph *periph, u_int32_t code, struct cam_path *path, void *arg); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#7 (text+ko) ==== @@ -34,6 +34,7 @@ #ifdef _KERNEL #include +#include /* * This structure implements a heap based priority queue. The queue @@ -47,7 +48,7 @@ int array_size; int entries; u_int32_t generation; - u_int32_t qfrozen_cnt; + u_int32_t qfrozen_cnt[CAM_RL_VALUES]; }; TAILQ_HEAD(ccb_hdr_tailq, ccb_hdr); @@ -140,6 +141,10 @@ /* Index the first element in the heap */ #define CAMQ_GET_HEAD(camq) ((camq)->queue_array[CAMQ_HEAD]) +/* Get the first element priority. */ +#define CAMQ_GET_PRIO(camq) (((camq)->entries > 0) ? \ + ((camq)->queue_array[CAMQ_HEAD]->priority) : 0) + /* * camq_change_priority: Raise or lower the priority of an entry * maintaining queue order. @@ -153,10 +158,10 @@ static __inline void cam_ccbq_take_opening(struct cam_ccbq *ccbq); -static __inline void +static __inline int cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb); -static __inline void +static __inline int cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb); static __inline union ccb * @@ -185,17 +190,33 @@ ccbq->held++; } -static __inline void +static __inline int cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb) { ccbq->held--; camq_insert(&ccbq->queue, &new_ccb->ccb_h.pinfo); + if (ccbq->queue.qfrozen_cnt[CAM_PRIORITY_TO_RL( + new_ccb->ccb_h.pinfo.priority)] > 0) { + ccbq->dev_openings++; + ccbq->devq_openings++; + ccbq->held++; + return (1); + } else + return (0); } -static __inline void +static __inline int cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb) { camq_remove(&ccbq->queue, ccb->ccb_h.pinfo.index); + if (ccbq->queue.qfrozen_cnt[CAM_PRIORITY_TO_RL( + ccb->ccb_h.pinfo.priority)] > 0) { + ccbq->dev_openings--; + ccbq->devq_openings--; + ccbq->held--; + return (1); + } else + return (0); } static __inline union ccb * @@ -229,5 +250,83 @@ ccbq->devq_openings++; } +static __inline int +cam_ccbq_freeze(struct cam_ccbq *ccbq, cam_rl rl, u_int32_t cnt) +{ + int i, frozen = 0; + cam_rl p, n; + + /* Find pevious run level. */ + for (p = 0; p < CAM_RL_VALUES && ccbq->queue.qfrozen_cnt[p] == 0; p++); + /* Find new run level. */ + n = min(rl, p); + /* Apply new run level. */ + for (i = rl; i < CAM_RL_VALUES; i++) + ccbq->queue.qfrozen_cnt[i] += cnt; + /* Update ccbq statistics. */ + if (n == p) + return (0); + for (i = CAMQ_HEAD; i <= ccbq->queue.entries; i++) { + cam_rl rrl = + CAM_PRIORITY_TO_RL(ccbq->queue.queue_array[i]->priority); + if (rrl < n) + continue; + if (rrl >= p) + break; + ccbq->dev_openings++; + ccbq->devq_openings++; + ccbq->held++; + frozen++; + } + return (frozen); +} + +static __inline int +cam_ccbq_release(struct cam_ccbq *ccbq, cam_rl rl, u_int32_t cnt) +{ + int i, released = 0; + cam_rl p, n; + + /* Apply new run level. */ + for (i = rl; i < CAM_RL_VALUES; i++) + ccbq->queue.qfrozen_cnt[i] -= cnt; + /* Find new run level. */ + for (n = 0; n < CAM_RL_VALUES && ccbq->queue.qfrozen_cnt[n] == 0; n++); + /* Find previous run level. */ + p = min(rl, n); + /* Update ccbq statistics. */ + if (n == p) + return (0); + for (i = CAMQ_HEAD; i <= ccbq->queue.entries; i++) { + cam_rl rrl = + CAM_PRIORITY_TO_RL(ccbq->queue.queue_array[i]->priority); + if (rrl < p) + continue; + if (rrl >= n) + break; + ccbq->dev_openings--; + ccbq->devq_openings--; + ccbq->held--; + released++; + } + return (released); +} + +static __inline u_int32_t +cam_ccbq_frozen(struct cam_ccbq *ccbq, cam_rl rl) +{ + + return (ccbq->queue.qfrozen_cnt[rl]); +} + +static __inline u_int32_t +cam_ccbq_frozen_top(struct cam_ccbq *ccbq) +{ + cam_rl rl; + + rl = CAM_PRIORITY_TO_RL(CAMQ_GET_PRIO(&ccbq->queue)); + return (ccbq->queue.qfrozen_cnt[rl]); +} + #endif /* _KERNEL */ #endif /* _CAM_CAM_QUEUE_H */ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#134 (text+ko) ==== @@ -210,11 +210,12 @@ static path_id_t xptpathid(const char *sim_name, int sim_unit, int sim_bus); static union ccb *xpt_get_ccb(struct cam_ed *device); static void xpt_run_dev_allocq(struct cam_eb *bus); +static void xpt_run_dev_sendq(struct cam_eb *bus); static timeout_t xpt_release_devq_timeout; static void xpt_release_simq_timeout(void *arg) __unused; static void xpt_release_bus(struct cam_eb *bus); -static void xpt_release_devq_device(struct cam_ed *dev, u_int count, - int run_queue); +static void xpt_release_devq_device(struct cam_ed *dev, cam_rl rl, + u_int count, int run_queue); static struct cam_et* xpt_alloc_target(struct cam_eb *bus, target_id_t target_id); static void xpt_release_target(struct cam_et *target); @@ -285,19 +286,19 @@ static xpt_busfunc_t xptsetasyncbusfunc; static cam_status xptregister(struct cam_periph *periph, void *arg); -static __inline int xpt_schedule_dev_allocq(struct cam_eb *bus, - struct cam_ed *dev); static __inline int periph_is_queued(struct cam_periph *periph); static __inline int device_is_alloc_queued(struct cam_ed *device); static __inline int device_is_send_queued(struct cam_ed *device); -static __inline int dev_allocq_is_runnable(struct cam_devq *devq); static __inline int xpt_schedule_dev_allocq(struct cam_eb *bus, struct cam_ed *dev) { int retval; - if (dev->ccbq.devq_openings > 0) { + if ((dev->drvq.entries > 0) && + (dev->ccbq.devq_openings > 0) && + (cam_ccbq_frozen(&dev->ccbq, CAM_PRIORITY_TO_RL( + CAMQ_GET_PRIO(&dev->drvq))) == 0)) { /* * The priority of a device waiting for CCB resources * is that of the the highest priority peripheral driver @@ -305,7 +306,7 @@ */ retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, &dev->alloc_ccb_entry.pinfo, - CAMQ_GET_HEAD(&dev->drvq)->priority); + CAMQ_GET_PRIO(&dev->drvq)); } else { retval = 0; } @@ -318,7 +319,9 @@ { int retval; - if (dev->ccbq.dev_openings > 0) { + if ((dev->ccbq.queue.entries > 0) && + (dev->ccbq.dev_openings > 0) && + (cam_ccbq_frozen_top(&dev->ccbq) == 0)) { /* * The priority of a device waiting for controller * resources is that of the the highest priority CCB @@ -327,7 +330,7 @@ retval = xpt_schedule_dev(&bus->sim->devq->send_queue, &dev->send_ccb_entry.pinfo, - CAMQ_GET_HEAD(&dev->ccbq.queue)->priority); + CAMQ_GET_PRIO(&dev->ccbq.queue)); } else { retval = 0; } @@ -352,19 +355,6 @@ return (device->send_ccb_entry.pinfo.index != CAM_UNQUEUED_INDEX); } -static __inline int -dev_allocq_is_runnable(struct cam_devq *devq) -{ - /* - * Have work to do. - * Have space to do more work. - * Allowed to do work. - */ - return ((devq->alloc_queue.qfrozen_cnt == 0) - && (devq->alloc_queue.entries > 0) - && (devq->alloc_openings > 0)); -} - static void xpt_periph_init() { @@ -852,7 +842,7 @@ else ccb->ccb_h.func_code = XPT_SCAN_LUN; ccb->ccb_h.cbfcnp = xptdone; - xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, CAM_PRIORITY_BUS); + xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, CAM_PRIORITY_XPT); cam_periph_runccb(ccb, NULL, 0, 0, NULL); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); @@ -2546,17 +2536,14 @@ case XPT_RESET_DEV: case XPT_ENG_EXEC: { - struct cam_path *path; - int runq; + struct cam_path *path = start_ccb->ccb_h.path; + int frozen; - path = start_ccb->ccb_h.path; - - cam_ccbq_insert_ccb(&path->device->ccbq, start_ccb); - if (path->device->ccbq.queue.qfrozen_cnt == 0) - runq = xpt_schedule_dev_sendq(path->bus, path->device); - else - runq = 0; - if (runq != 0) + frozen = cam_ccbq_insert_ccb(&path->device->ccbq, start_ccb); + path->device->sim->devq->alloc_openings += frozen; + if (frozen > 0) + xpt_run_dev_allocq(path->bus); + if (xpt_schedule_dev_sendq(path->bus, path->device)) xpt_run_dev_sendq(path->bus); break; } @@ -2601,9 +2588,12 @@ if (abort_ccb->ccb_h.pinfo.index >= 0) { struct cam_ccbq *ccbq; + struct cam_ed *device; - ccbq = &abort_ccb->ccb_h.path->device->ccbq; - cam_ccbq_remove_ccb(ccbq, abort_ccb); + device = abort_ccb->ccb_h.path->device; + ccbq = &device->ccbq; + device->sim->devq->alloc_openings -= + cam_ccbq_remove_ccb(ccbq, abort_ccb); abort_ccb->ccb_h.status = CAM_REQ_ABORTED|CAM_DEV_QFRZN; xpt_freeze_devq(abort_ccb->ccb_h.path, 1); @@ -3008,11 +2998,12 @@ } if ((start_ccb->ccb_h.flags & CAM_DEV_QFREEZE) == 0) { - - xpt_release_devq(crs->ccb_h.path, /*count*/1, - /*run_queue*/TRUE); + xpt_release_devq_rl(crs->ccb_h.path, /*runlevel*/ + (crs->release_flags & RELSIM_RELEASE_RUNLEVEL) ? + crs->release_timeout : 0, + /*count*/1, /*run_queue*/TRUE); } - start_ccb->crs.qfrozen_cnt = dev->ccbq.queue.qfrozen_cnt; + start_ccb->crs.qfrozen_cnt = dev->ccbq.queue.qfrozen_cnt[0]; start_ccb->ccb_h.status = CAM_REQ_CMP; break; } @@ -3049,6 +3040,16 @@ #endif /* CAMDEBUG */ break; } + case XPT_FREEZE_QUEUE: + { + struct ccb_relsim *crs = &start_ccb->crs; + + xpt_freeze_devq_rl(crs->ccb_h.path, /*runlevel*/ + (crs->release_flags & RELSIM_RELEASE_RUNLEVEL) ? + crs->release_timeout : 0, /*count*/1); + start_ccb->ccb_h.status = CAM_REQ_CMP; + break; + } case XPT_NOOP: if ((start_ccb->ccb_h.flags & CAM_DEV_QFREEZE) != 0) xpt_freeze_devq(start_ccb->ccb_h.path, 1); @@ -3129,7 +3130,7 @@ xpt_schedule(struct cam_periph *perph, u_int32_t new_priority) { struct cam_ed *device; - int runq; + int runq = 0; mtx_assert(perph->sim->mtx, MA_OWNED); @@ -3144,7 +3145,6 @@ perph->pinfo.index, new_priority); } - runq = 0; } else { /* New entry on the queue */ CAM_DEBUG(perph->path, CAM_DEBUG_SUBTRACE, @@ -3219,15 +3219,15 @@ CAM_DEBUG_PRINT(CAM_DEBUG_XPT, (" qfrozen_cnt == 0x%x, entries == %d, " "openings == %d, active == %d\n", - devq->alloc_queue.qfrozen_cnt, + devq->alloc_queue.qfrozen_cnt[0], devq->alloc_queue.entries, devq->alloc_openings, devq->alloc_active)); - devq->alloc_queue.qfrozen_cnt++; + devq->alloc_queue.qfrozen_cnt[0]++; while ((devq->alloc_queue.entries > 0) && (devq->alloc_openings > 0) - && (devq->alloc_queue.qfrozen_cnt <= 1)) { + && (devq->alloc_queue.qfrozen_cnt[0] <= 1)) { struct cam_ed_qinfo *qinfo; struct cam_ed *device; union ccb *work_ccb; @@ -3238,6 +3238,14 @@ CAMQ_HEAD); device = qinfo->device; + /* + * If the device has been "frozen", don't attempt + * to run it. + */ + if (cam_ccbq_frozen(&device->ccbq, + CAM_PRIORITY_TO_RL(qinfo->pinfo.priority)) > 0) + continue; + CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("running device %p\n", device)); @@ -3271,15 +3279,13 @@ break; } - if (drvq->entries > 0) { - /* We have more work. Attempt to reschedule */ - xpt_schedule_dev_allocq(bus, device); - } + /* We may have more work. Attempt to reschedule. */ + xpt_schedule_dev_allocq(bus, device); } - devq->alloc_queue.qfrozen_cnt--; + devq->alloc_queue.qfrozen_cnt[0]--; } -void +static void xpt_run_dev_sendq(struct cam_eb *bus) { struct cam_devq *devq; @@ -3288,10 +3294,10 @@ devq = bus->sim->devq; - devq->send_queue.qfrozen_cnt++; + devq->send_queue.qfrozen_cnt[0]++; while ((devq->send_queue.entries > 0) && (devq->send_openings > 0) - && (devq->send_queue.qfrozen_cnt <= 1)) { + && (devq->send_queue.qfrozen_cnt[0] <= 1)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 9 19:04:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 896A51065781; Sat, 9 Jan 2010 19:04:20 +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 4C6C81065672 for ; Sat, 9 Jan 2010 19:04:20 +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 38AFD8FC1E for ; Sat, 9 Jan 2010 19:04:20 +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 o09J4K1K006032 for ; Sat, 9 Jan 2010 19:04:20 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09J4JrP006030 for perforce@freebsd.org; Sat, 9 Jan 2010 19:04:19 GMT (envelope-from mav@freebsd.org) Date: Sat, 9 Jan 2010 19:04:19 GMT Message-Id: <201001091904.o09J4JrP006030@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 Precedence: bulk Cc: Subject: PERFORCE change 172862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 19:04:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=172862 Change 172862 by mav@mav_mavbook on 2010/01/09 19:03:46 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/UPDATING#26 integrate .. //depot/projects/scottl-camlock/src/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/tcp_wrappers/hosts_access.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall#6 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#8 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_new.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_open.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/Symbol.map#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/fpgetmask.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/fpgetround.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/fpgetsticky.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/fpsetmask.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/fpsetround.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/fpsetsticky.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/hardfloat/fpgetmask.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/hardfloat/fpgetround.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/hardfloat/fpgetsticky.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/hardfloat/fpsetmask.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/hardfloat/fpsetround.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/hardfloat/fpsetsticky.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/brk.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#8 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/cpuset_getaffinity.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/arch/mips/include/pthread_md.h#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/scottl-camlock/src/sbin/dumpfs/dumpfs.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/fsutil.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/pass1.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread.3#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_affinity_np.3#1 branch .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_attr.3#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_attr_affinity_np.3#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/bridge.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/carp.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/faith.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/uart.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/security.7#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sleepqueue.9#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/sys_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfsimpl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfsimpl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfssubr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#46 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.mk#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/makeLINT.mk#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#39 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_i2c.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/de/if_de.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fatm/if_fatm.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iscsi/initiator/isc_sm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mge.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/patm/if_patm_intr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pdq/if_fea.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/safe/safe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro3.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ste/if_ste.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_smb.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_slice.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/uzip/g_uzip.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/PAE#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/locore.s#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/locore.s#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/isa/pnp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_cpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fail.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_firmware.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/if_admsw.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/apb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/apbvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_bus_space_reversed.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_bus_space_reversed.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_ehci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_ohci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_pci_bus_space.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_pci_bus_space.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_spi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_wdog.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xxreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/files.ar71xx#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/if_arge.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/if_argevar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/uart_bus_ar71xx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/uart_cpu_ar71xx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX.hints#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA64#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1.hints#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM.hints#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/XLR#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/include/sysarch.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/Makefile.msgring#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/board.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/board.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/bus_space_rmi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/clock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/clock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcivar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/files.xlr#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/interrupt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/intr_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/iodi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/iomap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/msgring.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/msgring.cfg#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/msgring.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/msgring_xls.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/msgring_xls.cfg#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/on_chip.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_kern.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_percpu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_utils.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_xlrconfig.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/rmi_mips_exts.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/rootfs_list.txt#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/shared_structs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/shared_structs_func.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/shared_structs_offsets.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/std.xlr#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/tick.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/uart_bus_xlr_iodi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/uart_cpu_mips_xlr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_boot1_console.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_csum_nocopy.S#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_i2c.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlrconfig.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xls_ehci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/ata_zbbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/files.sibyte#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_asm.S#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbpci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/crypto/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_db.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_mod.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_fha.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvkrpc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptosoft.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/pci/ncr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/clnt_dg.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#27 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#30 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sleepqueue.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_dirhash.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/xen/xenbus/xenbus_probe.c#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/posixsem2/semtest.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ctags/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xlint/xlint/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cdcontrol/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/faithd/faithd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.8#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/traceroute/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/traceroute/findsaddr-udp.c#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/dump.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/dump.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/usbconfig.8#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/usbconfig.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.358 2009/04/01 17:11:50 bz Exp $ +# $FreeBSD: src/Makefile,v 1.359 2010/01/08 19:01:50 bz Exp $ # # The user-driven targets are: # @@ -278,7 +278,7 @@ # with a reasonable chance of success, regardless of how old your # existing system is. # -.if make(universe) || make(tinderbox) +.if make(universe) || make(universe_kernels) || make(tinderbox) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) @@ -297,10 +297,6 @@ rm -f ${FAILFILE} .endif .for target in ${TARGETS} -KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ - ! -name DEFAULTS ! -name LINT -KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} .ORDER: universe_prologue universe_${target} universe_epilogue universe_${target}: @@ -320,16 +316,25 @@ (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) .endif + @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ + universe_kernels + @echo ">> ${target} completed on `LC_ALL=C date`" +.endfor +universe_kernels: universe_kernconfs +BUILD_ARCH!= uname -p +TARGET?= ${BUILD_ARCH} +KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ + ! -name DEFAULTS ! -name NOTES +universe_kernconfs: .for kernel in ${KERNCONFS} @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ ${MAKE} ${JFLAG} buildkernel \ - TARGET=${target} \ + TARGET=${TARGET} \ KERNCONF=${kernel} \ - > _.${target}.${kernel} 2>&1 || \ - (echo "${target} ${kernel} kernel failed," \ - "check _.${target}.${kernel} for details"| ${MAKEFAIL})) -.endfor - @echo ">> ${target} completed on `LC_ALL=C date`" + > _.${TARGET}.${kernel} 2>&1 || \ + (echo "${TARGET} ${kernel} kernel failed," \ + "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL})) .endfor universe: universe_epilogue universe_epilogue: ==== //depot/projects/scottl-camlock/src/UPDATING#26 (text+ko) ==== @@ -22,6 +22,11 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100108: + Introduce the kernel thread "deadlock resolver" (which can be enabled + via the DEADLKRES option, see NOTES for more details) and the + sleepq_type() function for sleepqueues. + 20091202: The rc.firewall and rc.firewall6 were unified, and rc.firewall6 and rc.d/ip6fw were removed. @@ -1089,4 +1094,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.650 2009/12/25 21:14:34 ru Exp $ +$FreeBSD: src/UPDATING,v 1.651 2010/01/09 01:46:38 attilio Exp $ ==== //depot/projects/scottl-camlock/src/contrib/gcc/config/mips/freebsd.h#2 (text+ko) ==== @@ -19,7 +19,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/mips/freebsd.h,v 1.2 2008/09/01 23:09:45 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/mips/freebsd.h,v 1.3 2010/01/08 23:37:30 imp Exp $ */ /* This defines which switch letters take arguments. -G is a MIPS special. */ @@ -97,6 +97,9 @@ Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ +#undef TARGET_DEFAULT +#define TARGET_DEFAULT (MASK_ABICALLS | MASK_SOFT_FLOAT) + #if TARGET_ENDIAN_DEFAULT != 0 #define TARGET_VERSION fprintf (stderr, " (FreeBSD/mips)"); #else ==== //depot/projects/scottl-camlock/src/contrib/tcp_wrappers/hosts_access.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * - * $FreeBSD: src/contrib/tcp_wrappers/hosts_access.c,v 1.5 2005/05/13 16:31:08 ume Exp $ + * $FreeBSD: src/contrib/tcp_wrappers/hosts_access.c,v 1.6 2010/01/08 10:54:15 sobomax Exp $ */ #ifndef lint @@ -148,6 +148,7 @@ char *sh_cmd; /* becomes optional shell command */ int match = NO; struct tcpd_context saved_context; + char *cp; saved_context = tcpd_context; /* stupid compilers */ @@ -164,7 +165,16 @@ tcpd_warn("missing newline or line too long"); continue; } - if (sv_list[0] == '#' || sv_list[strspn(sv_list, " \t\r\n")] == 0) + /* Ignore anything after unescaped # character */ + for (cp = strchr(sv_list, '#'); cp != NULL;) { + if (cp > sv_list && cp[-1] == '\\') { + cp = strchr(cp + 1, '#'); + continue; + } + *cp = '\0'; + break; + } + if (sv_list[strspn(sv_list, " \t\r\n")] == 0) continue; if ((cl_list = split_at(sv_list, ':')) == 0) { tcpd_warn("missing \":\" separator"); ==== //depot/projects/scottl-camlock/src/etc/rc.firewall#6 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.62 2009/12/29 11:27:51 ume Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.63 2010/01/07 17:46:25 ume Exp $ # # @@ -505,7 +505,10 @@ # Allow "mandatory" ICMP in. ${fwcmd} add pass icmp from any to any icmptype 3,4,11 - + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass ipv6-icmp from any to any icmp6type 3 + fi + # Add permits for this workstations published services below # Only IPs and nets in firewall_allowservices is allowed in. # If you really wish to let anyone use services on your ==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#8 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.34 2010/01/05 23:35:43 stas Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.35 2010/01/07 23:30:10 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -665,10 +665,10 @@ % As we know, there are known knowns. There are things we know we know. We also know there are known unknowns. That is to say, we know -there're some things we do not know. But there're also unknown unknowns; -the ones we don't know we don't know." +there are some things we do not know. But there are also unknown +unknowns; the ones we don't know we don't know. -- United States Secretary of Defense Donald Rumsfeld - 12 February 2002, on the invasion to Iraq. + 12 February 2002, Regarding the US invasion of Iraq % "Are pirates an ethnic group? Or are they just people who burn illegal cds?" ==== //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.67 2009/12/14 01:51:23 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.68 2010/01/08 23:11:23 imp Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -115,6 +115,10 @@ # _fixsfsi _fixunssfsi _floatdidf _floatdisf .endif +.if ${TARGET_ARCH} == "mips" +LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c +.endif + .if ${TARGET_ARCH} == "ia64" # from config/ia64/t-ia64 LIB1ASMSRC = lib1funcs.asm @@ -179,7 +183,7 @@ # # Floating point emulation functions # -.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \ +.if ${TARGET_ARCH} == "armNOT_YET" || \ ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/Makefile.inc0#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.38 2007/02/11 07:15:05 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.39 2010/01/08 23:06:56 imp Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -22,7 +22,8 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || \ + ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "mips" CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/ld/Makefile.mips#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.mips,v 1.8 2008/12/11 08:18:45 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.mips,v 1.9 2010/01/08 23:09:11 imp Exp $ #xxxIMPxxx: size? #xxxIMPxxx: TARGET_BIG_ENDIAN is lame. We should use the netbsd convention @@ -10,15 +10,22 @@ NATIVE_EMULATION=elf${_sz}ltsmip_fbsd .endif -SRCS+= e${NATIVE_EMULATION}.c -CLEANFILES+= e${NATIVE_EMULATION}.c - +MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd +.for abi in ${MIPS_ABIS} +#.if (${abi} != ${NATIVE_EMULATION}) +EMS+= ${abi} +#.endif +.for ext in ${ELF_SCR_EXT} +LDSCRIPTS+= ${abi}.${ext} +.endfor +SRCS+= e${abi}.c +CLEANFILES+= e${abi}.c # nb: elf32 handles both elf32 and elf64 targets -e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \ +e${abi}.c: ${.CURDIR}/${abi}.sh emultempl/elf32.em \ scripttempl/elf.sc genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \ - ${.CURDIR}/${NATIVE_EMULATION}.sh - + ${abi} "" no ${abi} ${TARGET_TUPLE} \ + ${.CURDIR}/${abi}.sh +.endfor ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/Makefile.tgt#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.13 2008/09/01 18:46:03 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.14 2010/01/08 23:02:17 imp Exp $ TARGET_ARCH?= ${MACHINE_ARCH} @@ -15,9 +15,6 @@ .if ${TARGET_ARCH} == "ia64" TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD .endif -.if ${TARGET_ARCH} == "mips" -TARGET_CPU_DEFAULT= 16 -.endif .if ${TARGET_ARCH} == "sparc64" TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif ==== //depot/projects/scottl-camlock/src/lib/libc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.78 2009/07/14 21:19:13 kan Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.79 2010/01/09 00:01:35 imp Exp $ SHLIBDIR?= /lib @@ -64,7 +64,7 @@ .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" ==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.19 2009/12/08 20:48:06 jilles Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.21 2010/01/09 05:40:46 davidxu Exp $ .\" -.Dd December 8, 2009 +.Dd January 7, 2010 .Dt SEM_INIT 3 .Os .Sh NAME @@ -46,9 +46,19 @@ .Fa sem to have the value .Fa value . +.Pp A non-zero value for .Fa pshared -specifies a shared semaphore that can be used by multiple processes. +specifies a shared semaphore that can be used by multiple processes, +the semaphore should be located in shared memory region (see +.Xr mmap 2 , +.Xr shm_open 2 , +and +.Xr shmget 2 ) , +any process having read and write access to address +.Fa sem +can perform semaphore operations on +.Fa sem . .Pp Following a successful call to .Fn sem_init , @@ -90,10 +100,3 @@ .Fn sem_init function conforms to .St -p1003.1-96 . -.Sh BUGS -A sem_t is a pointer to a separately allocated structure, -therefore process shared semaphores only work between related processes -and do not perform very well -(each operation is a system call, -while single-process semaphores only do a system call -if they need to block or wake up a thread). ==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_new.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/sem_new.c,v 1.3 2010/01/05 06:40:27 davidxu Exp $ + * $FreeBSD: src/lib/libc/gen/sem_new.c,v 1.4 2010/01/07 04:15:49 davidxu Exp $ */ #include "namespace.h" @@ -143,6 +143,7 @@ struct sem_nameinfo *ni = NULL; sem_t *sem = NULL; int fd = -1, mode, len; + int value = 0; if (name[0] != '/') { errno = EINVAL; @@ -170,6 +171,7 @@ if (flags & O_CREAT) { va_start(ap, flags); mode = va_arg(ap, int); + value = va_arg(ap, int); va_end(ap); } @@ -203,7 +205,7 @@ tmp._magic = SEM_MAGIC; tmp._kern._has_waiters = 0; - tmp._kern._count = 0; + tmp._kern._count = value; tmp._kern._flags = USYNC_PROCESS_SHARED | SEM_NAMED; if (_write(fd, &tmp, sizeof(tmp)) != sizeof(tmp)) { flock(fd, LOCK_UN); ==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_open.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.13 2007/12/27 21:55:49 jhb Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.14 2010/01/09 05:40:46 davidxu Exp $ .\" .Dd January 15, 2003 .Dt SEM_OPEN 3 @@ -58,6 +58,12 @@ and .Fn sem_close . .Pp +This implementation places strict requirements on the value of +.Fa name : +it must begin with a slash +.Pq Ql / , +contain no other slash characters. +.Pp The following bits may be set in the .Fa oflag argument: @@ -217,11 +223,3 @@ .Sh HISTORY Support for named semaphores first appeared in .Fx 5.0 . -.Sh BUGS -This implementation places strict requirements on the value of -.Fa name : -it must begin with a slash -.Pq Ql / , -contain no other slash characters, -and be less than 14 characters in length -not including the terminating null character. ==== //depot/projects/scottl-camlock/src/lib/libc/mips/Symbol.map#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/mips/Symbol.map,v 1.2 2009/02/19 18:03:41 imp Exp $ + * $FreeBSD: src/lib/libc/mips/Symbol.map,v 1.4 2010/01/09 00:01:35 imp Exp $ */ /* @@ -56,9 +56,27 @@ __siglongjmp; __sys_vfork; _vfork; - end; /* XXX - Should this be _end (see sys/brk.S)? */ - curbrk; + _end; + __curbrk; minbrk; _brk; _sbrk; + + /* softfloat */ + __addsf3; + __adddf3; + __subsf3; + __subdf3; + __mulsf3; + __muldf3; + __divsf3; + __divdf3; + __floatsisf; + __floatsidf; + __fixsfsi; + __fixdfsi; + __fixunssfsi; + __fixunsdfsi; + __extendsfdf2; + __truncdfsf2; }; ==== //depot/projects/scottl-camlock/src/lib/libc/mips/sys/brk.S#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.3 2008/04/26 12:08:02 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.4 2010/01/08 23:59:04 imp Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -42,15 +42,12 @@ #endif /* LIBC_SCCS and not lint */ .globl _C_LABEL(minbrk) - .globl _C_LABEL(curbrk) + .globl _C_LABEL(__curbrk) .globl _C_LABEL(_end) .data _C_LABEL(minbrk): .word _C_LABEL(_end) -_C_LABEL(curbrk): - .word _C_LABEL(_end) - .text LEAF(__sys_brk) WEAK_ALIAS(brk, __sys_brk) @@ -67,7 +64,7 @@ li v0, SYS_break syscall bne a3, zero, 2f - sw a0, _C_LABEL(curbrk) + sw a0, _C_LABEL(__curbrk) move v0, zero j ra 2: ==== //depot/projects/scottl-camlock/src/lib/libc/stdio/getc.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.21 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.22 2010/01/08 22:02:42 brueffer Exp $ .\" .Dd January 10, 2003 .Dt GETC 3 @@ -56,7 +56,7 @@ .Ft int .Fn getchar void .Ft int -.Fn getchar_unlocked "void" +.Fn getchar_unlocked void .Ft int .Fn getw "FILE *stream" .Sh DESCRIPTION @@ -141,7 +141,7 @@ .Sh STANDARDS The .Fn fgetc , -.Fn getc +.Fn getc , and .Fn getchar functions @@ -167,4 +167,3 @@ varies from one machine to another, and .Fn getw is not recommended for portable applications. -.Pp ==== //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#8 (text+ko) ==== @@ -9,7 +9,7 @@ static char elsieid[] __unused = "@(#)localtime.c 8.9"; #endif /* !defined NOID */ #endif /* !defined lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.49 2009/12/30 19:06:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.50 2010/01/06 20:43:40 jhb Exp $"); /* ** Leap second handling from Bradley White. @@ -1426,7 +1426,7 @@ struct tm *p_tm; if (__isthreaded != 0) { - _once(&localtime_once, localtime_key_init); + _pthread_once(&localtime_once, localtime_key_init); if (localtime_key_error != 0) { errno = localtime_key_error; return(NULL); @@ -1527,7 +1527,7 @@ struct tm *p_tm; if (__isthreaded != 0) { - _once(&gmtime_once, gmtime_key_init); + _pthread_once(&gmtime_once, gmtime_key_init); if (gmtime_key_error != 0) { errno = gmtime_key_error; return(NULL); ==== //depot/projects/scottl-camlock/src/lib/libc/sys/cpuset.2#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.4 2009/12/15 21:02:29 jilles Exp $ +.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.5 2010/01/09 12:31:11 delphij Exp $ .\" -.Dd March 29, 2008 +.Dd January 8, 2010 .Dt CPUSET 2 .Os .Sh NAME @@ -216,7 +216,9 @@ .Xr cpuset 1 , .Xr cpuset_getaffinity 2 , .Xr cpuset_setaffinity 2 , -.Xr CPU_SET 3 +.Xr CPU_SET 3 , +.Xr pthread_affinity_np 3 , +.Xr pthread_attr_affinity_np 3 .Sh HISTORY The .Nm ==== //depot/projects/scottl-camlock/src/lib/libc/sys/cpuset_getaffinity.2#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.4 2008/11/29 14:32:14 bz Exp $ +.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.5 2010/01/09 12:31:11 delphij Exp $ .\" -.Dd November 29, 2008 +.Dd January 8, 2010 .Dt CPUSET 2 .Os .Sh NAME @@ -147,7 +147,9 @@ .Xr cpuset 2 , .Xr cpuset_getid 2 , .Xr cpuset_setid 2 , -.Xr CPU_SET 3 +.Xr CPU_SET 3 , +.Xr pthread_affinity_np 3 , +.Xr pthread_attr_affinity_np 3 .Sh HISTORY The .Nm ==== //depot/projects/scottl-camlock/src/lib/libc/sys/sendfile.2#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.32 2008/02/03 15:54:40 phk Exp $ +.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.35 2010/01/07 21:14:46 kib Exp $ .\" -.Dd November 24, 2006 +.Dd January 7, 2010 .Dt SENDFILE 2 .Os .Sh NAME @@ -116,9 +116,17 @@ block to a separate I/O worker thread. .It .Dv SF_MNOWAIT . -(description missing) +Do not wait for some kernel resource to become available, +in particular, +.Vt mbuf +and +.Vt sf_buf . +The flag does not make the +.Fn sendfile +syscall truly non-blocking, since other resources are still allocated +in a blocking fashion. .It -.Dv SF_SYNC , +.Dv SF_SYNC . .Nm sleeps until the network stack no longer references the VM pages of the file, making subsequent modifications to it safe. ==== //depot/projects/scottl-camlock/src/lib/libthr/arch/mips/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from: src/lib/libthr/arch/arm/include/pthread_md.h,v 1.3 2005/10/29 13:40:31 davidxu - * $FreeBSD: src/lib/libthr/arch/mips/include/pthread_md.h,v 1.1 2008/05/11 05:54:52 imp Exp $ + * $FreeBSD: src/lib/libthr/arch/mips/include/pthread_md.h,v 1.2 2010/01/09 00:07:47 imp Exp $ */ /* @@ -60,7 +60,8 @@ static __inline void _tcb_set(struct tcb *tcb) { - mips_tcb_set(tcb); + + sysarch(MIPS_SET_TLS, tcb); } /* @@ -69,7 +70,10 @@ static __inline struct tcb * _tcb_get(void) { - return (mips_tcb_get()); + void *tcb; + + sysarch(MIPS_GET_TLS, &tcb); + return tcb; } extern struct pthread *_thr_initial; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 9 20:46:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E68E1065676; Sat, 9 Jan 2010 20:46:02 +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 63064106566B for ; Sat, 9 Jan 2010 20:46:02 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 382CC8FC0A for ; Sat, 9 Jan 2010 20:46:02 +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 o09Kk2if014901 for ; Sat, 9 Jan 2010 20:46:02 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09Kk2PH014899 for perforce@freebsd.org; Sat, 9 Jan 2010 20:46:02 GMT (envelope-from raj@freebsd.org) Date: Sat, 9 Jan 2010 20:46:02 GMT Message-Id: <201001092046.o09Kk2PH014899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 20:46:02 -0000 http://p4web.freebsd.org/chv.cgi?CH=172866 Change 172866 by raj@raj_fdt on 2010/01/09 20:45:54 Reorg towards platform-uniform use of FDT {fdt,simple}bus drivers. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#14 edit .. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#1 branch .. //depot/projects/fdt/sys/dev/fdt/fdt_common.h#1 add .. //depot/projects/fdt/sys/dev/fdt/fdtbus.c#1 branch .. //depot/projects/fdt/sys/dev/fdt/simplebus.c#1 branch .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdt_common.c#2 delete .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdt_common.h#2 delete .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdtbus.c#5 delete .. //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.c#3 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/simplebus.c#6 delete Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#14 (text+ko) ==== @@ -31,6 +31,9 @@ dev/adb/adb_if.m optional adb dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/fb/fb.c optional sc +dev/fdt/fdt_common.c optional fdt +dev/fdt/fdtbus.c optional fdt +dev/fdt/simplebus.c optional fdt dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc dev/ofw/openfirm.c optional aim | fdt @@ -119,8 +122,6 @@ powerpc/mpc85xx/atpic.c optional mpc85xx isa powerpc/mpc85xx/ds1553_bus_fdt.c optional ds1553 fdt powerpc/mpc85xx/ds1553_core.c optional ds1553 -powerpc/mpc85xx/fdt_common.c optional fdt -powerpc/mpc85xx/fdtbus.c optional fdt powerpc/mpc85xx/i2c.c optional iicbus fdt powerpc/mpc85xx/isa.c optional mpc85xx isa powerpc/mpc85xx/lbc.c optional mpc85xx @@ -129,7 +130,6 @@ powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/openpic_fdt.c optional fdt powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx -powerpc/mpc85xx/simplebus.c optional fdt powerpc/ofw/ofw_cpu.c optional aim powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim ==== //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.c#3 (text+ko) ==== @@ -47,12 +47,12 @@ #include #include +#include #include #include #include -#include "fdt_common.h" #include "ofw_bus_if.h" #include "lbc.h" From owner-p4-projects@FreeBSD.ORG Sat Jan 9 20:48:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEAFE1065670; Sat, 9 Jan 2010 20:48: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 73700106566B for ; Sat, 9 Jan 2010 20:48:04 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 624398FC08 for ; Sat, 9 Jan 2010 20:48: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 o09Km4BS025437 for ; Sat, 9 Jan 2010 20:48:04 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09Km4YH025435 for perforce@freebsd.org; Sat, 9 Jan 2010 20:48:04 GMT (envelope-from raj@freebsd.org) Date: Sat, 9 Jan 2010 20:48:04 GMT Message-Id: <201001092048.o09Km4YH025435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 20:48:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=172867 Change 172867 by raj@raj_fdt on 2010/01/09 20:47:18 Do not instantiate ocbus, switch to fdtbus. Affected files ... .. //depot/projects/fdt/sys/powerpc/mpc85xx/nexus.c#2 edit Differences ... ==== //depot/projects/fdt/sys/powerpc/mpc85xx/nexus.c#2 (text+ko) ==== @@ -112,13 +112,10 @@ nexus_probe (device_t dev) { - /* - * Add OCP (on-chip peripheral) bus - */ - device_add_child(dev, "ocpbus", 0); + device_add_child(dev, "fdtbus", 0); + device_quiet(dev); - device_set_desc(dev, "MPC85xx Nexus device"); - return (0); + return (BUS_PROBE_DEFAULT); } static int From owner-p4-projects@FreeBSD.ORG Sat Jan 9 20:52:09 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A50B1065679; Sat, 9 Jan 2010 20:52:09 +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 C28581065670 for ; Sat, 9 Jan 2010 20:52:08 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 937328FC1B for ; Sat, 9 Jan 2010 20:52:08 +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 o09Kq8WA025755 for ; Sat, 9 Jan 2010 20:52:08 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09Kq8rG025753 for perforce@freebsd.org; Sat, 9 Jan 2010 20:52:08 GMT (envelope-from raj@freebsd.org) Date: Sat, 9 Jan 2010 20:52:08 GMT Message-Id: <201001092052.o09Kq8rG025753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 20:52:09 -0000 http://p4web.freebsd.org/chv.cgi?CH=172868 Change 172868 by raj@raj_fdt on 2010/01/09 20:51:57 Fix elementary mistake and really shift as intended. Affected files ... .. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#2 edit Differences ... ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.c#2 (text+ko) ==== @@ -105,7 +105,7 @@ if (cells > 1) { d64 = fdt64_to_cpu(*((uint64_t *)data)); - if (((d64 > 32) & 0xffffffffull) != 0) + if (((d64 >> 32) & 0xffffffffull) != 0) return (ERANGE); } From owner-p4-projects@FreeBSD.ORG Sat Jan 9 21:03:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EA32106568B; Sat, 9 Jan 2010 21:03:20 +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 12E331065676 for ; Sat, 9 Jan 2010 21:03:20 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC2CD8FC12 for ; Sat, 9 Jan 2010 21:03:19 +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 o09L3JvF027489 for ; Sat, 9 Jan 2010 21:03:19 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09L3JH6027487 for perforce@freebsd.org; Sat, 9 Jan 2010 21:03:19 GMT (envelope-from raj@freebsd.org) Date: Sat, 9 Jan 2010 21:03:19 GMT Message-Id: <201001092103.o09L3JH6027487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172869 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 21:03:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=172869 Change 172869 by raj@raj_fdt on 2010/01/09 21:03:08 Respect 'status' property if present in the node. Do not instantiate a device unless status == okay. Affected files ... .. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#3 edit .. //depot/projects/fdt/sys/dev/fdt/fdt_common.h#2 edit .. //depot/projects/fdt/sys/dev/fdt/fdtbus.c#2 edit .. //depot/projects/fdt/sys/dev/fdt/simplebus.c#2 edit Differences ... ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.c#3 (text+ko) ==== @@ -59,6 +59,28 @@ #endif int +fdt_is_enabled(phandle_t node) +{ + char *stat; + int ena, len; + + len = OF_getprop_alloc(node, "status", sizeof(char), + (void **)&stat); + + if (len <= 0) + /* It is OK if no 'status' property. */ + return (1); + + /* Anything other than 'okay' means disabled. */ + ena = 0; + if (strncmp((char *)stat, "okay", len) == 0) + ena = 1; + + free(stat, M_OFWPROP); + return (ena); +} + +int fdt_parent_addr_cells(phandle_t node) { pcell_t addr_cells; ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.h#2 (text+ko) ==== @@ -47,5 +47,6 @@ int fdt_reg_to_rl(phandle_t, struct resource_list *, u_long); int fdt_intr_to_rl(phandle_t, struct resource_list *, struct sense_level *); int fdt_data_to_res(pcell_t *, int, int, u_long *, u_long *); +int fdt_is_enabled(phandle_t); #endif /* FDT_COMMON_H */ ==== //depot/projects/fdt/sys/dev/fdt/fdtbus.c#2 (text+ko) ==== @@ -213,8 +213,13 @@ /* * Walk the FDT root node and add top-level devices as our children. */ - for (child = OF_child(root); child != 0; child = OF_peer(child)) + for (child = OF_child(root); child != 0; child = OF_peer(child)) { + /* Check and process 'status' property. */ + if (!(fdt_is_enabled(child))) + continue; + newbus_device_from_fdt_node(dev, child); + } return (bus_generic_attach(dev)); } ==== //depot/projects/fdt/sys/dev/fdt/simplebus.c#2 (text+ko) ==== @@ -163,6 +163,7 @@ len = OF_getprop_alloc(root, "model", 1, (void **)&model); if (len <= 0) return; + /* XXX this should be a table with {model->fixup_handler} */ if (!(strcmp(model, "fsl,MPC8572DS") == 0 || strcmp(model, "MPC8555CDS") == 0)) goto out; @@ -248,6 +249,10 @@ */ for (child = OF_child(node); child != 0; child = OF_peer(child)) { + /* Check and process 'status' property. */ + if (!(fdt_is_enabled(child))) + continue; + di = malloc(sizeof(*di), M_SIMPLEBUS, M_WAITOK | M_ZERO); if (ofw_bus_gen_setup_devinfo(&di->di_ofw, child) != 0) { @@ -317,8 +322,6 @@ struct simplebus_devinfo *di; struct resource_list_entry *rle; - debugf("type = %d, rid = %d\n", type, *rid); - /* * Request for the default allocation with a given rid: use resource * list stored in the local device info. From owner-p4-projects@FreeBSD.ORG Sat Jan 9 21:47:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 123ED1065692; Sat, 9 Jan 2010 21:47: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 CA3971065672 for ; Sat, 9 Jan 2010 21:47:04 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B64368FC17 for ; Sat, 9 Jan 2010 21:47: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 o09Ll4B5030775 for ; Sat, 9 Jan 2010 21:47:04 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09Ll4kb030773 for perforce@freebsd.org; Sat, 9 Jan 2010 21:47:04 GMT (envelope-from raj@freebsd.org) Date: Sat, 9 Jan 2010 21:47:04 GMT Message-Id: <201001092147.o09Ll4kb030773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 21:47:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=172874 Change 172874 by raj@raj_fdt on 2010/01/09 21:46:39 IFC @172873 Affected files ... .. //depot/projects/fdt/Makefile#2 integrate .. //depot/projects/fdt/UPDATING#6 integrate .. //depot/projects/fdt/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/fdt/contrib/tcp_wrappers/hosts_access.c#2 integrate .. //depot/projects/fdt/etc/rc.firewall#4 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/fdt/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/fdt/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/fdt/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate .. //depot/projects/fdt/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/fdt/kerberos5/usr.bin/kdestroy/Makefile#2 integrate .. //depot/projects/fdt/kerberos5/usr.bin/kpasswd/Makefile#2 integrate .. //depot/projects/fdt/lib/libc/Makefile#2 integrate .. //depot/projects/fdt/lib/libc/gen/sem_init.3#3 integrate .. //depot/projects/fdt/lib/libc/gen/sem_new.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/fdt/lib/libc/mips/Symbol.map#2 integrate .. //depot/projects/fdt/lib/libc/mips/gen/fpgetmask.c#2 delete .. //depot/projects/fdt/lib/libc/mips/gen/fpgetround.c#2 delete .. //depot/projects/fdt/lib/libc/mips/gen/fpgetsticky.c#2 delete .. //depot/projects/fdt/lib/libc/mips/gen/fpsetmask.c#2 delete .. //depot/projects/fdt/lib/libc/mips/gen/fpsetround.c#2 delete .. //depot/projects/fdt/lib/libc/mips/gen/fpsetsticky.c#2 delete .. //depot/projects/fdt/lib/libc/mips/gen/hardfloat/fpgetmask.c#1 branch .. //depot/projects/fdt/lib/libc/mips/gen/hardfloat/fpgetround.c#1 branch .. //depot/projects/fdt/lib/libc/mips/gen/hardfloat/fpgetsticky.c#1 branch .. //depot/projects/fdt/lib/libc/mips/gen/hardfloat/fpsetmask.c#1 branch .. //depot/projects/fdt/lib/libc/mips/gen/hardfloat/fpsetround.c#1 branch .. //depot/projects/fdt/lib/libc/mips/gen/hardfloat/fpsetsticky.c#1 branch .. //depot/projects/fdt/lib/libc/mips/sys/brk.S#2 integrate .. //depot/projects/fdt/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/fdt/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/fdt/lib/libc/sys/cpuset_getaffinity.2#2 integrate .. //depot/projects/fdt/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/fdt/lib/libthr/arch/mips/include/pthread_md.h#2 integrate .. //depot/projects/fdt/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/fdt/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/fdt/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/fdt/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/fdt/share/man/man3/Makefile#2 integrate .. //depot/projects/fdt/share/man/man3/pthread.3#2 integrate .. //depot/projects/fdt/share/man/man3/pthread_affinity_np.3#1 branch .. //depot/projects/fdt/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/fdt/share/man/man3/pthread_attr_affinity_np.3#1 branch .. //depot/projects/fdt/share/man/man4/bridge.4#2 integrate .. //depot/projects/fdt/share/man/man4/carp.4#2 integrate .. //depot/projects/fdt/share/man/man4/faith.4#2 integrate .. //depot/projects/fdt/share/man/man4/uart.4#2 integrate .. //depot/projects/fdt/share/man/man7/security.7#3 integrate .. //depot/projects/fdt/share/man/man9/sleepqueue.9#3 integrate .. //depot/projects/fdt/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/fdt/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/fdt/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/fdt/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/fdt/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/fdt/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/fdt/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/fdt/sys/conf/NOTES#7 integrate .. //depot/projects/fdt/sys/conf/kern.mk#2 integrate .. //depot/projects/fdt/sys/conf/makeLINT.mk#2 integrate .. //depot/projects/fdt/sys/conf/options#5 integrate .. //depot/projects/fdt/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/fdt/sys/ddb/db_ps.c#2 integrate .. //depot/projects/fdt/sys/dev/aac/aac.c#3 integrate .. //depot/projects/fdt/sys/dev/agp/agp.c#3 integrate .. //depot/projects/fdt/sys/dev/amd/amd.c#2 integrate .. //depot/projects/fdt/sys/dev/amr/amr.c#2 integrate .. //depot/projects/fdt/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/fdt/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/fdt/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/fdt/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/fdt/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/fdt/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/fdt/sys/dev/de/if_de.c#3 integrate .. //depot/projects/fdt/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/fdt/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/fdt/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/fdt/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/fdt/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/fdt/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/fdt/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/fdt/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/fdt/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/fdt/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/fdt/sys/dev/iir/iir.c#2 integrate .. //depot/projects/fdt/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/fdt/sys/dev/isp/isp.c#3 integrate .. //depot/projects/fdt/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/fdt/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/fdt/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/fdt/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/fdt/sys/dev/malo/if_malo.c#3 integrate .. //depot/projects/fdt/sys/dev/mge/if_mge.c#3 integrate .. //depot/projects/fdt/sys/dev/mly/mly.c#2 integrate .. //depot/projects/fdt/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/fdt/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/fdt/sys/dev/pdq/if_fea.c#3 integrate .. //depot/projects/fdt/sys/dev/safe/safe.c#2 integrate .. //depot/projects/fdt/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/fdt/sys/dev/ste/if_ste.c#4 integrate .. //depot/projects/fdt/sys/dev/trm/trm.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/fdt/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/fdt/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/fdt/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/fdt/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/fdt/sys/i386/conf/Makefile#2 integrate .. //depot/projects/fdt/sys/i386/conf/PAE#2 integrate .. //depot/projects/fdt/sys/i386/i386/locore.s#2 integrate .. //depot/projects/fdt/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/fdt/sys/i386/include/pmap.h#2 integrate .. //depot/projects/fdt/sys/i386/xen/locore.s#2 integrate .. //depot/projects/fdt/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/fdt/sys/ia64/conf/Makefile#2 integrate .. //depot/projects/fdt/sys/isa/pnp.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_clock.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_fail.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_lock.c#4 integrate .. //depot/projects/fdt/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/fdt/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/fdt/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/fdt/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/fdt/sys/mips/adm5120/if_admsw.c#4 integrate .. //depot/projects/fdt/sys/mips/atheros/apb.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/apbvar.h#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_bus_space_reversed.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_bus_space_reversed.h#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_ehci.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_ohci.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_pci.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_pci_bus_space.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_pci_bus_space.h#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_spi.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xx_wdog.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/ar71xxreg.h#1 branch .. //depot/projects/fdt/sys/mips/atheros/files.ar71xx#1 branch .. //depot/projects/fdt/sys/mips/atheros/if_arge.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/if_argevar.h#1 branch .. //depot/projects/fdt/sys/mips/atheros/uart_bus_ar71xx.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/uart_cpu_ar71xx.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/asm_octeon.S#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_fau.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_fau.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_fpa.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_fpa.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_ipd.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_ipd.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_pip.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_pko.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_pko.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/driveid.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/files.octeon1#1 branch .. //depot/projects/fdt/sys/mips/cavium/obio.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/obiovar.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/octeon_ebt3000_cf.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/octeon_ebt3000_cf.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/octeon_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/octeon_pcmap_regs.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/octeonreg.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/std.octeon1#1 branch .. //depot/projects/fdt/sys/mips/cavium/uart_bus_octeonusart.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/uart_cpu_octeonusart.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/uart_dev_oct16550.c#1 branch .. //depot/projects/fdt/sys/mips/conf/AR71XX#1 branch .. //depot/projects/fdt/sys/mips/conf/AR71XX.hints#1 branch .. //depot/projects/fdt/sys/mips/conf/MALTA64#1 branch .. //depot/projects/fdt/sys/mips/conf/OCTEON1#1 branch .. //depot/projects/fdt/sys/mips/conf/OCTEON1-32#1 branch .. //depot/projects/fdt/sys/mips/conf/OCTEON1.hints#1 branch .. //depot/projects/fdt/sys/mips/conf/SWARM#1 branch .. //depot/projects/fdt/sys/mips/conf/SWARM.hints#1 branch .. //depot/projects/fdt/sys/mips/conf/XLR#1 branch .. //depot/projects/fdt/sys/mips/include/sysarch.h#2 integrate .. //depot/projects/fdt/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/Makefile.msgring#1 branch .. //depot/projects/fdt/sys/mips/rmi/board.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/board.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/bus_space_rmi.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/clock.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/clock.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/debug.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/ehcireg.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/ehcivar.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/files.xlr#1 branch .. //depot/projects/fdt/sys/mips/rmi/interrupt.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/intr_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/iodi.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/iomap.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/msgring.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/msgring.cfg#1 branch .. //depot/projects/fdt/sys/mips/rmi/msgring.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/msgring_xls.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/msgring_xls.cfg#1 branch .. //depot/projects/fdt/sys/mips/rmi/on_chip.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/pcibus.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/pcibus.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/perfmon.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/perfmon_kern.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/perfmon_percpu.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/perfmon_utils.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/perfmon_xlrconfig.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/pic.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/rmi_mips_exts.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/rootfs_list.txt#1 branch .. //depot/projects/fdt/sys/mips/rmi/shared_structs.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/shared_structs_func.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/shared_structs_offsets.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/std.xlr#1 branch .. //depot/projects/fdt/sys/mips/rmi/tick.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/uart_bus_xlr_iodi.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/uart_cpu_mips_xlr.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/xlr_boot1_console.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/xlr_csum_nocopy.S#1 branch .. //depot/projects/fdt/sys/mips/rmi/xlr_i2c.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/xlr_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/xlr_pci.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/xlrconfig.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/xls_ehci.c#1 branch .. //depot/projects/fdt/sys/mips/sibyte/ata_zbbus.c#1 branch .. //depot/projects/fdt/sys/mips/sibyte/files.sibyte#1 branch .. //depot/projects/fdt/sys/mips/sibyte/sb_asm.S#1 branch .. //depot/projects/fdt/sys/mips/sibyte/sb_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/sibyte/sb_scd.c#1 branch .. //depot/projects/fdt/sys/mips/sibyte/sb_scd.h#1 branch .. //depot/projects/fdt/sys/mips/sibyte/sb_zbbus.c#1 branch .. //depot/projects/fdt/sys/mips/sibyte/sb_zbpci.c#1 branch .. //depot/projects/fdt/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/fdt/sys/net/flowtable.c#2 integrate .. //depot/projects/fdt/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/fdt/sys/net/if_lagg.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_ipfw.c#4 integrate .. //depot/projects/fdt/sys/netinet/in.c#3 integrate .. //depot/projects/fdt/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/fdt/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/fdt/sys/netinet/ip_var.h#2 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dummynet.c#7 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_log.c#4 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_pfil.c#5 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_private.h#4 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_sockopt.c#4 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_table.c#4 integrate .. //depot/projects/fdt/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/fdt/sys/netinet/libalias/alias_mod.c#3 integrate .. //depot/projects/fdt/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/fdt/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/fdt/sys/netinet/sctputil.c#3 integrate .. //depot/projects/fdt/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/fdt/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/fdt/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/fdt/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/fdt/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/fdt/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/fdt/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/fdt/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/fdt/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/fdt/sys/pc98/conf/Makefile#2 integrate .. //depot/projects/fdt/sys/pci/ncr.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/fdt/sys/powerpc/booke/pmap.c#2 integrate .. //depot/projects/fdt/sys/powerpc/conf/Makefile#2 integrate .. //depot/projects/fdt/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/fdt/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#2 integrate .. //depot/projects/fdt/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/fdt/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/fdt/sys/sparc64/conf/Makefile#2 integrate .. //depot/projects/fdt/sys/sun4v/conf/Makefile#2 integrate .. //depot/projects/fdt/sys/sys/proc.h#4 integrate .. //depot/projects/fdt/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/fdt/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/fdt/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/fdt/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/fdt/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/fdt/tools/regression/posixsem2/semtest.c#2 integrate .. //depot/projects/fdt/usr.bin/ctags/Makefile#3 integrate .. //depot/projects/fdt/usr.bin/w/Makefile#4 integrate .. //depot/projects/fdt/usr.bin/xlint/xlint/Makefile#3 integrate .. //depot/projects/fdt/usr.sbin/cdcontrol/Makefile#3 integrate .. //depot/projects/fdt/usr.sbin/faithd/faithd.8#2 integrate .. //depot/projects/fdt/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/fdt/usr.sbin/mergemaster/mergemaster.sh#4 integrate .. //depot/projects/fdt/usr.sbin/traceroute/Makefile#3 integrate .. //depot/projects/fdt/usr.sbin/traceroute/findsaddr-udp.c#1 branch .. //depot/projects/fdt/usr.sbin/usbconfig/Makefile#2 integrate .. //depot/projects/fdt/usr.sbin/usbconfig/dump.c#3 integrate .. //depot/projects/fdt/usr.sbin/usbconfig/dump.h#2 integrate .. //depot/projects/fdt/usr.sbin/usbconfig/usbconfig.8#3 integrate .. //depot/projects/fdt/usr.sbin/usbconfig/usbconfig.c#2 integrate Differences ... ==== //depot/projects/fdt/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.358 2009/04/01 17:11:50 bz Exp $ +# $FreeBSD: src/Makefile,v 1.359 2010/01/08 19:01:50 bz Exp $ # # The user-driven targets are: # @@ -278,7 +278,7 @@ # with a reasonable chance of success, regardless of how old your # existing system is. # -.if make(universe) || make(tinderbox) +.if make(universe) || make(universe_kernels) || make(tinderbox) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) @@ -297,10 +297,6 @@ rm -f ${FAILFILE} .endif .for target in ${TARGETS} -KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ - ! -name DEFAULTS ! -name LINT -KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} .ORDER: universe_prologue universe_${target} universe_epilogue universe_${target}: @@ -320,16 +316,25 @@ (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) .endif + @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ + universe_kernels + @echo ">> ${target} completed on `LC_ALL=C date`" +.endfor +universe_kernels: universe_kernconfs +BUILD_ARCH!= uname -p +TARGET?= ${BUILD_ARCH} +KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ + ! -name DEFAULTS ! -name NOTES +universe_kernconfs: .for kernel in ${KERNCONFS} @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ ${MAKE} ${JFLAG} buildkernel \ - TARGET=${target} \ + TARGET=${TARGET} \ KERNCONF=${kernel} \ - > _.${target}.${kernel} 2>&1 || \ - (echo "${target} ${kernel} kernel failed," \ - "check _.${target}.${kernel} for details"| ${MAKEFAIL})) -.endfor - @echo ">> ${target} completed on `LC_ALL=C date`" + > _.${TARGET}.${kernel} 2>&1 || \ + (echo "${TARGET} ${kernel} kernel failed," \ + "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL})) .endfor universe: universe_epilogue universe_epilogue: ==== //depot/projects/fdt/UPDATING#6 (text+ko) ==== @@ -22,6 +22,11 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100108: + Introduce the kernel thread "deadlock resolver" (which can be enabled + via the DEADLKRES option, see NOTES for more details) and the + sleepq_type() function for sleepqueues. + 20091202: The rc.firewall and rc.firewall6 were unified, and rc.firewall6 and rc.d/ip6fw were removed. @@ -1089,4 +1094,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.650 2009/12/25 21:14:34 ru Exp $ +$FreeBSD: src/UPDATING,v 1.651 2010/01/09 01:46:38 attilio Exp $ ==== //depot/projects/fdt/contrib/gcc/config/mips/freebsd.h#2 (text+ko) ==== @@ -19,7 +19,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/mips/freebsd.h,v 1.2 2008/09/01 23:09:45 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/mips/freebsd.h,v 1.3 2010/01/08 23:37:30 imp Exp $ */ /* This defines which switch letters take arguments. -G is a MIPS special. */ @@ -97,6 +97,9 @@ Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ +#undef TARGET_DEFAULT +#define TARGET_DEFAULT (MASK_ABICALLS | MASK_SOFT_FLOAT) + #if TARGET_ENDIAN_DEFAULT != 0 #define TARGET_VERSION fprintf (stderr, " (FreeBSD/mips)"); #else ==== //depot/projects/fdt/contrib/tcp_wrappers/hosts_access.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * - * $FreeBSD: src/contrib/tcp_wrappers/hosts_access.c,v 1.5 2005/05/13 16:31:08 ume Exp $ + * $FreeBSD: src/contrib/tcp_wrappers/hosts_access.c,v 1.6 2010/01/08 10:54:15 sobomax Exp $ */ #ifndef lint @@ -148,6 +148,7 @@ char *sh_cmd; /* becomes optional shell command */ int match = NO; struct tcpd_context saved_context; + char *cp; saved_context = tcpd_context; /* stupid compilers */ @@ -164,7 +165,16 @@ tcpd_warn("missing newline or line too long"); continue; } - if (sv_list[0] == '#' || sv_list[strspn(sv_list, " \t\r\n")] == 0) + /* Ignore anything after unescaped # character */ + for (cp = strchr(sv_list, '#'); cp != NULL;) { + if (cp > sv_list && cp[-1] == '\\') { + cp = strchr(cp + 1, '#'); + continue; + } + *cp = '\0'; + break; + } + if (sv_list[strspn(sv_list, " \t\r\n")] == 0) continue; if ((cl_list = split_at(sv_list, ':')) == 0) { tcpd_warn("missing \":\" separator"); ==== //depot/projects/fdt/etc/rc.firewall#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.62 2009/12/29 11:27:51 ume Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.64 2010/01/09 19:16:27 ume Exp $ # # @@ -220,6 +220,8 @@ # Allow any link-local multicast traffic ${fwcmd} add pass all from fe80::/10 to ff02::/16 ${fwcmd} add pass all from ${net6} to ff02::/16 + # Allow DHCPv6 + ${fwcmd} add pass udp from fe80::/10 to me6 546 fi # Allow TCP through if setup succeeded @@ -505,7 +507,10 @@ # Allow "mandatory" ICMP in. ${fwcmd} add pass icmp from any to any icmptype 3,4,11 - + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass ipv6-icmp from any to any icmp6type 3 + fi + # Add permits for this workstations published services below # Only IPs and nets in firewall_allowservices is allowed in. # If you really wish to let anyone use services on your ==== //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#4 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.34 2010/01/05 23:35:43 stas Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.35 2010/01/07 23:30:10 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -665,10 +665,10 @@ % As we know, there are known knowns. There are things we know we know. We also know there are known unknowns. That is to say, we know -there're some things we do not know. But there're also unknown unknowns; -the ones we don't know we don't know." +there are some things we do not know. But there are also unknown +unknowns; the ones we don't know we don't know. -- United States Secretary of Defense Donald Rumsfeld - 12 February 2002, on the invasion to Iraq. + 12 February 2002, Regarding the US invasion of Iraq % "Are pirates an ethnic group? Or are they just people who burn illegal cds?" ==== //depot/projects/fdt/gnu/lib/libgcc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.67 2009/12/14 01:51:23 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.68 2010/01/08 23:11:23 imp Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -115,6 +115,10 @@ # _fixsfsi _fixunssfsi _floatdidf _floatdisf .endif +.if ${TARGET_ARCH} == "mips" +LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c +.endif + .if ${TARGET_ARCH} == "ia64" # from config/ia64/t-ia64 LIB1ASMSRC = lib1funcs.asm @@ -179,7 +183,7 @@ # # Floating point emulation functions # -.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \ +.if ${TARGET_ARCH} == "armNOT_YET" || \ ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT ==== //depot/projects/fdt/gnu/usr.bin/binutils/Makefile.inc0#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.38 2007/02/11 07:15:05 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.39 2010/01/08 23:06:56 imp Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -22,7 +22,8 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || \ + ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "mips" CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 ==== //depot/projects/fdt/gnu/usr.bin/binutils/ld/Makefile.mips#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.mips,v 1.8 2008/12/11 08:18:45 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.mips,v 1.9 2010/01/08 23:09:11 imp Exp $ #xxxIMPxxx: size? #xxxIMPxxx: TARGET_BIG_ENDIAN is lame. We should use the netbsd convention @@ -10,15 +10,22 @@ NATIVE_EMULATION=elf${_sz}ltsmip_fbsd .endif -SRCS+= e${NATIVE_EMULATION}.c -CLEANFILES+= e${NATIVE_EMULATION}.c - +MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd +.for abi in ${MIPS_ABIS} +#.if (${abi} != ${NATIVE_EMULATION}) +EMS+= ${abi} +#.endif +.for ext in ${ELF_SCR_EXT} +LDSCRIPTS+= ${abi}.${ext} +.endfor +SRCS+= e${abi}.c +CLEANFILES+= e${abi}.c # nb: elf32 handles both elf32 and elf64 targets -e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \ +e${abi}.c: ${.CURDIR}/${abi}.sh emultempl/elf32.em \ scripttempl/elf.sc genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \ - ${.CURDIR}/${NATIVE_EMULATION}.sh - + ${abi} "" no ${abi} ${TARGET_TUPLE} \ + ${.CURDIR}/${abi}.sh +.endfor ==== //depot/projects/fdt/gnu/usr.bin/cc/Makefile.tgt#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.13 2008/09/01 18:46:03 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.14 2010/01/08 23:02:17 imp Exp $ TARGET_ARCH?= ${MACHINE_ARCH} @@ -15,9 +15,6 @@ .if ${TARGET_ARCH} == "ia64" TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD .endif -.if ${TARGET_ARCH} == "mips" -TARGET_CPU_DEFAULT= 16 -.endif .if ${TARGET_ARCH} == "sparc64" TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif ==== //depot/projects/fdt/kerberos5/usr.bin/kdestroy/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.16 2008/05/07 13:53:08 dfr Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.17 2010/01/09 18:51:50 antoine Exp $ PROG= kdestroy CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509) ${LIBROKEN} ${LIBVERS} \ +DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ==== //depot/projects/fdt/kerberos5/usr.bin/kpasswd/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.15 2008/05/07 13:53:08 dfr Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.16 2010/01/09 18:53:03 antoine Exp $ PROG= kpasswd CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBHX509 ${LIBROKEN} ${LIBVERS} \ +DPADD= ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} LDADD= -lkrb5 -lhx509 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ==== //depot/projects/fdt/lib/libc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.78 2009/07/14 21:19:13 kan Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.79 2010/01/09 00:01:35 imp Exp $ SHLIBDIR?= /lib @@ -64,7 +64,7 @@ .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" ==== //depot/projects/fdt/lib/libc/gen/sem_init.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.19 2009/12/08 20:48:06 jilles Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.21 2010/01/09 05:40:46 davidxu Exp $ .\" -.Dd December 8, 2009 +.Dd January 7, 2010 .Dt SEM_INIT 3 .Os .Sh NAME @@ -46,9 +46,19 @@ .Fa sem to have the value .Fa value . +.Pp A non-zero value for .Fa pshared -specifies a shared semaphore that can be used by multiple processes. +specifies a shared semaphore that can be used by multiple processes, +the semaphore should be located in shared memory region (see +.Xr mmap 2 , +.Xr shm_open 2 , +and +.Xr shmget 2 ) , +any process having read and write access to address +.Fa sem +can perform semaphore operations on +.Fa sem . .Pp Following a successful call to .Fn sem_init , @@ -90,10 +100,3 @@ .Fn sem_init function conforms to .St -p1003.1-96 . -.Sh BUGS -A sem_t is a pointer to a separately allocated structure, -therefore process shared semaphores only work between related processes -and do not perform very well -(each operation is a system call, -while single-process semaphores only do a system call -if they need to block or wake up a thread). ==== //depot/projects/fdt/lib/libc/gen/sem_new.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/sem_new.c,v 1.3 2010/01/05 06:40:27 davidxu Exp $ + * $FreeBSD: src/lib/libc/gen/sem_new.c,v 1.4 2010/01/07 04:15:49 davidxu Exp $ */ #include "namespace.h" @@ -143,6 +143,7 @@ struct sem_nameinfo *ni = NULL; sem_t *sem = NULL; int fd = -1, mode, len; + int value = 0; if (name[0] != '/') { errno = EINVAL; @@ -170,6 +171,7 @@ if (flags & O_CREAT) { va_start(ap, flags); mode = va_arg(ap, int); + value = va_arg(ap, int); va_end(ap); } @@ -203,7 +205,7 @@ tmp._magic = SEM_MAGIC; tmp._kern._has_waiters = 0; - tmp._kern._count = 0; + tmp._kern._count = value; tmp._kern._flags = USYNC_PROCESS_SHARED | SEM_NAMED; if (_write(fd, &tmp, sizeof(tmp)) != sizeof(tmp)) { flock(fd, LOCK_UN); ==== //depot/projects/fdt/lib/libc/gen/sem_open.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.13 2007/12/27 21:55:49 jhb Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.14 2010/01/09 05:40:46 davidxu Exp $ .\" .Dd January 15, 2003 .Dt SEM_OPEN 3 @@ -58,6 +58,12 @@ and .Fn sem_close . .Pp +This implementation places strict requirements on the value of +.Fa name : +it must begin with a slash +.Pq Ql / , +contain no other slash characters. +.Pp The following bits may be set in the .Fa oflag argument: @@ -217,11 +223,3 @@ .Sh HISTORY Support for named semaphores first appeared in .Fx 5.0 . -.Sh BUGS -This implementation places strict requirements on the value of -.Fa name : -it must begin with a slash -.Pq Ql / , -contain no other slash characters, -and be less than 14 characters in length -not including the terminating null character. ==== //depot/projects/fdt/lib/libc/mips/Symbol.map#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/mips/Symbol.map,v 1.2 2009/02/19 18:03:41 imp Exp $ + * $FreeBSD: src/lib/libc/mips/Symbol.map,v 1.4 2010/01/09 00:01:35 imp Exp $ */ /* @@ -56,9 +56,27 @@ __siglongjmp; __sys_vfork; _vfork; - end; /* XXX - Should this be _end (see sys/brk.S)? */ - curbrk; + _end; + __curbrk; minbrk; _brk; _sbrk; + + /* softfloat */ + __addsf3; + __adddf3; + __subsf3; + __subdf3; + __mulsf3; + __muldf3; + __divsf3; + __divdf3; + __floatsisf; + __floatsidf; + __fixsfsi; + __fixdfsi; + __fixunssfsi; + __fixunsdfsi; + __extendsfdf2; + __truncdfsf2; }; ==== //depot/projects/fdt/lib/libc/mips/sys/brk.S#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.3 2008/04/26 12:08:02 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.4 2010/01/08 23:59:04 imp Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -42,15 +42,12 @@ #endif /* LIBC_SCCS and not lint */ .globl _C_LABEL(minbrk) - .globl _C_LABEL(curbrk) + .globl _C_LABEL(__curbrk) .globl _C_LABEL(_end) .data _C_LABEL(minbrk): .word _C_LABEL(_end) -_C_LABEL(curbrk): - .word _C_LABEL(_end) - .text LEAF(__sys_brk) WEAK_ALIAS(brk, __sys_brk) @@ -67,7 +64,7 @@ li v0, SYS_break syscall bne a3, zero, 2f - sw a0, _C_LABEL(curbrk) + sw a0, _C_LABEL(__curbrk) move v0, zero j ra 2: ==== //depot/projects/fdt/lib/libc/stdio/getc.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.21 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.22 2010/01/08 22:02:42 brueffer Exp $ .\" .Dd January 10, 2003 .Dt GETC 3 @@ -56,7 +56,7 @@ .Ft int .Fn getchar void .Ft int -.Fn getchar_unlocked "void" +.Fn getchar_unlocked void .Ft int .Fn getw "FILE *stream" .Sh DESCRIPTION @@ -141,7 +141,7 @@ .Sh STANDARDS The .Fn fgetc , -.Fn getc +.Fn getc , and .Fn getchar functions @@ -167,4 +167,3 @@ varies from one machine to another, and .Fn getw is not recommended for portable applications. -.Pp ==== //depot/projects/fdt/lib/libc/sys/cpuset.2#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.4 2009/12/15 21:02:29 jilles Exp $ +.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.5 2010/01/09 12:31:11 delphij Exp $ .\" -.Dd March 29, 2008 +.Dd January 8, 2010 .Dt CPUSET 2 .Os .Sh NAME @@ -216,7 +216,9 @@ .Xr cpuset 1 , .Xr cpuset_getaffinity 2 , .Xr cpuset_setaffinity 2 , -.Xr CPU_SET 3 +.Xr CPU_SET 3 , +.Xr pthread_affinity_np 3 , +.Xr pthread_attr_affinity_np 3 .Sh HISTORY The .Nm ==== //depot/projects/fdt/lib/libc/sys/cpuset_getaffinity.2#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.4 2008/11/29 14:32:14 bz Exp $ +.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.5 2010/01/09 12:31:11 delphij Exp $ .\" -.Dd November 29, 2008 +.Dd January 8, 2010 .Dt CPUSET 2 .Os .Sh NAME @@ -147,7 +147,9 @@ .Xr cpuset 2 , .Xr cpuset_getid 2 , .Xr cpuset_setid 2 , -.Xr CPU_SET 3 +.Xr CPU_SET 3 , +.Xr pthread_affinity_np 3 , +.Xr pthread_attr_affinity_np 3 .Sh HISTORY The .Nm ==== //depot/projects/fdt/lib/libc/sys/sendfile.2#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.32 2008/02/03 15:54:40 phk Exp $ +.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.35 2010/01/07 21:14:46 kib Exp $ .\" -.Dd November 24, 2006 +.Dd January 7, 2010 .Dt SENDFILE 2 .Os .Sh NAME @@ -116,9 +116,17 @@ block to a separate I/O worker thread. .It .Dv SF_MNOWAIT . -(description missing) +Do not wait for some kernel resource to become available, +in particular, +.Vt mbuf +and +.Vt sf_buf . +The flag does not make the +.Fn sendfile +syscall truly non-blocking, since other resources are still allocated +in a blocking fashion. .It -.Dv SF_SYNC , +.Dv SF_SYNC . .Nm sleeps until the network stack no longer references the VM pages of the file, making subsequent modifications to it safe. ==== //depot/projects/fdt/lib/libthr/arch/mips/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 9 22:17:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9AA51065672; Sat, 9 Jan 2010 22:17:35 +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 83A7A1065670 for ; Sat, 9 Jan 2010 22:17:35 +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 70DD78FC13 for ; Sat, 9 Jan 2010 22:17:35 +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 o09MHZhv033990 for ; Sat, 9 Jan 2010 22:17:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o09MHZ7s033988 for perforce@freebsd.org; Sat, 9 Jan 2010 22:17:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 9 Jan 2010 22:17:35 GMT Message-Id: <201001092217.o09MHZ7s033988@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 Precedence: bulk Cc: Subject: PERFORCE change 172876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 22:17:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=172876 Change 172876 by hselasky@hselasky_laptop001 on 2010/01/09 22:16:58 LibUSB: - Bugfix: - Make sure dirty variables get cleaned at transfer close. Else it is not possible to re-open the transfer at a later point. - found and patched by HPS Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb20.c#13 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb20.c#13 (text+ko) ==== @@ -130,8 +130,19 @@ if (xfer->ppBuffer) { free(xfer->ppBuffer); } - /* clear some fields */ + /* reset variable fields in case the transfer is opened again */ + xfer->priv_sc0 = 0; + xfer->priv_sc1 = 0; xfer->is_opened = 0; + xfer->is_pending = 0; + xfer->is_cancel = 0; + xfer->is_draining = 0; + xfer->is_restart = 0; + xfer->status = 0; + xfer->flags = 0; + xfer->nFrames = 0; + xfer->aFrames = 0; + xfer->timeout = 0; xfer->maxFrames = 0; xfer->maxTotalLength = 0; xfer->maxPacketLen = 0;