From owner-p4-projects@FreeBSD.ORG Sun Mar 18 00:59:50 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB6A71065673; Sun, 18 Mar 2012 00:59:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9CB47106566C for ; Sun, 18 Mar 2012 00:59:49 +0000 (UTC) (envelope-from peter@wemm.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 83A708FC12 for ; Sun, 18 Mar 2012 00:59:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I0xn7Z011657 for ; Sun, 18 Mar 2012 00:59:49 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2I0xnrI011654 for perforce@freebsd.org; Sun, 18 Mar 2012 00:59:49 GMT (envelope-from peter@wemm.org) Date: Sun, 18 Mar 2012 00:59:49 GMT Message-Id: <201203180059.q2I0xnrI011654@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 208139 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, 18 Mar 2012 00:59:50 -0000 http://p4web.freebsd.org/@@208139?ac=10 Change 208139 by peter@peter_overcee on 2012/03/18 00:59:36 IFC @208138 Affected files ... .. //depot/projects/hammer/Makefile.inc1#166 integrate .. //depot/projects/hammer/lib/libc++/Makefile#3 integrate .. //depot/projects/hammer/lib/libc/sys/mmap.2#18 integrate .. //depot/projects/hammer/lib/libc/sys/msync.2#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#14 integrate .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/FARSI%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GREEK%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/INUIT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/THAI%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25FARSI.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GREEK.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25INUIT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25THAI.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP037%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP038%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10000%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10006%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10007%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10029%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1006%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10079%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10081%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1026%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1046%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1124%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1125%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1129%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1131%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1133%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1161%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1162%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1163%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1250%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1251%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1252%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1253%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1254%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1255%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1256%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1257%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1258%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP273%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP274%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP275%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP277%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP278%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP280%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP281%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP284%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP285%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP290%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP297%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP420%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP423%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP424%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP437%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP500%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP737%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP775%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP850%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP851%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP852%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP853%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP855%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP856%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP857%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP858%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP860%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP861%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP862%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP863%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP864%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP865%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP866%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP868%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP869%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP870%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP871%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP874%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP875%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP880%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP891%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP903%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP904%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP905%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP918%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP922%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP932UDA%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP936EXT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP942EXT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP949EXT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/CP950%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP037.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP038.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10000.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10006.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10007.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10029.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1006.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10079.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10081.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1026.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1046.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1124.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1125.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1129.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1131.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1133.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1161.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1162.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1163.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1250.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1251.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1252.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1253.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1254.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1255.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1256.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1257.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1258.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP273.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP274.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP275.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP277.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP278.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP280.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP281.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP284.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP285.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP290.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP297.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP420.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP423.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP424.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP437.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP500.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP737.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP775.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP850.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP851.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP852.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP853.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP855.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP856.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP857.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP858.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP860.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP861.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP862.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP863.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP864.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP865.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP866.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP868.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP869.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP870.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP871.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP874.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP875.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP880.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP891.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP903.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP904.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP905.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP918.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP922.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP932UDA.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP936EXT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP942EXT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP949EXT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP950.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GB12345%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GBKEXT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/GBKUDA%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB12345.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKEXT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKUDA.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI7%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI7.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KS/JOHAB%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25JOHAB.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/ATARIST%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/DECMCS%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/TDS565%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25ATARIST.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25DECMCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25TDS565.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25VISCII.src#13 delete .. //depot/projects/hammer/share/i18n/csmapper/TCVN/VISCII%25UCS.src#13 delete .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#206 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clbio.c#16 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clvnops.c#21 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#59 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#51 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#90 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#73 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#95 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#37 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#66 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.h#15 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.c#26 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#166 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.726 2012/03/04 21:36:18 dim Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.727 2012/03/17 22:12:09 peter Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1252,6 +1252,9 @@ .endif gnu/lib/libgcc__L: lib/libc__L +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libcxxrt__L: gnu/lib/libgcc__L +.endif _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \ ${_kerberos5_lib_libheimntlm} \ ==== //depot/projects/hammer/lib/libc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc++/Makefile,v 1.2 2012/03/14 00:09:36 theraven Exp $ +# $FreeBSD: src/lib/libc++/Makefile,v 1.3 2012/03/17 22:12:09 peter Exp $ LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt HDRDIR= ${.CURDIR}/../../contrib/libc++/include @@ -39,7 +39,7 @@ CXXFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -std=c++0x -nostdlib -DLIBCXXRT DPADD= ${LIBCXXRT} -LDADD= -L${.OBJDIR}/../libcxxrt/ -lcxxrt +LDADD= -lcxxrt LDFLAGS+= --verbose INCSGROUPS= STD EXT ==== //depot/projects/hammer/lib/libc/sys/mmap.2#18 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.64 2012/01/27 13:26:19 pluknet Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.65 2012/03/17 23:55:18 kib Exp $ .\" -.Dd August 28, 2010 +.Dd March 18, 2012 .Dt MMAP 2 .Os .Sh NAME @@ -205,7 +205,7 @@ system call generally do not flush dirty NOSYNC VM data. The .Xr msync 2 -system call is obsolete since +system call is usually not needed since .Bx implements a coherent file system buffer cache. However, it may be ==== //depot/projects/hammer/lib/libc/sys/msync.2#8 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)msync.2 8.2 (Berkeley) 6/21/94 -.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.29 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.30 2012/03/17 23:55:18 kib Exp $ .\" -.Dd June 21, 1994 +.Dd March 18, 2012 .Dt MSYNC 2 .Os .Sh NAME @@ -98,6 +98,9 @@ argument was both MS_ASYNC and MS_INVALIDATE. Only one of these flags is allowed. +.It Bq Er EIO + An error occurred while writing at least one of the pages in +the specified region. .El .Sh SEE ALSO .Xr madvise 2 , @@ -113,7 +116,7 @@ .Sh BUGS The .Fn msync -system call is obsolete since +system call is usually not needed since .Bx implements a coherent file system buffer cache. However, it may be used to associate dirty VM pages with file system ==== //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.26 2012/02/27 13:38:52 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.27 2012/03/18 00:22:29 davidxu Exp $ * */ @@ -154,13 +154,6 @@ int __thr_umutex_unlock(struct umutex *mtx, uint32_t id) { -#ifndef __ia64__ - /* XXX this logic has a race-condition on ia64. */ - if ((mtx->m_flags & (UMUTEX_PRIO_PROTECT | UMUTEX_PRIO_INHERIT)) == 0) { - atomic_cmpset_rel_32(&mtx->m_owner, id | UMUTEX_CONTESTED, UMUTEX_CONTESTED); - return _umtx_op_err(mtx, UMTX_OP_MUTEX_WAKE, 0, 0, 0); - } -#endif /* __ia64__ */ return _umtx_op_err(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0); } ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#206 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.729 2011/12/28 19:59:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.730 2012/03/17 22:04:58 alc Exp $"); /* * Manages physical address maps. @@ -2949,6 +2949,7 @@ pd_entry_t ptpaddr, *pde; pt_entry_t *pte; int anychanged; + boolean_t pv_lists_locked; if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); @@ -2959,9 +2960,10 @@ (VM_PROT_WRITE|VM_PROT_EXECUTE)) return; + pv_lists_locked = FALSE; +resume: anychanged = 0; - vm_page_lock_queues(); PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { @@ -3010,9 +3012,25 @@ if (pmap_protect_pde(pmap, pde, sva, prot)) anychanged = 1; continue; - } else if (!pmap_demote_pde(pmap, pde, sva)) { - /* The large page mapping was destroyed. */ - continue; + } else { + if (!pv_lists_locked) { + pv_lists_locked = TRUE; + if (!mtx_trylock(&vm_page_queue_mtx)) { + if (anychanged) + pmap_invalidate_all( + pmap); + PMAP_UNLOCK(pmap); + vm_page_lock_queues(); + goto resume; + } + } + if (!pmap_demote_pde(pmap, pde, sva)) { + /* + * The large page mapping was + * destroyed. + */ + continue; + } } } @@ -3052,7 +3070,8 @@ } if (anychanged) pmap_invalidate_all(pmap); - vm_page_unlock_queues(); + if (pv_lists_locked) + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } ==== //depot/projects/hammer/sys/fs/nfsclient/nfs_clbio.c#16 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clbio.c,v 1.28 2012/03/01 03:53:07 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clbio.c,v 1.29 2012/03/17 23:03:20 kib Exp $"); #include "opt_kdtrace.h" @@ -66,6 +66,7 @@ extern enum nfsiod_state ncl_iodwant[NFS_MAXASYNCDAEMON]; extern struct nfsmount *ncl_iodmount[NFS_MAXASYNCDAEMON]; extern int newnfs_directio_enable; +extern int nfs_keep_dirty_on_error; int ncl_pbuf_freecnt = -1; /* start out unlimited */ @@ -348,9 +349,11 @@ pmap_qremove(kva, npages); relpbuf(bp, &ncl_pbuf_freecnt); - vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid); - if (must_commit) - ncl_clearcommit(vp->v_mount); + if (error == 0 || !nfs_keep_dirty_on_error) { + vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid); + if (must_commit) + ncl_clearcommit(vp->v_mount); + } return rtvals[0]; } ==== //depot/projects/hammer/sys/fs/nfsclient/nfs_clvnops.c#21 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvnops.c,v 1.58 2012/03/03 01:06:54 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvnops.c,v 1.59 2012/03/17 23:03:20 kib Exp $"); /* * vnode op calls for Sun NFS version 2, 3 and 4 @@ -241,6 +241,10 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, nfs_directio_enable, CTLFLAG_RW, &newnfs_directio_enable, 0, "Enable NFS directio"); +int nfs_keep_dirty_on_error; +SYSCTL_INT(_vfs_nfs, OID_AUTO, nfs_keep_dirty_on_error, CTLFLAG_RW, + &nfs_keep_dirty_on_error, 0, "Retry pageout if error returned"); + /* * This sysctl allows other processes to mmap a file that has been opened * O_DIRECT by a process. In general, having processes mmap the file while ==== //depot/projects/hammer/sys/netinet/in_pcb.h#59 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.154 2011/11/06 10:47:20 trociny Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.155 2012/03/17 21:51:39 rmh Exp $ */ #ifndef _NETINET_IN_PCB_H_ @@ -364,6 +364,7 @@ void *ipi_pspare[2]; }; +#ifdef _KERNEL /* * Connection groups hold sets of connections that have similar CPU/thread * affinity. Each connection belongs to exactly one connection group. @@ -406,7 +407,6 @@ #define INP_WLOCK_ASSERT(inp) rw_assert(&(inp)->inp_lock, RA_WLOCKED) #define INP_UNLOCK_ASSERT(inp) rw_assert(&(inp)->inp_lock, RA_UNLOCKED) -#ifdef _KERNEL /* * These locking functions are for inpcb consumers outside of sys/netinet, * more specifically, they were added for the benefit of TOE drivers. The ==== //depot/projects/hammer/sys/vm/vm_contig.c#51 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.93 2012/01/27 20:18:31 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.94 2012/03/17 23:00:32 kib Exp $"); #include #include @@ -137,7 +137,8 @@ object->type == OBJT_DEFAULT) { vm_page_unlock_queues(); m_tmp = m; - vm_pageout_flush(&m_tmp, 1, VM_PAGER_PUT_SYNC, 0, NULL); + vm_pageout_flush(&m_tmp, 1, VM_PAGER_PUT_SYNC, 0, + NULL, NULL); VM_OBJECT_UNLOCK(object); vm_page_lock_queues(); return (0); ==== //depot/projects/hammer/sys/vm/vm_map.c#90 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.450 2012/02/25 17:49:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.451 2012/03/17 23:00:32 kib Exp $"); #include #include @@ -2582,6 +2582,7 @@ vm_object_t object; vm_ooffset_t offset; unsigned int last_timestamp; + boolean_t failed; vm_map_lock_read(map); VM_MAP_RANGE_CHECK(map, start, end); @@ -2611,6 +2612,7 @@ if (invalidate) pmap_remove(map->pmap, start, end); + failed = FALSE; /* * Make a second pass, cleaning/uncaching pages from the indicated @@ -2639,7 +2641,8 @@ vm_object_reference(object); last_timestamp = map->timestamp; vm_map_unlock_read(map); - vm_object_sync(object, offset, size, syncio, invalidate); + if (!vm_object_sync(object, offset, size, syncio, invalidate)) + failed = TRUE; start += size; vm_object_deallocate(object); vm_map_lock_read(map); @@ -2649,7 +2652,7 @@ } vm_map_unlock_read(map); - return (KERN_SUCCESS); + return (failed ? KERN_FAILURE : KERN_SUCCESS); } /* ==== //depot/projects/hammer/sys/vm/vm_mmap.c#73 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.264 2012/03/02 17:33:51 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.265 2012/03/17 23:00:32 kib Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -510,6 +510,8 @@ return (EINVAL); /* Sun returns ENOMEM? */ case KERN_INVALID_ARGUMENT: return (EBUSY); + case KERN_FAILURE: + return (EIO); default: return (EINVAL); } ==== //depot/projects/hammer/sys/vm/vm_object.c#95 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.451 2012/01/04 16:04:20 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.452 2012/03/17 23:00:32 kib Exp $"); #include "opt_vm.h" @@ -101,9 +101,10 @@ "Use old (insecure) msync behavior"); static int vm_object_page_collect_flush(vm_object_t object, vm_page_t p, - int pagerflags, int flags, int *clearobjflags); + int pagerflags, int flags, boolean_t *clearobjflags, + boolean_t *eio); static boolean_t vm_object_page_remove_write(vm_page_t p, int flags, - int *clearobjflags); + boolean_t *clearobjflags); static void vm_object_qcollapse(vm_object_t object); static void vm_object_vndeallocate(vm_object_t object); @@ -775,7 +776,7 @@ * page should be flushed, and FALSE otherwise. */ static boolean_t -vm_object_page_remove_write(vm_page_t p, int flags, int *clearobjflags) +vm_object_page_remove_write(vm_page_t p, int flags, boolean_t *clearobjflags) { /* @@ -784,7 +785,7 @@ * cleared in this case so we do not have to set them. */ if ((flags & OBJPC_NOSYNC) != 0 && (p->oflags & VPO_NOSYNC) != 0) { - *clearobjflags = 0; + *clearobjflags = FALSE; return (FALSE); } else { pmap_remove_write(p); @@ -806,21 +807,25 @@ * Odd semantics: if start == end, we clean everything. * * The object must be locked. + * + * Returns FALSE if some page from the range was not written, as + * reported by the pager, and TRUE otherwise. */ -void +boolean_t vm_object_page_clean(vm_object_t object, vm_ooffset_t start, vm_ooffset_t end, int flags) { vm_page_t np, p; vm_pindex_t pi, tend, tstart; - int clearobjflags, curgeneration, n, pagerflags; + int curgeneration, n, pagerflags; + boolean_t clearobjflags, eio, res; mtx_assert(&vm_page_queue_mtx, MA_NOTOWNED); VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); KASSERT(object->type == OBJT_VNODE, ("Not a vnode object")); if ((object->flags & OBJ_MIGHTBEDIRTY) == 0 || object->resident_page_count == 0) - return; + return (TRUE); pagerflags = (flags & (OBJPC_SYNC | OBJPC_INVAL)) != 0 ? VM_PAGER_PUT_SYNC : VM_PAGER_CLUSTER_OK; @@ -829,6 +834,7 @@ tstart = OFF_TO_IDX(start); tend = (end == 0) ? object->size : OFF_TO_IDX(end + PAGE_MASK); clearobjflags = tstart == 0 && tend >= object->size; + res = TRUE; rescan: curgeneration = object->generation; @@ -845,7 +851,7 @@ if ((flags & OBJPC_SYNC) != 0) goto rescan; else - clearobjflags = 0; + clearobjflags = FALSE; } np = vm_page_find_least(object, pi); continue; @@ -854,12 +860,16 @@ continue; n = vm_object_page_collect_flush(object, p, pagerflags, - flags, &clearobjflags); + flags, &clearobjflags, &eio); + if (eio) { + res = FALSE; + clearobjflags = FALSE; + } if (object->generation != curgeneration) { if ((flags & OBJPC_SYNC) != 0) goto rescan; else - clearobjflags = 0; + clearobjflags = FALSE; } /* @@ -874,8 +884,10 @@ * behind, but there is not much we can do there if * filesystem refuses to write it. */ - if (n == 0) + if (n == 0) { n = 1; + clearobjflags = FALSE; + } np = vm_page_find_least(object, pi + n); } #if 0 @@ -884,11 +896,12 @@ if (clearobjflags) vm_object_clear_flag(object, OBJ_MIGHTBEDIRTY); + return (res); } static int vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int pagerflags, - int flags, int *clearobjflags) + int flags, boolean_t *clearobjflags, boolean_t *eio) { vm_page_t ma[vm_pageout_page_count], p_first, tp; int count, i, mreq, runlen; @@ -921,7 +934,7 @@ for (tp = p_first, i = 0; i < count; tp = TAILQ_NEXT(tp, listq), i++) ma[i] = tp; - vm_pageout_flush(ma, count, pagerflags, mreq, &runlen); + vm_pageout_flush(ma, count, pagerflags, mreq, &runlen, eio); return (runlen); } @@ -939,17 +952,20 @@ * Note: certain anonymous maps, such as MAP_NOSYNC maps, * may start out with a NULL object. */ -void +boolean_t vm_object_sync(vm_object_t object, vm_ooffset_t offset, vm_size_t size, boolean_t syncio, boolean_t invalidate) { vm_object_t backing_object; struct vnode *vp; struct mount *mp; - int flags, fsync_after; + int error, flags, fsync_after; + boolean_t res; if (object == NULL) - return; + return (TRUE); + res = TRUE; + error = 0; VM_OBJECT_LOCK(object); while ((backing_object = object->backing_object) != NULL) { VM_OBJECT_LOCK(backing_object); @@ -995,13 +1011,16 @@ fsync_after = FALSE; } VM_OBJECT_LOCK(object); - vm_object_page_clean(object, offset, offset + size, flags); + res = vm_object_page_clean(object, offset, offset + size, + flags); VM_OBJECT_UNLOCK(object); if (fsync_after) - (void) VOP_FSYNC(vp, MNT_WAIT, curthread); + error = VOP_FSYNC(vp, MNT_WAIT, curthread); VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); vn_finished_write(mp); + if (error != 0) + res = FALSE; VM_OBJECT_LOCK(object); } if ((object->type == OBJT_VNODE || @@ -1021,6 +1040,7 @@ OFF_TO_IDX(offset + size + PAGE_MASK), flags); } VM_OBJECT_UNLOCK(object); + return (res); } /* ==== //depot/projects/hammer/sys/vm/vm_object.h#37 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.h,v 1.131 2012/02/23 21:07:16 kib Exp $ + * $FreeBSD: src/sys/vm/vm_object.h,v 1.132 2012/03/17 23:00:32 kib Exp $ */ /* @@ -227,7 +227,7 @@ void vm_object_init (void); void vm_object_page_cache(vm_object_t object, vm_pindex_t start, vm_pindex_t end); -void vm_object_page_clean(vm_object_t object, vm_ooffset_t start, +boolean_t vm_object_page_clean(vm_object_t object, vm_ooffset_t start, vm_ooffset_t end, int flags); void vm_object_page_remove(vm_object_t object, vm_pindex_t start, vm_pindex_t end, int options); @@ -238,7 +238,7 @@ int vm_object_set_memattr(vm_object_t object, vm_memattr_t memattr); void vm_object_shadow (vm_object_t *, vm_ooffset_t *, vm_size_t); void vm_object_split(vm_map_entry_t); -void vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t, +boolean_t vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t, boolean_t); void vm_object_madvise (vm_object_t, vm_pindex_t, int, int); #endif /* _KERNEL */ ==== //depot/projects/hammer/sys/vm/vm_pageout.c#66 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.341 2012/01/17 00:31:09 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.342 2012/03/17 23:00:32 kib Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 20 22:01:56 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823D5106567F; Tue, 20 Mar 2012 22:01:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 438C3106566B for ; Tue, 20 Mar 2012 22:01:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2ABF08FC08 for ; Tue, 20 Mar 2012 22:01:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2KM1te9053464 for ; Tue, 20 Mar 2012 22:01:55 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2KM1tge053452 for perforce@freebsd.org; Tue, 20 Mar 2012 22:01:55 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 20 Mar 2012 22:01:55 GMT Message-Id: <201203202201.q2KM1tge053452@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 208286 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, 20 Mar 2012 22:01:56 -0000 http://p4web.freebsd.org/@@208286?ac=10 Change 208286 by rene@rene_acer on 2012/03/20 22:00:57 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#51 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#132 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/port-mentor-guidelines/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/vinum/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/dev-model/book.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#37 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#19 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#29 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/www/en/releases/8.3R/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/releases/8.3R/errata.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/8.3R/hardware.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/8.3R/readme.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/8.3R/relnotes-detailed.html#1 branch Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#51 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.313 2012/03/11 15:32:12 gjb Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.315 2012/03/20 02:53:54 eadler Exp $ 1999 @@ -1802,9 +1802,7 @@ Merging with <acronym>SVN</acronym> This section deals with merging code from one branch to - another (typically, from head to a stable branch). For - information about vendor imports, see the next section in - this primer. + another (typically, from head to a stable branch). In all examples below, $FSVN @@ -2717,16 +2715,14 @@ This lets you query the PR database without needing to be connected to the Internet. - - Using a local GNATS tree + + Mirroring the GNATS Tree - - If you are not already downloading the GNATS tree, add this line - to your supfile, and re-sup. Note that since - GNATS is not under CVS control it has no tag, so if you are adding - it to your existing supfile it should appear - before any tag= entry as these remain active once set. - + It is possible to mirror the GNATS database by adding this line + to your supfile. Note that since + GNATS is not under CVS control it has no tag, so if you are adding + it to your existing supfile it should appear + before any tag= entry as these remain active once set. gnats release=current prefix=/usr @@ -2740,75 +2736,34 @@ base setting in your supfile. . + - gnats/[a-ce-z]* + + Useful Tools - The rest of these examples assume you have only supped the - docs category. Adjust them as necessary, - depending on the categories you are syncing. - + Other than edit-pr there are a + collection of tools in ~gnats/tools/ + on freefall which can make + working with PRs much easier. - - Install the GNATS port from - ports/databases/gnats. This will place the - various GNATS directories under - $PREFIX/share/gnats. - + open-pr, close-pr, + take-pr, and feedback-pr + take PR numbers as arguments and then ask you to select from a + preexisting list of change reasons or let you type in your + own. - - Symlink the GNATS directories you are supping under the version - of GNATS you have installed. + change-pr is a multi purpose tool + that lets you make multiple changes at the same time with one + command. - &prompt.root; cd /usr/local/share/gnats/gnats-db -&prompt.root; ln -s /usr/gnats/docs - - Repeat as necessary, depending on how many GNATS categories you - are syncing. - - - - Update the GNATS categories file with these - categories. The file is - $PREFIX/share/gnats/gnats-db/gnats-adm/categories. - - # This category is mandatory -pending:Category for faulty PRs:gnats-admin: -# -# FreeBSD categories -# -docs:Documentation Bug:freebsd-doc: - - - - Run $PREFIX/libexec/gnats/gen-index to - recreate the GNATS index. The output has to be redirected to - $PREFIX/share/gnats/gnats-db/gnats-adm/index. - You can do this periodically from &man.cron.8;, or run &man.cvsup.1; - from a shell script that does this as well. - - &prompt.root; /usr/local/libexec/gnats/gen-index \ - > /usr/local/share/gnats/gnats-db/gnats-adm/index - - - - Test the configuration by querying the PR database. This - command shows open docs PRs. - - &prompt.root; query-pr -c docs -s open - - - - - Pick a PR and close it. - - - - - This procedure only works to allow you to view and query the PRs - locally. To edit or close them you will still have to log in to - freefall and do it from there. - - + For example, to assign PR 123456 to yourself type + take-pr 123456. + If you want to set the PR to patched awaiting an MFC at + the same time use: + change-pr -t -p -m "awaiting MFC" + 123456 + + Who's Who ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#132 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -2952,7 +2952,7 @@ from the passed devfs vnode label. This call will be made when a devfs vnode has been successfully relabeled to commit the label change such that it lasts even if the vnode is - recycled. It will also be made when when a symlink is + recycled. It will also be made when a symlink is created in devfs, following a call to mac_vnode_create_from_vnode to initialize the vnode label. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -18,12 +18,8 @@ Adding a device - The procedure for adding a new device to the list of - supported pccard devices has changed from the system used - through FreeBSD 4. In prior versions, editing a file in - /etc to list the device was necessary. - Starting in FreeBSD 5.0, devices drivers know what devices they - support. There is now a table of supported devices in the + Devices drivers know what devices they + support. There is a table of supported devices in the kernel that drivers use to attach to a device. @@ -31,84 +27,83 @@ CIS PC Cards are identified in one of two ways, both based on - information in the CIS of the card. The - first method is to use numeric manufacturer and product - numbers. The second method is to use the human readable - strings that are also contained in the CIS. The PC Card bus - uses a centralized database and some macros to facilitate a - design pattern to help the driver writer match devices to his - driver. + information in the CIS of the card. The + first method is to use numeric manufacturer and product + numbers. The second method is to use the human readable + strings that are also contained in the CIS. The PC Card bus + uses a centralized database and some macros to facilitate a + design pattern to help the driver writer match devices to his + driver. - There is a widespread practice of one company developing a - reference design for a PC Card product and then selling this - design to other companies to market. Those companies refine - the design, market the product to their target audience or - geographic area and put their own name plate onto the card. - However, the refinements to the physical card typically are - very minor, if any changes are made at all. Often, however, - to strengthen their branding of their version of the card, - these vendors will place their company name in the human - strings in the CIS space, but leave the manufacturer and - product ids unchanged. + OEMs manufacturers often develop a reference design for + a PC Card product sell this design to other companies to + market. Those companies refine + the design, market the product to their target audience or + geographic area and put their own name plate onto the card. + The refinements to the physical card typically are + very minor, if any changes are made at all. However, + to strengthen their brand, + these vendors place their company name in the human + strings in the CIS space, but leave the manufacturer and + product ids unchanged. NetGear Linksys D-Link - Because of the above practice, it is a smaller work load - for FreeBSD to use the numeric IDs. It also introduces some - minor complications into the process of adding IDs to the - system. One must carefully check to see who really made the - card, especially when it appears that the vendor who made the - card from might already have a different manufacturer id - listed in the central database. Linksys, D-Link and NetGear - are a number of US Manufacturers of LAN hardware that often - sell the same design. These same designs can be sold in Japan - under names such as Buffalo and Corega. Yet often, these - devices will all have the same manufacturer and product - id. + Because of this practice, FreeBSD drivers tend to + use the numeric IDs. Using numeric IDs and a centralized + database complicates adding IDs and support for cards to the + system. One must carefully check to see who really made the + card, especially when it appears that the vendor who made the + card from might already have a different manufacturer id + listed in the central database. Linksys, D-Link and NetGear + are a number of US Manufacturers of LAN hardware that often + sell the same design. These same designs can be sold in Japan + under names such as Buffalo and Corega. Yet often, these + devices will all have the same manufacturer and product + id. - The PC Card bus keeps its central database of card - information, but not which driver is associated with them, in - /sys/dev/pccard/pccarddevs. It also - provides a set of macros that allow one to easily construct - simple entries in the table the driver uses to claim - devices. + The PC Card bus code keeps a central database of card + information, but not which driver is associated with them, in + /sys/dev/pccard/pccarddevs. It also + provides a set of macros that allow one to easily construct + simple entries in the table the driver uses to claim + devices. Finally, some really low end devices do not contain - manufacturer identification at all. These devices require - that one matches them using the human readable CIS strings. - While it would be nice if we did not need this method as a - fallback, it is necessary for some very low end CD-ROM players - that are quite popular. This method should generally be - avoided, but a number of devices are listed in this section - because they were added prior to the recognition of the - OEM nature of the PC Card business. When - adding new devices, prefer using the numeric method. - + manufacturer identification at all. These devices require + that one matches them using the human readable CIS strings. + While it would be nice if we did not need this method as a + fallback, it is necessary for some very low end CD-ROM players + and ethernet cards. This method should generally be + avoided, but a number of devices are listed in this section + because they were added prior to the recognition of the + OEM nature of the PC Card business. When + adding new devices, prefer using the numeric method. Format of <filename>pccarddevs</filename> There are four sections of the - pccarddevs files. The first section - lists the manufacturer numbers for those vendors that use - them. This section is sorted in numerical order. The next - section has all of the products that are used by these - vendors, along with their product ID numbers and a description - string. The description string typically is not used (instead - we set the device's description based on the human readable - CIS, even if we match on the numeric version). These two - sections are then repeated for those devices that use the - string matching method. Finally, C-style comments are allowed - anywhere in the file. + pccarddevs files. The first section + lists the manufacturer numbers for those vendors that use + them. This section is sorted in numerical order. The next + section has all of the products that are used by these + vendors, along with their product ID numbers and a description + string. The description string typically is not used (instead + we set the device's description based on the human readable + CIS, even if we match on the numeric version). These two + sections are then repeated for those devices that use the + string matching method. Finally, C-style comments are allowed + anywhere in the file. The first section of the file contains the vendor IDs. - Please keep this list sorted in numeric order. Also, please - coordinate changes to this file because we share it with - NetBSD to help facilitate a common clearing house for this - information. For example: + Please keep this list sorted in numeric order. Also, please + coordinate changes to this file because we share it with + NetBSD to help facilitate a common clearing house for this + information. For example: vendor FUJITSU 0x0004 Fujitsu Corporation vendor NETGEAR_2 0x000b Netgear @@ -116,26 +111,26 @@ vendor SANDISK 0x0045 Sandisk Corporation shows the first few vendor ids. Chances are very good - that the NETGEAR_2 entry is really an OEM - that NETGEAR purchased cards from and the author of support - for those cards was unaware at the time that Netgear was using - someone else's id. These entries are fairly straightforward. - There is the vendor keyword used to denote the kind of line - that this is. There is the name of the vendor. This name will - be repeated later in the pccarddevs file, as well as used in - the driver's match tables, so keep it short and a valid C - identifier. There is a numeric ID, in hex, for the - manufacturer. Do not add IDs of the form - 0xffffffff or 0xffff - because these are reserved ids (the former is 'no id set' - while the latter is sometimes seen in extremely poor quality - cards to try to indicate 'none). Finally there is a string - description of the company that makes the card. This string - is not used in FreeBSD for anything but commentary - purposes. + that the NETGEAR_2 entry is really an OEM + that NETGEAR purchased cards from and the author of support + for those cards was unaware at the time that Netgear was using + someone else's id. These entries are fairly straightforward. + There is the vendor keyword used to denote the kind of line + that this is. There is the name of the vendor. This name + will be repeated later in the pccarddevs file, as well as used + in the driver's match tables, so keep it short and a valid C + identifier. There is a numeric ID, in hex, for the + manufacturer. Do not add IDs of the form + 0xffffffff or 0xffff + because these are reserved ids (the former is 'no id set' + while the latter is sometimes seen in extremely poor quality + cards to try to indicate 'none). Finally there is a string + description of the company that makes the card. This string + is not used in FreeBSD for anything but commentary + purposes. The second section of the file contains the products. As - you can see in the following example: + you can see in the following example: /* Allied Telesis K.K. */ product ALLIEDTELESIS LA_PCM 0x0002 Allied Telesis LA-PCM @@ -144,75 +139,77 @@ product ARCHOS ARC_ATAPI 0x0043 MiniCD the format is similar to the vendor lines. There is the - product keyword. Then there is the vendor name, repeated from - above. This is followed by the product name, which is used by - the driver and should be a valid C identifier, but may also - start with a number. There is then the product id for this - card, in hex. As with the vendors, there is the same - convention for 0xffffffff and - 0xffff. Finally, there is a string - description of the device itself. This string typically is - not used in FreeBSD, since FreeBSD's pccard bus driver will - construct a string from the human readable CIS entries, but it - can be used in the rare cases where this is somehow - insufficient. The products are in alphabetical order by - manufacturer, then numerical order by product id. They have a - C comment before each manufacturer's entries and there is a - blank line between entries. + product keyword. Then there is the vendor name, repeated from + above. This is followed by the product name, which is used by + the driver and should be a valid C identifier, but may also + start with a number. There is then the product id for this + card, in hex. As with the vendors, there is the same + convention for 0xffffffff and + 0xffff. Finally, there is a string + description of the device itself. This string typically is + not used in FreeBSD, since FreeBSD's pccard bus driver will + construct a string from the human readable CIS entries, but it + can be used in the rare cases where this is somehow + insufficient. The products are in alphabetical order by + manufacturer, then numerical order by product id. They have a + C comment before each manufacturer's entries and there is a + blank line between entries. The third section is like the previous vendor section, but - with all of the manufacturer numeric ids as - -1. -1 means - match anything you find in the FreeBSD pccard - bus code. Since these are C identifiers, their names must be - unique. Otherwise the format is identical to the first - section of the file. + with all of the manufacturer numeric ids as + -1. -1 means + match anything you find in the FreeBSD pccard + bus code. Since these are C identifiers, their names must be + unique. Otherwise the format is identical to the first + section of the file. The final section contains the entries for those cards - that we must match with string entries. This sections' format - is a little different than the generic section: + that we must match with string entries. This sections' format + is a little different than the generic section: product ADDTRON AWP100 { "Addtron", "AWP-100&spWireless&spPCMCIA", "Version&sp01.02", NULL } product ALLIEDTELESIS WR211PCM { "Allied&spTelesis&spK.K.", "WR211PCM", NULL, NULL } Allied Telesis WR211PCM We have the familiar product keyword, followed by the - vendor name followed by the card name, just as in the second - section of the file. However, then we deviate from that - format. There is a {} grouping, followed by a number of - strings. These strings correspond to the vendor, product and - extra information that is defined in a CIS_INFO tuple. These - strings are filtered by the program that generates - pccarddevs.h to replace &sp with a - real space. NULL entries mean that that part of the entry - should be ignored. In the example I have picked, there is a bad - entry. It should not contain the version number in it unless - that is critical for the operation of the card. Sometimes - vendors will have many different versions of the card in the - field that all work, in which case that information only makes - it harder for someone with a similar card to use it with - FreeBSD. Sometimes it is necessary when a vendor wishes to - sell many different parts under the same brand due to market - considerations (availability, price, and so forth). Then it - can be critical to disambiguating the card in those rare cases - where the vendor kept the same manufacturer/product pair. - Regular expression matching is not available at this - time. - + vendor name followed by the card name, just as in the second + section of the file. However, then we deviate from that + format. There is a {} grouping, followed by a number of + strings. These strings correspond to the vendor, product and + extra information that is defined in a CIS_INFO tuple. These + strings are filtered by the program that generates + pccarddevs.h to replace &sp with a + real space. NULL strings mean that the corresponding part + of the entry should be ignored. In the example I have picked, + there is a bad entry. It should not contain the version + number in it unless that is critical for the operation of the + card. Sometimes vendors will have many different versions of + the card in the field that all work, in which case that + information only makes it harder for someone with a similar + card to use it with FreeBSD. Sometimes it is necessary when a + vendor wishes to sell many different parts under the same + brand due to market considerations (availability, price, and + so forth). Then it can be critical to disambiguating the card + in those rare cases where the vendor kept the same + manufacturer/product pair. Regular expression matching is not + available at this time. Sample probe routine - PC Cardprobe + + PC Card + probe + To understand how to add a device to the list of supported - devices, one must understand the probe and/or match routines - that many drivers have. It is complicated a little in FreeBSD - 5.x because there is a compatibility layer for OLDCARD present - as well. Since only the window-dressing is different, an - idealized version will be presented here. + devices, one must understand the probe and/or match routines + that many drivers have. It is complicated a little in FreeBSD + 5.x because there is a compatibility layer for OLDCARD present + as well. Since only the window-dressing is different, an + idealized version will be presented here. -static const struct pccard_product wi_pccard_products[] = { + static const struct pccard_product wi_pccard_products[] = { PCMCIA_CARD(3COM, 3CRWE737A, 0), PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0), PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), @@ -236,72 +233,72 @@ } Here we have a simple pccard probe routine that matches a - few devices. As stated above, the name may vary (if it is not - foo_pccard_probe() it will be - foo_pccard_match()). The function - pccard_product_lookup() is a generalized - function that walks the table and returns a pointer to the - first entry that it matches. Some drivers may use this - mechanism to convey additional information about some cards to - the rest of the driver, so there may be some variance in the - table. The only requirement is that if you have a different - table, the first element of the structure you have a table of - be a struct pccard_product. + few devices. As stated above, the name may vary (if it is not + foo_pccard_probe() it will be + foo_pccard_match()). The function + pccard_product_lookup() is a generalized + function that walks the table and returns a pointer to the + first entry that it matches. Some drivers may use this + mechanism to convey additional information about some cards to + the rest of the driver, so there may be some variance in the + table. The only requirement is that if you have a different + table, the first element of the structure you have a table of + be a struct pccard_product. Looking at the table - wi_pccard_products, one notices that - all the entries are of the form - PCMCIA_CARD(foo, - bar, - baz). The - foo part is the manufacturer id - from pccarddevs. The - bar part is the product. The - baz is the expected function number - that for this card. Many pccards can have multiple functions, - and some way to disambiguate function 1 from function 0 is - needed. You may see PCMCIA_CARD_D, which - includes the device description from the - pccarddevs file. You may also see - PCMCIA_CARD2 and - PCMCIA_CARD2_D which are used when you need - to match CIS both CIS strings and manufacturer numbers, in the - use the default description and take the - description from pccarddevs flavors. - + wi_pccard_products, one notices that + all the entries are of the form + PCMCIA_CARD(foo, + bar, + baz). The + foo part is the manufacturer id + from pccarddevs. The + bar part is the product. The + baz is the expected function number + that for this card. Many pccards can have multiple functions, + and some way to disambiguate function 1 from function 0 is + needed. You may see PCMCIA_CARD_D, which + includes the device description from the + pccarddevs file. You may also see + PCMCIA_CARD2 and + PCMCIA_CARD2_D which are used when you need + to match CIS both CIS strings and manufacturer numbers, in the + use the default description and take the + description from pccarddevs flavors. Putting it all together So, to add a new device, one must do the following steps. - First, one must obtain the identification information from the - device. The easiest way to do this is to insert the device - into a PC Card or CF slot and issue devinfo - -v. You will likely see something like: + First, one must obtain the identification information from the + device. The easiest way to do this is to insert the device + into a PC Card or CF slot and issue + devinfo -v. You will likely see something + like: - cbb1 pnpinfo vendor=0x104c device=0xac51 subvendor=0x1265 subdevice=0x0300 class=0x060700 at slot=10 function=1 + cbb1 pnpinfo vendor=0x104c device=0xac51 subvendor=0x1265 subdevice=0x0300 class=0x060700 at slot=10 function=1 cardbus1 pccard1 unknown pnpinfo manufacturer=0x026f product=0x030c cisvendor="BUFFALO" cisproduct="WLI2-CF-S11" function_type=6 at function=0 as part of the output. The manufacturer and product are - the numeric IDs for this product. While the cisvendor and - cisproduct are the strings that are present in the CIS that - describe this product. + the numeric IDs for this product. While the cisvendor and + cisproduct are the strings that are present in the CIS that + describe this product. Since we first want to prefer the numeric option, first - try to construct an entry based on that. The above card has - been slightly fictionalized for the purpose of this example. - The vendor is BUFFALO, which we see already has an - entry: + try to construct an entry based on that. The above card has + been slightly fictionalized for the purpose of this example. + The vendor is BUFFALO, which we see already has an + entry: -vendor BUFFALO 0x026f BUFFALO (Melco Corporation) + vendor BUFFALO 0x026f BUFFALO (Melco Corporation) so we are good there. Looking for an entry for this card, - we do not find one. Instead we find: + we do not find one. Instead we find: -/* BUFFALO */ + /* BUFFALO */ product BUFFALO WLI_PCM_S11 0x0305 BUFFALO AirStation 11Mbps WLAN product BUFFALO LPC_CF_CLT 0x0307 BUFFALO LPC-CF-CLT product BUFFALO LPC3_CLT 0x030a BUFFALO LPC3-CLT Ethernet Adapter @@ -309,22 +306,22 @@ we can just add -product BUFFALO WLI2_CF_S11G 0x030c BUFFALO AirStation ultra 802.11b CF + product BUFFALO WLI2_CF_S11G 0x030c BUFFALO AirStation ultra 802.11b CF to pccarddevs. Presently, there is a - manual step to regenerate the - pccarddevs.h file used to convey these - identifiers to the client driver. The following steps - must be done before you can use them in the driver: + manual step to regenerate the + pccarddevs.h file used to convey these + identifiers to the client driver. The following steps + must be done before you can use them in the driver: -&prompt.root; cd src/sys/dev/pccard + &prompt.root; cd src/sys/dev/pccard &prompt.root; make -f Makefile.pccarddevs Once these steps are complete, you can add the card to the - driver. That is a simple operation of adding one line: + driver. That is a simple operation of adding one line: -static const struct pccard_product wi_pccard_products[] = { + static const struct pccard_product wi_pccard_products[] = { PCMCIA_CARD(3COM, 3CRWE737A, 0), PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0), PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), @@ -334,46 +331,42 @@ }; Note that I have included a '+' in the - line before the line that I added, but that is simply to - highlight the line. Do not add it to the actual driver. Once - you have added the line, you can recompile your kernel or module - and try to see if it recognizes the device. If it does and - works, please submit a patch. If it does not work, please - figure out what is needed to make it work and submit a patch. - If it did not recognize it at all, you have done something - wrong and should recheck each step. + line before the line that I added, but that is simply to + highlight the line. Do not add it to the actual driver. Once + you have added the line, you can recompile your kernel or + module and try to see if it recognizes the device. If it does + and works, please submit a patch. If it does not work, please + figure out what is needed to make it work and submit a patch. + If it did not recognize it at all, you have done something + wrong and should recheck each step. If you are a FreeBSD src committer, and everything appears - to be working, then you can commit the changes to the tree. - However, there are some minor tricky things that you need to - worry about. First, you must commit the - pccarddevs file to the tree. After you - have done that, you must regenerate - pccarddevs.h and commit it as a second - commit (this is to make sure that the right - $FreeBSD$ tag is in the latter file). Finally, - you need to commit the additions to the driver. - + to be working, then you can commit the changes to the tree. + However, there are some minor tricky things that you need to + worry about. First, you must commit the + pccarddevs file to the tree. After you + have done that, you must regenerate + pccarddevs.h and commit it as a second + commit (this is to make sure that the right + $FreeBSD$ tag is in the latter file). Finally, + you need to commit the additions to the driver. Submitting a new device Many people send entries for new devices to the author - directly. Please do not do this. Please submit them as a PR - and send the author the PR number for his records. This makes - sure that entries are not lost. When submitting a PR, it is - unnecessary to include the pccardevs.h - diffs in the patch, since those will be regenerated. It is - necessary to include a description of the device, as well as - the patches to the client driver. If you do not know the name, - use OEM99 as the name, and the author will adjust OEM99 - accordingly after investigation. Committers should not commit - OEM99, but instead find the highest OEM entry and commit one - more than that. - + directly. Please do not do this. Please submit them as a PR + and send the author the PR number for his records. This makes + sure that entries are not lost. When submitting a PR, it is + unnecessary to include the pccardevs.h + diffs in the patch, since those will be regenerated. It is + necessary to include a description of the device, as well as + the patches to the client driver. If you do not know the + name, use OEM99 as the name, and the author will adjust OEM99 + accordingly after investigation. Committers should not commit + OEM99, but instead find the highest OEM entry and commit one + more than that. - - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/dev-model/book.sgml#7 (text+ko) ==== @@ -23,7 +23,7 @@ - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.21 2012/01/27 22:21:39 gavin Exp $ + - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.22 2012/03/17 04:53:51 eadler Exp $ --> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#37 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2216,7 +2216,7 @@ There are also many useful statistics maintained by the 802.11 layer; the wlanstats tool - will dump these informations. These statistics should + will dump this information. These statistics should identify all errors identified by the 802.11 layer. Beware however that some errors are identified in the device drivers that lie below the 802.11 layer so they may ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#19 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2939,7 +2939,7 @@ # Interface facing Public Internet (Outbound Section) # Interrogate session start requests originating from behind the # firewall on the private network or from this gateway server -# destine for the public Internet. +# destined for the public Internet. ################################################################# # Allow out access to my ISP's Domain name server. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#29 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4084,7 +4084,7 @@ exist for this to work. For details about the format of /etc/fstab, see &man.fstab.5;. - A typicall call to &man.mount.8; for a &ms-dos; file system + A typical call to &man.mount.8; for a &ms-dos; file system looks like: &prompt.root; mount -t msdosfs /dev/ad0s1 /mnt ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -281,7 +281,7 @@ ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#34 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.21 2012/02/19 15:08:48 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml - %SRCID% 1.99 + %SRCID% 1.100 --> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#39 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.30 2012/02/19 20:59:38 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml - %SRCID% 1.445 + %SRCID% 1.446 --> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#75 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.508 + %SRCID% 1.510 --> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#34 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.16 2012/02/21 22:15:17 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml - %SRCID% 1.32 + %SRCID% 1.33 --> From owner-p4-projects@FreeBSD.ORG Wed Mar 21 20:11:11 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4295B1065670; Wed, 21 Mar 2012 20: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 0558E106566B for ; Wed, 21 Mar 2012 20:11:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E1B608FC15 for ; Wed, 21 Mar 2012 20:11:10 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2LKBAaB028963 for ; Wed, 21 Mar 2012 20:11:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2LKBAqq028957 for perforce@freebsd.org; Wed, 21 Mar 2012 20:11:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 21 Mar 2012 20:11:10 GMT Message-Id: <201203212011.q2LKBAqq028957@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.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 208328 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, 21 Mar 2012 20:11:11 -0000 http://p4web.freebsd.org/@@208328?ac=10 Change 208328 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/21 20:10:27 Rearrange the deckchairs a bit: - Make BERI and gxemul console "uarts" conditionally compiled using the FreeBSD kernel config file "device" syntax. - Rename uart_gxemul.c to gxmul_uart.c to match reigning conventions in the beri directory. - In the default BERI config file, use the Altera JTAG UART. - Add a BERI-derived GXEMUL config file that differs only in that it uses the gxemul console driver. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_uart.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/uart_gxemul.c#2 delete .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/GXEMUL#1 add Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD$ mips/beri/beri_machdep.c standard -mips/beri/altera_jtag_uart.c standard +mips/beri/altera_jtag_uart.c optional altera_jtag_uart +mips/beri/gxemul_uart.c optional gxemul_uart mips/mips/intr_machdep.c standard mips/mips/tick.c standard ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI#5 (text+ko) ==== @@ -42,6 +42,10 @@ options MD_ROOT # MD is a potential root device options MD_ROOT_SIZE=8192 +makeoptions MFS_IMAGE=/tmp/root.img +options ROOTDEVNAME=\"ufs:md0\" + +device altera_jtag_uart device md device loop From owner-p4-projects@FreeBSD.ORG Wed Mar 21 21:30:12 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81E4E1065670; Wed, 21 Mar 2012 21:30:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C38D106564A for ; Wed, 21 Mar 2012 21:30:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0B22A8FC14 for ; Wed, 21 Mar 2012 21:30:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2LLUBoN044390 for ; Wed, 21 Mar 2012 21:30:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2LLUBWB044387 for perforce@freebsd.org; Wed, 21 Mar 2012 21:30:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 21 Mar 2012 21:30:11 GMT Message-Id: <201203212130.q2LLUBWB044387@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.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 208334 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, 21 Mar 2012 21:30:12 -0000 http://p4web.freebsd.org/@@208334?ac=10 Change 208334 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/21 21:29:41 Adapt the Deimos gxemul console driver to FreeBSD, using it to implement a low-level console. This appears to work with local gxemul, but a tty driver is not yet implemented. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_uart.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_uart.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Robert N. M. Watson + * Copyright (c) 2011-2012 Robert N. M. Watson * All rights reserved. * * This software was developed by SRI International and the University of @@ -28,10 +28,67 @@ * SUCH DAMAGE. */ -#include "include/gxemul.h" -#include "include/mips.h" +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * Low-level console driver functions. + */ +static cn_probe_t gxemul_uart_cnprobe; +static cn_init_t gxemul_uart_cninit; +static cn_term_t gxemul_uart_cnterm; +static cn_getc_t gxemul_uart_cngetc; +static cn_putc_t gxemul_uart_cnputc; +static cn_grab_t gxemul_uart_cngrab; +static cn_ungrab_t gxemul_uart_cnungrab; + +/* + * I/O routines lifted from Deimos. + * + * XXXRW: Should be using FreeBSD's bus routines here. + */ +#define MIPS_XKPHYS_UNCACHED_BASE 0x9000000000000000 + +typedef uint64_t paddr_t; +typedef uint64_t vaddr_t; + +static inline vaddr_t +mips_phys_to_uncached(paddr_t phys) +{ + + return (phys | MIPS_XKPHYS_UNCACHED_BASE); +} + +static inline uint8_t +mips_ioread_uint8(vaddr_t vaddr) +{ + uint8_t v; + + __asm__ __volatile__ ("lbu %0, 0(%1)" : "=r" (v) : "r" (vaddr)); + return (v); +} + +static inline void +mips_iowrite_uint8(vaddr_t vaddr, uint8_t v) +{ + + __asm__ __volatile__ ("sb %0, 0(%1)" : : "r" (v), "r" (vaddr)); +} -#include "dev/uart/uart.h" +/* + * gxemul-specific constants. + */ +#define GXEMUL_CONS_BASE 0x10000000 /* gxemul console device. */ /* * Routines for interacting with the gxemul test console. Programming details @@ -54,7 +111,7 @@ * Low-level read and write routines. */ static inline uint8_t -cons_data_read(void) +gxemul_uart_data_read(void) { return (mips_ioread_uint8(mips_phys_to_uncached(GXEMUL_CONS_BASE + @@ -62,54 +119,102 @@ } static inline void -cons_data_write(uint8_t v) +gxemul_uart_data_write(uint8_t v) { mips_iowrite_uint8(mips_phys_to_uncached(GXEMUL_CONS_BASE + GXEMUL_PUTGETCHAR_OFF), v); } -int -uart_writable(void) +static int +gxemul_uart_writable(void) { return (1); } -int -uart_readable(void) +static int +gxemul_uart_readable(void) { uint32_t v; if (buffer_valid) return (1); - v = cons_data_read(); + v = gxemul_uart_data_read(); if (v != 0) { buffer_valid = 1; buffer_data = v; + return (1); } return (0); } -char -uart_read(void) +static void +gxemul_uart_write(char ch) +{ + + while (!gxemul_uart_writable()); + gxemul_uart_data_write(ch); +} + +static char +gxemul_uart_read(void) { - while (!uart_readable()); + while (!gxemul_uart_readable()); buffer_valid = 0; return (buffer_data); } -void -uart_write(char ch) +/* + * Implementation of a FreeBSD low-level, polled console driver. + */ +static void +gxemul_uart_cnprobe(struct consdev *cp) +{ + + sprintf(cp->cn_name, "gxemul_uart"); + cp->cn_pri = CN_NORMAL; +} + +static void +gxemul_uart_cninit(struct consdev *cp) +{ + +} + +static void +gxemul_uart_cnterm(struct consdev *cp) +{ + +} + +static int +gxemul_uart_cngetc(struct consdev *cp) +{ + int ret; + + ret = gxemul_uart_read(); + return (ret); +} + +static void +gxemul_uart_cnputc(struct consdev *cp, int c) +{ + + gxemul_uart_write(c); +} + +static void +gxemul_uart_cngrab(struct consdev *cp) { - cons_data_write(ch); } -void -uart_init(void) +static void +gxemul_uart_cnungrab(struct consdev *cp) { - /* Nothing required. */ } + +CONSOLE_DRIVER(gxemul_uart); From owner-p4-projects@FreeBSD.ORG Wed Mar 21 21:33:25 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B42AC1065673; Wed, 21 Mar 2012 21:33:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76BBD106564A for ; Wed, 21 Mar 2012 21:33:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5E8F18FC08 for ; Wed, 21 Mar 2012 21:33:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2LLXPJd046075 for ; Wed, 21 Mar 2012 21:33:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2LLXPir046072 for perforce@freebsd.org; Wed, 21 Mar 2012 21:33:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 21 Mar 2012 21:33:25 GMT Message-Id: <201203212133.q2LLXPir046072@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.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 208335 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, 21 Mar 2012 21:33:26 -0000 http://p4web.freebsd.org/@@208335?ac=10 Change 208335 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/21 21:33:05 Rename gxemul_uart to gxemul_cons -- although modeled on the Altera JTAG UART driver, in fact the gxemul console service is much more of a console than a UART. No functional change. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_uart.c#3 delete .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/GXEMUL#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#6 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ mips/beri/beri_machdep.c standard mips/beri/altera_jtag_uart.c optional altera_jtag_uart -mips/beri/gxemul_uart.c optional gxemul_uart +mips/beri/gxemul_cons.c optional gxemul_cons mips/mips/intr_machdep.c standard mips/mips/tick.c standard ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/GXEMUL#2 (text+ko) ==== @@ -2,4 +2,4 @@ ident GXEMUL nodevice altera_jtag_uart -device gxemul_uart +device gxemul_cons From owner-p4-projects@FreeBSD.ORG Wed Mar 21 22:00:47 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C6081065670; Wed, 21 Mar 2012 22:00:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 064F5106564A for ; Wed, 21 Mar 2012 22:00:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E20788FC15 for ; Wed, 21 Mar 2012 22:00:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2LM0kvg050065 for ; Wed, 21 Mar 2012 22:00:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2LM0kP5050061 for perforce@freebsd.org; Wed, 21 Mar 2012 22:00:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 21 Mar 2012 22:00:46 GMT Message-Id: <201203212200.q2LM0kP5050061@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.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 208337 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, 21 Mar 2012 22:00:47 -0000 http://p4web.freebsd.org/@@208337?ac=10 Change 208337 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/21 21:59:50 Implement a rudimentary FreeBSD tty driver by polling the gxemul debug console; modeled on a similar driver for the Altera JTAG UART, and likely has the same bugs. Not yet well-exercised. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#2 (text+ko) ==== @@ -41,6 +41,26 @@ #include +#define GC_LOCK_INIT() mtx_init(&gc_lock, "gc_lock", NULL, MTX_SPIN) + +#define GC_LOCK() do { \ + if (!kdb_active) \ + mtx_lock_spin(&gc_lock); \ +} while (0) + +#define GC_LOCK_ASSERT() do { \ + if (!kdb_active) \ + mtx_assert(&gc_lock, MA_OWNED); \ +} while (0) + +#define GC_UNLOCK() do { \ + if (!kdb_active) \ + mtx_unlock_spin(&gc_lock); \ +} while (0) + + +static struct mtx gc_lock; + /* * Low-level console driver functions. */ @@ -53,6 +73,24 @@ static cn_ungrab_t gxemul_cons_cnungrab; /* + * TTY-level fields. + */ +static tsw_outwakeup_t gxemul_cons_outwakeup; + +static struct ttydevsw gxemul_cons_ttydevsw = { + .tsw_flags = TF_NOPREFIX, + .tsw_outwakeup = gxemul_cons_outwakeup, +}; + +static struct callout gxemul_cons_callout; +static u_int gxemul_cons_polltime = 10; +#ifdef KDB +static int gxemul_cons_alt_break_state; +#endif + +static void gxemul_cons_timeout(void *); + +/* * I/O routines lifted from Deimos. * * XXXRW: Should be using FreeBSD's bus routines here. @@ -138,6 +176,8 @@ { uint32_t v; + GC_LOCK_ASSERT(); + if (buffer_valid) return (1); v = gxemul_cons_data_read(); @@ -153,6 +193,8 @@ gxemul_cons_write(char ch) { + GC_LOCK_ASSERT(); + while (!gxemul_cons_writable()); gxemul_cons_data_write(ch); } @@ -161,6 +203,8 @@ gxemul_cons_read(void) { + GC_LOCK_ASSERT(); + while (!gxemul_cons_readable()); buffer_valid = 0; return (buffer_data); @@ -181,6 +225,7 @@ gxemul_cons_cninit(struct consdev *cp) { + GC_LOCK_INIT(); } static void @@ -194,7 +239,9 @@ { int ret; + GC_LOCK(); ret = gxemul_cons_read(); + GC_UNLOCK(); return (ret); } @@ -202,7 +249,9 @@ gxemul_cons_cnputc(struct consdev *cp, int c) { + GC_LOCK(); gxemul_cons_write(c); + GC_UNLOCK(); } static void @@ -218,3 +267,67 @@ } CONSOLE_DRIVER(gxemul_cons); + +/* + * TTY-level functions for gxemul_cons. + */ +static void +gxemul_cons_ttyinit(void *unused) +{ + struct tty *tp; + + tp = tty_alloc(&gxemul_cons_ttydevsw, NULL); + tty_init_console(tp, 0); + tty_makedev(tp, NULL, "%s", "gcons"); + callout_init(&gxemul_cons_callout, CALLOUT_MPSAFE); + callout_reset(&gxemul_cons_callout, gxemul_cons_polltime, + gxemul_cons_timeout, tp); + +} +SYSINIT(gxemul_cons_ttyinit, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, + gxemul_cons_ttyinit, NULL); + +static void +gxemul_cons_outwakeup(struct tty *tp) +{ + int len; + u_char ch; + + /* + * XXXRW: Would be nice not to do blocking writes to the console here, + * rescheduling on our timer tick if work remains to be done.. + */ + for (;;) { +#ifdef KDB + kdb_alt_break(ch, &gxemul_cons_alt_break_state); +#endif + len = ttydisc_getc(tp, &ch, sizeof(ch)); + if (len == 0) + break; + GC_LOCK(); + gxemul_cons_write(ch); + GC_UNLOCK(); + } +} + +static void +gxemul_cons_timeout(void *v) +{ + struct tty *tp; + int c; + + tp = v; + tty_lock(tp); + GC_LOCK(); + while (gxemul_cons_readable()) { + c = gxemul_cons_read(); + GC_UNLOCK(); + ttydisc_rint(tp, c, 0); + GC_LOCK(); + } + GC_UNLOCK(); + ttydisc_rint_done(tp); + tty_unlock(tp); + callout_reset(&gxemul_cons_callout, gxemul_cons_polltime, + gxemul_cons_timeout, tp); +} From owner-p4-projects@FreeBSD.ORG Thu Mar 22 19:18:14 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 718301065674; Thu, 22 Mar 2012 19:18:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 34406106566B for ; Thu, 22 Mar 2012 19:18:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 02EEA8FC0A for ; Thu, 22 Mar 2012 19:18:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2MJIDWp010855 for ; Thu, 22 Mar 2012 19:18:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2MJIDSV010852 for perforce@freebsd.org; Thu, 22 Mar 2012 19:18:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 22 Mar 2012 19:18:13 GMT Message-Id: <201203221918.q2MJIDSV010852@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.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 208387 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, 22 Mar 2012 19:18:14 -0000 http://p4web.freebsd.org/@@208387?ac=10 Change 208387 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/22 19:17:48 Tweaks to the Altera JTAG UART and gxemul console drivers -- check for alt-break sequences in input, not output, and name the gxemul console device "gxcons" rather than "gcons". Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/altera_jtag_uart.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/altera_jtag_uart.c#4 (text+ko) ==== @@ -374,9 +374,6 @@ * rescheduling on our timer tick if work remains to be done. */ for (;;) { -#ifdef KDB - kdb_alt_break(ch, &aj_uart_alt_break_state); -#endif len = ttydisc_getc(tp, &ch, sizeof(ch)); if (len == 0) break; @@ -398,6 +395,9 @@ while (aj_uart_readable()) { c = aj_uart_read(); AJU_UNLOCK(); +#ifdef KDB + kdb_alt_break(c, &aj_uart_alt_break_state); +#endif ttydisc_rint(tp, c, 0); AJU_LOCK(); } ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#3 (text+ko) ==== @@ -278,7 +278,7 @@ tp = tty_alloc(&gxemul_cons_ttydevsw, NULL); tty_init_console(tp, 0); - tty_makedev(tp, NULL, "%s", "gcons"); + tty_makedev(tp, NULL, "%s", "gxcons"); callout_init(&gxemul_cons_callout, CALLOUT_MPSAFE); callout_reset(&gxemul_cons_callout, gxemul_cons_polltime, gxemul_cons_timeout, tp); @@ -298,9 +298,6 @@ * rescheduling on our timer tick if work remains to be done.. */ for (;;) { -#ifdef KDB - kdb_alt_break(ch, &gxemul_cons_alt_break_state); -#endif len = ttydisc_getc(tp, &ch, sizeof(ch)); if (len == 0) break; @@ -322,6 +319,9 @@ while (gxemul_cons_readable()) { c = gxemul_cons_read(); GC_UNLOCK(); +#ifdef KDB + kdb_alt_break(c, &gxemul_cons_alt_break_state); +#endif ttydisc_rint(tp, c, 0); GC_LOCK(); } From owner-p4-projects@FreeBSD.ORG Thu Mar 22 19:34:47 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2204A1065679; Thu, 22 Mar 2012 19:34: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 D86DB106566B for ; Thu, 22 Mar 2012 19:34:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C11FD8FC23 for ; Thu, 22 Mar 2012 19:34:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2MJYkjY014396 for ; Thu, 22 Mar 2012 19:34:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2MJYkJY014393 for perforce@freebsd.org; Thu, 22 Mar 2012 19:34:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 22 Mar 2012 19:34:46 GMT Message-Id: <201203221934.q2MJYkJY014393@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.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 208388 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, 22 Mar 2012 19:34:47 -0000 http://p4web.freebsd.org/@@208388?ac=10 Change 208388 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/22 19:34:02 For FreeBSD to auto-select a tty as /dev/console, it must by default match the name of the low-level system console used at boot. Make the two match. With this change I can happily get to single-user using our CHERI boot kernel substituting only the gxemul console driver for the Altera JTAG UART driver. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/altera_jtag_uart.c#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/altera_jtag_uart.c#5 (text+ko) ==== @@ -294,7 +294,7 @@ aj_uart_cnprobe(struct consdev *cp) { - sprintf(cp->cn_name, "aj_uart"); + sprintf(cp->cn_name, "ajuart"); cp->cn_pri = CN_NORMAL; } ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#4 (text+ko) ==== @@ -217,7 +217,7 @@ gxemul_cons_cnprobe(struct consdev *cp) { - sprintf(cp->cn_name, "gxemul_cons"); + sprintf(cp->cn_name, "gxcons"); cp->cn_pri = CN_NORMAL; }