PERFORCE change 204469 for review

Peter Wemm peter at FreeBSD.org
Thu Jan 12 17:45:23 UTC 2012 

http://p4web.freebsd.org/@@204469?ac=10

Change 204469 by peter at peter_overcee on 2012/01/12 17:45:09

	IFC @204468

Affected files ...

.. //depot/projects/hammer/contrib/compiler-rt/lib/int_lib.h#4 integrate
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/FARSI%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GREEK%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/INUIT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/THAI%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25FARSI.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GREEK.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25INUIT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25THAI.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP037%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP038%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10000%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10006%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10007%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10029%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1006%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10079%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10081%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1026%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1046%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1124%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1125%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1129%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1131%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1133%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1161%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1162%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1163%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1250%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1251%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1252%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1253%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1254%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1255%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1256%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1257%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1258%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP273%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP274%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP275%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP277%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP278%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP280%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP281%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP284%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP285%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP290%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP297%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP420%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP423%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP424%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP437%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP500%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP737%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP775%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP850%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP851%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP852%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP853%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP855%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP856%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP857%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP858%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP860%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP861%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP862%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP863%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP864%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP865%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP866%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP868%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP869%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP870%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP871%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP874%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP875%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP880%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP891%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP903%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP904%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP905%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP918%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP922%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP932UDA%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP936EXT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP942EXT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP949EXT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP950%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP037.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP038.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10000.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10006.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10007.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10029.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1006.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10079.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10081.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1026.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1046.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1124.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1125.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1129.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1131.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1133.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1161.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1162.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1163.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1250.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1251.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1252.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1253.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1254.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1255.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1256.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1257.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1258.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP273.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP274.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP275.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP277.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP278.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP280.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP281.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP284.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP285.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP290.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP297.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP420.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP423.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP424.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP437.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP500.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP737.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP775.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP850.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP851.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP852.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP853.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP855.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP856.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP857.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP858.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP860.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP861.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP862.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP863.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP864.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP865.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP866.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP868.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP869.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP870.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP871.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP874.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP875.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP880.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP891.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP903.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP904.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP905.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP918.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP922.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP932UDA.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP936EXT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP942EXT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP949EXT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP950.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB12345%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GBKEXT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GBKUDA%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB12345.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKEXT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKUDA.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI7%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI7.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/JOHAB%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25JOHAB.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/ATARIST%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/DECMCS%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/TDS565%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25ATARIST.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25DECMCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25TDS565.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25VISCII.src#7 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/VISCII%25UCS.src#7 branch
.. //depot/projects/hammer/sys/dev/e1000/if_em.c#22 integrate

Differences ...

==== //depot/projects/hammer/contrib/compiler-rt/lib/int_lib.h#4 (text+ko) ====

@@ -43,4 +43,24 @@
 /* Include internal utility function declarations. */
 #include "int_util.h"
 
+/*
+ * Workaround for LLVM bug 11663.  Prevent endless recursion in
+ * __c?zdi2(), where calls to __builtin_c?z() are expanded to
+ * __c?zdi2() instead of __c?zsi2().
+ *
+ * Instead of placing this workaround in c?zdi2.c, put it in this
+ * global header to prevent other C files from making the detour
+ * through __c?zdi2() as well.
+ *
+ * This problem has only been observed on FreeBSD for sparc64 and
+ * mips64 with GCC 4.2.1.
+ */
+#if defined(__FreeBSD__) && (defined(__sparc64__) || \
+    defined(__mips_n64) || defined(__mips_o64))
+si_int __clzsi2(si_int);
+si_int __ctzsi2(si_int);
+#define	__builtin_clz	__clzsi2
+#define	__builtin_ctz	__ctzsi2
+#endif
+
 #endif /* INT_LIB_H */

==== //depot/projects/hammer/sys/dev/e1000/if_em.c#22 (text+ko) ====

@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.83 2012/01/10 19:57:23 luigi Exp $*/
+/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.85 2012/01/12 17:30:44 luigi Exp $*/
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
@@ -4019,6 +4019,10 @@
 	struct em_buffer	*rxbuf;
 	bus_dma_segment_t	seg[1];
 	int			rsize, nsegs, error;
+#ifdef DEV_NETMAP
+	struct netmap_adapter *na = NA(adapter->ifp);
+	struct netmap_slot *slot;
+#endif
 
 
 	/* Clear the ring contents */
@@ -4026,6 +4030,9 @@
 	rsize = roundup2(adapter->num_rx_desc *
 	    sizeof(struct e1000_rx_desc), EM_DBA_ALIGN);
 	bzero((void *)rxr->rx_base, rsize);
