Date: Sun, 18 Mar 2012 00:59:49 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 208139 for review Message-ID: <201203180059.q2I0xnrI011654@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/cdefs.h> -__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 <sys/cdefs.h> -__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 <sys/cdefs.h> -__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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -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 <sys/cdefs.h> -__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 <sys/cdefs.h> -__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 <sys/cdefs.h> -__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) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203180059.q2I0xnrI011654>