+#ifdef DEV_NETMAP
+	slot = netmap_reset(na, NR_RX, 0, 0);
+#endif
 
 	/*
 	** Free current RX buffer structs and their mbufs
@@ -4037,12 +4044,29 @@
 			    BUS_DMASYNC_POSTREAD);
 			bus_dmamap_unload(rxr->rxtag, rxbuf->map);
 			m_freem(rxbuf->m_head);
+			rxbuf->m_head = NULL; /* mark as freed */
 		}
 	}
 
 	/* Now replenish the mbufs */
         for (int j = 0; j != adapter->num_rx_desc; ++j) {
 		rxbuf = &rxr->rx_buffers[j];
+#ifdef DEV_NETMAP
+		if (slot) {
+			/* slot si is mapped to the j-th NIC-ring entry */
+			int si = j + na->rx_rings[0].nkr_hwofs;
+			uint64_t paddr;
+			void *addr;
+
+			if (si > na->num_rx_desc)
+				si -= na->num_rx_desc;
+			addr = PNMB(slot + si, &paddr);
+			netmap_load_map(rxr->rxtag, rxbuf->map, addr);
+			/* Update descriptor */
+			rxr->rx_base[j].buffer_addr = htole64(paddr);
+			continue;
+		}
+#endif /* DEV_NETMAP */
 		rxbuf->m_head = m_getjcl(M_DONTWAIT, MT_DATA,
 		    M_PKTHDR, adapter->rx_mbuf_sz);
 		if (rxbuf->m_head == NULL) {
@@ -4073,63 +4097,6 @@
 	bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 
-#ifdef DEV_NETMAP
-    {
-	/*
-	 * This driver is slightly different from the standard:
-	 * it refills the rings in blocks of 8, so the while()
-	 * above completes any leftover work. Also, after if_init()
-	 * the ring starts at rxr->next_to_check instead of 0.
-	 *
-	 * Currently: we leave the mbufs allocated even in netmap
-	 * mode, and simply make the NIC ring point to the
-	 * correct buffer (netmap_buf or mbuf) depending on
-	 * the mode. To avoid mbuf leaks, when in netmap mode we
-	 * must make sure that next_to_refresh == next_to_check - 1
-	 * so that the above while() loop is never run on init.
-	 *
-	 * A better way would be to free the mbufs when entering
-	 * netmap mode, and set next_to_refresh/check in
-	 * a way that the mbufs are completely reallocated
-	 * when going back to standard mode.
-	 */
-	struct netmap_adapter *na = NA(adapter->ifp);
-	struct netmap_slot *slot = netmap_reset(na,
-		NR_RX, rxr->me, rxr->next_to_check);
-	int sj = slot ? na->rx_rings[rxr->me].nkr_hwofs : 0;
-
-	/* slot sj corresponds to entry j in the NIC ring */
-	if (sj < 0)
-		sj += adapter->num_rx_desc;
-
-	for (int j = 0; j != adapter->num_rx_desc; j++, sj++) {
-		rxbuf = &rxr->rx_buffers[j];
-		/* no mbuf and regular mode -> skip this entry */
-		if (rxbuf->m_head == NULL && !slot)
-			continue;
-		/* Handle wrap. Cannot use "na" here, could be NULL */
-		if (sj >= adapter->num_rx_desc)
-			sj -= adapter->num_rx_desc;
-		/* see comment, set slot addr and map */
-		if (slot) {
-			uint64_t paddr;
-			void *addr = PNMB(slot + sj, &paddr);
-			netmap_load_map(rxr->rxtag, rxbuf->map, addr);
-			/* Update descriptor */
-			rxr->rx_base[j].buffer_addr = htole64(paddr);
-		} else {
-			/* Get the memory mapping */
-			bus_dmamap_load_mbuf_sg(rxr->rxtag,
-			    rxbuf->map, rxbuf->m_head, seg,
-			    &nsegs, BUS_DMA_NOWAIT);
-			/* Update descriptor */
-			rxr->rx_base[j].buffer_addr = htole64(seg[0].ds_addr);
-		}
-		bus_dmamap_sync(rxr->rxtag, rxbuf->map, BUS_DMASYNC_PREREAD);
-	}
-    }
-#endif /* DEV_NETMAP */
-
 fail:
 	EM_RX_UNLOCK(rxr);
 	return (error);
@@ -4313,21 +4280,18 @@
 		E1000_WRITE_REG(hw, E1000_RDBAL(i), (u32)bus_addr);
 		/* Setup the Head and Tail Descriptor Pointers */
 		E1000_WRITE_REG(hw, E1000_RDH(i), 0);
-		E1000_WRITE_REG(hw, E1000_RDT(i), adapter->num_rx_desc - 1);
 #ifdef DEV_NETMAP
 		/*
 		 * an init() while a netmap client is active must
 		 * preserve the rx buffers passed to userspace.
 		 * In this driver it means we adjust RDT to
-		 * something different from next_to_refresh.
+		 * something different from na->num_rx_desc - 1.
 		 */
 		if (ifp->if_capenable & IFCAP_NETMAP) {
 			struct netmap_adapter *na = NA(adapter->ifp);
 			struct netmap_kring *kring = &na->rx_rings[i];
-			int t = rxr->next_to_refresh - kring->nr_hwavail;
+			int t = na->num_rx_desc - 1 - kring->nr_hwavail;
 
-			if (t < 0)
-				t += na->num_rx_desc;
 			E1000_WRITE_REG(hw, E1000_RDT(i), t);
 		} else
 #endif /* DEV_NETMAP */

More information about the p4-projects mailing list