Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/cherry-xenmp]: src Catchup with rmind-uvmplock merge.



details:   https://anonhg.NetBSD.org/src/rev/672a21ed5c98
branches:  cherry-xenmp
changeset: 765613:672a21ed5c98
user:      cherry <cherry%NetBSD.org@localhost>
date:      Thu Jun 23 14:17:47 2011 +0000

description:
Catchup with rmind-uvmplock merge.

diffstat:

 Makefile                                                                           |     12 +-
 bin/pax/cpio.1                                                                     |     58 +-
 bin/pax/extern.h                                                                   |      4 +-
 bin/pax/options.c                                                                  |     30 +-
 bin/pax/pax.1                                                                      |      8 +-
 bin/pax/pax.c                                                                      |      6 +-
 bin/pax/tar.1                                                                      |     74 +-
 bin/ps/print.c                                                                     |      6 +-
 bin/sh/alias.c                                                                     |      5 +-
 bin/sh/alias.h                                                                     |      4 +-
 bin/sh/arith.y                                                                     |      5 +-
 bin/sh/cd.c                                                                        |     12 +-
 bin/sh/cd.h                                                                        |      4 +-
 bin/sh/exec.h                                                                      |      4 +-
 bin/sh/expand.c                                                                    |      5 +-
 bin/sh/expand.h                                                                    |      4 +-
 bin/sh/histedit.c                                                                  |      5 +-
 bin/sh/jobs.c                                                                      |      5 +-
 bin/sh/jobs.h                                                                      |      7 +-
 bin/sh/main.c                                                                      |      5 +-
 bin/sh/main.h                                                                      |      4 +-
 bin/sh/miscbltin.c                                                                 |      6 +-
 bin/sh/myhistedit.h                                                                |      3 +-
 bin/sh/options.c                                                                   |      5 +-
 bin/sh/options.h                                                                   |      5 +-
 bin/sh/sh.1                                                                        |     43 +-
 bin/sh/trap.c                                                                      |      5 +-
 bin/sh/trap.h                                                                      |      3 +-
 bin/sh/var.c                                                                       |      5 +-
 bin/sh/var.h                                                                       |      6 +-
 common/include/quota/quota.h                                                       |      4 +-
 common/include/quota/quotaprop.h                                                   |      4 +-
 common/lib/libc/Makefile.inc                                                       |      7 +-
 common/lib/libc/gen/rb.c                                                           |      8 +-
 common/lib/libprop/prop_send_syscall.3                                             |      4 +-
 common/lib/libquota/quotaprop.c                                                    |      4 +-
 common/lib/libquota/quotasubr.c                                                    |      4 +-
 compat/m32.mk                                                                      |      7 +-
 crypto/dist/heimdal/lib/krb5/convert_creds.c                                       |      4 +-
 crypto/dist/heimdal/lib/krb5/init_creds_pw.c                                       |      4 +-
 crypto/dist/heimdal/lib/krb5/rd_req.c                                              |      4 +-
 crypto/external/bsd/openssh/bin/sftp/Makefile                                      |      4 +-
 crypto/external/bsd/openssh/bin/ssh-keygen/Makefile                                |      4 +-
 crypto/external/bsd/openssh/bin/ssh/Makefile                                       |     11 +-
 crypto/external/bsd/openssh/bin/sshd/Makefile                                      |      4 +-
 crypto/external/bsd/openssh/dist/progressmeter.c                                   |      6 +-
 crypto/external/bsd/openssh/lib/Makefile                                           |      7 +-
 crypto/external/bsd/openssl/bin/Makefile                                           |      6 +-
 crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS                                   |     25 +
 crypto/external/bsd/openssl/dist/CHANGES                                           |    346 +-
 crypto/external/bsd/openssl/dist/Configure                                         |     95 +-
 crypto/external/bsd/openssl/dist/FAQ                                               |     55 +-
 crypto/external/bsd/openssl/dist/INSTALL                                           |      6 +
 crypto/external/bsd/openssl/dist/INSTALL.VMS                                       |     52 +-
 crypto/external/bsd/openssl/dist/INSTALL.W32                                       |     22 +-
 crypto/external/bsd/openssl/dist/LICENSE                                           |      2 +-
 crypto/external/bsd/openssl/dist/Makefile.org                                      |     50 +-
 crypto/external/bsd/openssl/dist/Makefile.shared                                   |     26 +-
 crypto/external/bsd/openssl/dist/NEWS                                              |     66 +-
 crypto/external/bsd/openssl/dist/PROBLEMS                                          |      4 +-
 crypto/external/bsd/openssl/dist/README                                            |      4 +-
 crypto/external/bsd/openssl/dist/STATUS                                            |     20 +-
 crypto/external/bsd/openssl/dist/TABLE                                             |    170 +-
 crypto/external/bsd/openssl/dist/VMS/install-vms.com                               |     67 +
 crypto/external/bsd/openssl/dist/VMS/mkshared.com                                  |    235 +-
 crypto/external/bsd/openssl/dist/VMS/openssl_startup.com                           |    108 +
 crypto/external/bsd/openssl/dist/VMS/openssl_undo.com                              |     20 +
 crypto/external/bsd/openssl/dist/apps/CA.com                                       |    100 +-
 crypto/external/bsd/openssl/dist/apps/Makefile                                     |     92 +-
 crypto/external/bsd/openssl/dist/apps/apps.c                                       |     27 +-
 crypto/external/bsd/openssl/dist/apps/apps.h                                       |      3 +
 crypto/external/bsd/openssl/dist/apps/asn1pars.c                                   |      1 +
 crypto/external/bsd/openssl/dist/apps/ciphers.c                                    |      2 +-
 crypto/external/bsd/openssl/dist/apps/cms.c                                        |     35 +-
 crypto/external/bsd/openssl/dist/apps/dgst.c                                       |      2 +-
 crypto/external/bsd/openssl/dist/apps/dh.c                                         |      5 +-
 crypto/external/bsd/openssl/dist/apps/dhparam.c                                    |      5 +-
 crypto/external/bsd/openssl/dist/apps/dsa.c                                        |      2 +-
 crypto/external/bsd/openssl/dist/apps/dsaparam.c                                   |      9 +-
 crypto/external/bsd/openssl/dist/apps/ec.c                                         |      5 +-
 crypto/external/bsd/openssl/dist/apps/ecparam.c                                    |      5 +-
 crypto/external/bsd/openssl/dist/apps/enc.c                                        |      9 +-
 crypto/external/bsd/openssl/dist/apps/gendh.c                                      |      5 +-
 crypto/external/bsd/openssl/dist/apps/gendsa.c                                     |      5 +-
 crypto/external/bsd/openssl/dist/apps/genrsa.c                                     |      5 +-
 crypto/external/bsd/openssl/dist/apps/install-apps.com                             |    107 +
 crypto/external/bsd/openssl/dist/apps/makeapps.com                                 |    341 +-
 crypto/external/bsd/openssl/dist/apps/openssl.c                                    |     80 +-
 crypto/external/bsd/openssl/dist/apps/pkcs12.c                                     |      2 +-
 crypto/external/bsd/openssl/dist/apps/pkcs7.c                                      |      5 +-
 crypto/external/bsd/openssl/dist/apps/pkcs8.c                                      |      4 +
 crypto/external/bsd/openssl/dist/apps/pkeyparam.c                                  |      3 +-
 crypto/external/bsd/openssl/dist/apps/pkeyutl.c                                    |     12 +-
 crypto/external/bsd/openssl/dist/apps/privkey.pem                                  |     34 +-
 crypto/external/bsd/openssl/dist/apps/progs.h                                      |      4 +
 crypto/external/bsd/openssl/dist/apps/rand.c                                       |      5 +-
 crypto/external/bsd/openssl/dist/apps/req.c                                        |      6 +
 crypto/external/bsd/openssl/dist/apps/rsa.c                                        |      2 +-
 crypto/external/bsd/openssl/dist/apps/s_cb.c                                       |     60 +-
 crypto/external/bsd/openssl/dist/apps/s_client.c                                   |    217 +-
 crypto/external/bsd/openssl/dist/apps/s_server.c                                   |    145 +-
 crypto/external/bsd/openssl/dist/apps/s_socket.c                                   |     13 +-
 crypto/external/bsd/openssl/dist/apps/sess_id.c                                    |     18 +-
 crypto/external/bsd/openssl/dist/apps/speed.c                                      |     55 +-
 crypto/external/bsd/openssl/dist/apps/srp.c                                        |    759 +
 crypto/external/bsd/openssl/dist/apps/tsget                                        |      2 +-
 crypto/external/bsd/openssl/dist/apps/vms_decc_init.c                              |    188 +
 crypto/external/bsd/openssl/dist/apps/x509.c                                       |     31 +-
 crypto/external/bsd/openssl/dist/config                                            |      4 +
 crypto/external/bsd/openssl/dist/crypto/LPdir_vms.c                                |     49 +-
 crypto/external/bsd/openssl/dist/crypto/Makefile                                   |      9 +-
 crypto/external/bsd/openssl/dist/crypto/aes/aes_wrap.c                             |     12 +-
 crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-armv4.pl                       |    402 +-
 crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-ppc.pl                         |    293 +-
 crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-s390x.pl                       |      6 +
 crypto/external/bsd/openssl/dist/crypto/alphacpuid.pl                              |    128 +
 crypto/external/bsd/openssl/dist/crypto/asn1/a_int.c                               |      3 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/a_object.c                            |      6 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/a_strex.c                             |     17 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/a_strnid.c                            |      2 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/ameth_lib.c                           |      6 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/asn1.h                                |      3 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/asn1_err.c                            |      1 -
 crypto/external/bsd/openssl/dist/crypto/asn1/bio_ndef.c                            |      3 -
 crypto/external/bsd/openssl/dist/crypto/asn1/n_pkey.c                              |      3 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/p5_pbev2.c                            |    140 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/t_crl.c                               |      3 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c                            |      3 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/x_algor.c                             |     14 +
 crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c                              |      4 +-
 crypto/external/bsd/openssl/dist/crypto/bf/bf_skey.c                               |      8 +
 crypto/external/bsd/openssl/dist/crypto/bf/bftest.c                                |      4 +-
 crypto/external/bsd/openssl/dist/crypto/bf/blowfish.h                              |      4 +-
 crypto/external/bsd/openssl/dist/crypto/bio/b_sock.c                               |     66 +-
 crypto/external/bsd/openssl/dist/crypto/bio/bf_nbio.c                              |      2 -
 crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c                              |      4 +-
 crypto/external/bsd/openssl/dist/crypto/bio/bss_acpt.c                             |      5 +-
 crypto/external/bsd/openssl/dist/crypto/bio/bss_dgram.c                            |     42 +-
 crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c                             |     53 +-
 crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c                              |     32 +-
 crypto/external/bsd/openssl/dist/crypto/bio/bss_sock.c                             |     13 -
 crypto/external/bsd/openssl/dist/crypto/bn/Makefile                                |      9 +-
 crypto/external/bsd/openssl/dist/crypto/bn/asm/alpha-mont.pl                       |     44 +-
 crypto/external/bsd/openssl/dist/crypto/bn/asm/armv4-mont.pl                       |      1 +
 crypto/external/bsd/openssl/dist/crypto/bn/asm/s390x-mont.pl                       |      4 +-
 crypto/external/bsd/openssl/dist/crypto/bn/asm/s390x.S                             |     86 +-
 crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gcc.c                        |      1 +
 crypto/external/bsd/openssl/dist/crypto/bn/bn.h                                    |     29 +
 crypto/external/bsd/openssl/dist/crypto/bn/bn_div.c                                |      2 +-
 crypto/external/bsd/openssl/dist/crypto/bn/bn_exp2.c                               |      3 +-
 crypto/external/bsd/openssl/dist/crypto/bn/bn_gf2m.c                               |      3 +-
 crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c                                |     19 -
 crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c                               |      2 +-
 crypto/external/bsd/openssl/dist/crypto/bn/bn_mul.c                                |      9 +-
 crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c                               |     64 +-
 crypto/external/bsd/openssl/dist/crypto/bn/bn_print.c                              |     19 +
 crypto/external/bsd/openssl/dist/crypto/bn/bn_x931p.c                              |    272 +
 crypto/external/bsd/openssl/dist/crypto/bn/bntest.c                                |      2 +-
 crypto/external/bsd/openssl/dist/crypto/bn/divtest.c                               |      2 +-
 crypto/external/bsd/openssl/dist/crypto/buffer/Makefile                            |     11 +-
 crypto/external/bsd/openssl/dist/crypto/buffer/buf_str.c                           |    119 +
 crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c                            |     58 -
 crypto/external/bsd/openssl/dist/crypto/cast/c_skey.c                              |      9 +-
 crypto/external/bsd/openssl/dist/crypto/cast/cast.h                                |      4 +-
 crypto/external/bsd/openssl/dist/crypto/cast/casttest.c                            |      2 +-
 crypto/external/bsd/openssl/dist/crypto/cms/Makefile                               |      6 +-
 crypto/external/bsd/openssl/dist/crypto/cms/cms.h                                  |     19 -
 crypto/external/bsd/openssl/dist/crypto/cms/cms_asn1.c                             |     13 +-
 crypto/external/bsd/openssl/dist/crypto/cms/cms_env.c                              |     10 +-
 crypto/external/bsd/openssl/dist/crypto/cms/cms_err.c                              |     13 +-
 crypto/external/bsd/openssl/dist/crypto/cms/cms_lcl.h                              |     10 -
 crypto/external/bsd/openssl/dist/crypto/cms/cms_lib.c                              |      8 +-
 crypto/external/bsd/openssl/dist/crypto/cms/cms_smime.c                            |     24 -
 crypto/external/bsd/openssl/dist/crypto/comp/c_rle.c                               |      3 +-
 crypto/external/bsd/openssl/dist/crypto/conf/conf_api.c                            |      2 +-
 crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c                            |     13 +-
 crypto/external/bsd/openssl/dist/crypto/conf/test.c                                |      2 +-
 crypto/external/bsd/openssl/dist/crypto/cpt_err.c                                  |      4 +-
 crypto/external/bsd/openssl/dist/crypto/cryptlib.c                                 |     61 +-
 crypto/external/bsd/openssl/dist/crypto/cryptlib.h                                 |      3 +-
 crypto/external/bsd/openssl/dist/crypto/crypto-lib.com                             |    381 +-
 crypto/external/bsd/openssl/dist/crypto/crypto.h                                   |     34 +-
 crypto/external/bsd/openssl/dist/crypto/des/des-lib.com                            |     12 +-
 crypto/external/bsd/openssl/dist/crypto/des/des.h                                  |      3 +
 crypto/external/bsd/openssl/dist/crypto/des/destest.c                              |      8 +-
 crypto/external/bsd/openssl/dist/crypto/des/rpc_des.h                              |      4 +-
 crypto/external/bsd/openssl/dist/crypto/des/set_key.c                              |      9 +
 crypto/external/bsd/openssl/dist/crypto/dsa/Makefile                               |      7 +-
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa.h                                  |      1 +
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c                            |     10 +-
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_asn1.c                             |     40 +-
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_err.c                              |      1 +
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_gen.c                              |      8 +-
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_locl.h                             |      1 +
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ossl.c                             |     36 +-
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_pmeth.c                            |      6 +-
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_sign.c                             |     40 +-
 crypto/external/bsd/openssl/dist/crypto/dsa/dsa_vrf.c                              |     21 -
 crypto/external/bsd/openssl/dist/crypto/dso/Makefile                               |      2 +-
 crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c                            |      4 +
 crypto/external/bsd/openssl/dist/crypto/dso/dso_vms.c                              |    177 +-
 crypto/external/bsd/openssl/dist/crypto/ec/Makefile                                |      5 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ec.h                                    |     25 +
 crypto/external/bsd/openssl/dist/crypto/ec/ec2_mult.c                              |     13 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ec2_smpl.c                              |     11 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ec_curve.c                              |    175 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ec_err.c                                |     11 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ec_key.c                                |     83 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h                                |     15 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ec_mult.c                               |      6 +-
 crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistp224.c                          |   1492 +
 crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c                              |      3 +
 crypto/external/bsd/openssl/dist/crypto/ec/ectest.c                                |    261 +-
 crypto/external/bsd/openssl/dist/crypto/ecdh/ech_lib.c                             |      3 +-
 crypto/external/bsd/openssl/dist/crypto/ecdsa/ecdsatest.c                          |      5 +-
 crypto/external/bsd/openssl/dist/crypto/ecdsa/ecs_lib.c                            |      2 -
 crypto/external/bsd/openssl/dist/crypto/ecdsa/ecs_ossl.c                           |     10 +
 crypto/external/bsd/openssl/dist/crypto/engine/Makefile                            |     15 -
 crypto/external/bsd/openssl/dist/crypto/engine/eng_aesni.c                         |     17 +-
 crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c                           |     14 +-
 crypto/external/bsd/openssl/dist/crypto/engine/eng_cnf.c                           |     17 +-
 crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c                     |     41 +-
 crypto/external/bsd/openssl/dist/crypto/engine/eng_err.c                           |      3 +-
 crypto/external/bsd/openssl/dist/crypto/engine/eng_fat.c                           |      3 +-
 crypto/external/bsd/openssl/dist/crypto/engine/eng_list.c                          |      1 +
 crypto/external/bsd/openssl/dist/crypto/engine/eng_table.c                         |      3 +-
 crypto/external/bsd/openssl/dist/crypto/engine/engine.h                            |     17 +-
 crypto/external/bsd/openssl/dist/crypto/engine/enginetest.c                        |      4 +-
 crypto/external/bsd/openssl/dist/crypto/err/err.c                                  |     13 +-
 crypto/external/bsd/openssl/dist/crypto/err/err.h                                  |      9 +-
 crypto/external/bsd/openssl/dist/crypto/err/err_prn.c                              |      3 +-
 crypto/external/bsd/openssl/dist/crypto/evp/Makefile                               |     14 +-
 crypto/external/bsd/openssl/dist/crypto/evp/bio_b64.c                              |     77 +-
 crypto/external/bsd/openssl/dist/crypto/evp/bio_enc.c                              |     39 +-
 crypto/external/bsd/openssl/dist/crypto/evp/bio_ok.c                               |      8 +-
 crypto/external/bsd/openssl/dist/crypto/evp/c_all.c                                |      2 +-
 crypto/external/bsd/openssl/dist/crypto/evp/c_allc.c                               |      6 -
 crypto/external/bsd/openssl/dist/crypto/evp/digest.c                               |     29 +-
 crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c                                |     88 +-
 crypto/external/bsd/openssl/dist/crypto/evp/e_des3.c                               |      3 +
 crypto/external/bsd/openssl/dist/crypto/evp/encode.c                               |      3 +-
 crypto/external/bsd/openssl/dist/crypto/evp/evp.h                                  |    158 +-
 crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c                              |    118 +-
 crypto/external/bsd/openssl/dist/crypto/evp/evp_err.c                              |     13 +-
 crypto/external/bsd/openssl/dist/crypto/evp/evp_fips.c                             |    112 +
 crypto/external/bsd/openssl/dist/crypto/evp/evp_key.c                              |      9 +-
 crypto/external/bsd/openssl/dist/crypto/evp/evp_lib.c                              |     19 +
 crypto/external/bsd/openssl/dist/crypto/evp/evp_locl.h                             |     33 +-
 crypto/external/bsd/openssl/dist/crypto/evp/evp_pbe.c                              |      5 -
 crypto/external/bsd/openssl/dist/crypto/evp/evptests.txt                           |     13 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_dss.c                                |      2 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_dss1.c                               |      3 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_ecdsa.c                              |      3 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_md4.c                                |      2 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_md5.c                                |      1 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_mdc2.c                               |      4 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_ripemd.c                             |      1 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_sha.c                                |      1 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c                               |      5 +
 crypto/external/bsd/openssl/dist/crypto/evp/m_sigver.c                             |      4 +-
 crypto/external/bsd/openssl/dist/crypto/evp/m_wp.c                                 |      1 +
 crypto/external/bsd/openssl/dist/crypto/evp/names.c                                |      4 +-
 crypto/external/bsd/openssl/dist/crypto/evp/p5_crpt2.c                             |     81 +-
 crypto/external/bsd/openssl/dist/crypto/evp/p_lib.c                                |      3 +
 crypto/external/bsd/openssl/dist/crypto/evp/p_sign.c                               |      2 +-
 crypto/external/bsd/openssl/dist/crypto/evp/p_verify.c                             |      2 +-
 crypto/external/bsd/openssl/dist/crypto/evp/pmeth_gn.c                             |      5 +-
 crypto/external/bsd/openssl/dist/crypto/evp/pmeth_lib.c                            |     56 +-
 crypto/external/bsd/openssl/dist/crypto/hmac/hm_pmeth.c                            |      2 +
 crypto/external/bsd/openssl/dist/crypto/hmac/hmac.c                                |      9 +-
 crypto/external/bsd/openssl/dist/crypto/hmac/hmac.h                                |     11 +-
 crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c                            |     16 +-
 crypto/external/bsd/openssl/dist/crypto/ia64cpuid.S                                |      4 +-
 crypto/external/bsd/openssl/dist/crypto/idea/i_skey.c                              |      8 +
 crypto/external/bsd/openssl/dist/crypto/idea/idea.h                                |      3 +
 crypto/external/bsd/openssl/dist/crypto/idea/ideatest.c                            |      6 +-
 crypto/external/bsd/openssl/dist/crypto/install-crypto.com                         |    196 +
 crypto/external/bsd/openssl/dist/crypto/jpake/jpake.c                              |     29 +
 crypto/external/bsd/openssl/dist/crypto/jpake/jpake.h                              |      2 +
 crypto/external/bsd/openssl/dist/crypto/jpake/jpake_err.c                          |      4 +-
 crypto/external/bsd/openssl/dist/crypto/md2/md2.h                                  |      3 +
 crypto/external/bsd/openssl/dist/crypto/md2/md2_dgst.c                             |      2 +-
 crypto/external/bsd/openssl/dist/crypto/md2/md2test.c                              |      8 +-
 crypto/external/bsd/openssl/dist/crypto/md32_common.h                              |     21 +-
 crypto/external/bsd/openssl/dist/crypto/md4/md4.h                                  |      3 +
 crypto/external/bsd/openssl/dist/crypto/md4/md4_dgst.c                             |      5 +-
 crypto/external/bsd/openssl/dist/crypto/md4/md4test.c                              |     10 +-
 crypto/external/bsd/openssl/dist/crypto/md5/asm/md5-ia64.S                         |      2 +-
 crypto/external/bsd/openssl/dist/crypto/md5/md5.h                                  |      3 +
 crypto/external/bsd/openssl/dist/crypto/md5/md5_dgst.c                             |      3 +-
 crypto/external/bsd/openssl/dist/crypto/md5/md5test.c                              |     10 +-
 crypto/external/bsd/openssl/dist/crypto/mdc2/mdc2.h                                |      3 +
 crypto/external/bsd/openssl/dist/crypto/mdc2/mdc2dgst.c                            |      3 +-
 crypto/external/bsd/openssl/dist/crypto/mdc2/mdc2test.c                            |      6 +-
 crypto/external/bsd/openssl/dist/crypto/mem.c                                      |      2 +
 crypto/external/bsd/openssl/dist/crypto/modes/cfb128.c                             |      9 +-
 crypto/external/bsd/openssl/dist/crypto/modes/ctr128.c                             |     28 +-
 crypto/external/bsd/openssl/dist/crypto/modes/ofb128.c                             |      4 +-
 crypto/external/bsd/openssl/dist/crypto/o_fips.c                                   |     83 +
 crypto/external/bsd/openssl/dist/crypto/o_init.c                                   |     82 +
 crypto/external/bsd/openssl/dist/crypto/o_time.c                                   |     22 +-
 crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.h                          |    152 +-
 crypto/external/bsd/openssl/dist/crypto/objects/obj_mac.h                          |    111 +-
 crypto/external/bsd/openssl/dist/crypto/objects/obj_mac.num                        |     19 +
 crypto/external/bsd/openssl/dist/crypto/objects/obj_xref.h                         |      2 +-
 crypto/external/bsd/openssl/dist/crypto/objects/objects.txt                        |     33 +-
 crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_ht.c                             |     12 +-
 crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_lib.c                            |      8 +-
 crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_prn.c                            |      3 +-
 crypto/external/bsd/openssl/dist/crypto/opensslv.h                                 |      8 +-
 crypto/external/bsd/openssl/dist/crypto/pem/pem.h                                  |      9 +-
 crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c                              |     31 +-
 crypto/external/bsd/openssl/dist/crypto/pem/pem_seal.c                             |     15 +-
 crypto/external/bsd/openssl/dist/crypto/pem/pem_sign.c                             |      8 +-
 crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c                               |     15 +-
 crypto/external/bsd/openssl/dist/crypto/perlasm/ppc-xlate.pl                       |      7 +
 crypto/external/bsd/openssl/dist/crypto/perlasm/x86_64-xlate.pl                    |     30 +-
 crypto/external/bsd/openssl/dist/crypto/perlasm/x86asm.pl                          |     17 -
 crypto/external/bsd/openssl/dist/crypto/perlasm/x86gas.pl                          |      2 +-
 crypto/external/bsd/openssl/dist/crypto/perlasm/x86masm.pl                         |      2 +-
 crypto/external/bsd/openssl/dist/crypto/perlasm/x86nasm.pl                         |      2 +-
 crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_key.c                           |     39 +-
 crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_npas.c                          |     17 +-
 crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c                           |      3 -
 crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_lib.c                            |      2 -
 crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7.h                              |      2 -
 crypto/external/bsd/openssl/dist/crypto/ppccpuid.pl                                |      2 +
 crypto/external/bsd/openssl/dist/crypto/pqueue/pqueue.c                            |      5 +-
 crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c                             |    128 +-
 crypto/external/bsd/openssl/dist/crypto/rand/rand.h                                |      8 +-
 crypto/external/bsd/openssl/dist/crypto/rand/rand_lib.c                            |    103 +
 crypto/external/bsd/openssl/dist/crypto/rand/rand_nw.c                             |      4 +-
 crypto/external/bsd/openssl/dist/crypto/rand/rand_vms.c                            |     16 +-
 crypto/external/bsd/openssl/dist/crypto/rand/rand_win.c                            |     23 +-
 crypto/external/bsd/openssl/dist/crypto/rand/randfile.c                            |     23 +-
 crypto/external/bsd/openssl/dist/crypto/rc2/rc2.h                                  |      4 +-
 crypto/external/bsd/openssl/dist/crypto/rc2/rc2_skey.c                             |      8 +
 crypto/external/bsd/openssl/dist/crypto/rc5/rc5_locl.h                             |      4 +-
 crypto/external/bsd/openssl/dist/crypto/ripemd/ripemd.h                            |      3 +
 crypto/external/bsd/openssl/dist/crypto/ripemd/rmd_dgst.c                          |      3 +-
 crypto/external/bsd/openssl/dist/crypto/ripemd/rmdtest.c                           |     12 +-
 crypto/external/bsd/openssl/dist/crypto/rsa/Makefile                               |     19 +-
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa.h                                  |     61 +
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_crpt.c                             |    257 +
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_eay.c                              |      2 +-
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_err.c                              |     13 +-
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_gen.c                              |     15 +
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c                              |    170 +-
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pmeth.c                            |    122 +-
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pss.c                              |     52 +-
 crypto/external/bsd/openssl/dist/crypto/rsa/rsa_sign.c                             |     17 +
 crypto/external/bsd/openssl/dist/crypto/s390xcap.c                                 |     37 +
 crypto/external/bsd/openssl/dist/crypto/s390xcpuid.S                               |     16 +-
 crypto/external/bsd/openssl/dist/crypto/seed/seed.c                                |      9 +-
 crypto/external/bsd/openssl/dist/crypto/seed/seed.h                                |      4 +-
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-586.pl                        |    102 +-
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-armv4-large.pl                |     85 +-
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-ia64.pl                       |    192 +-
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-s390x.pl                      |      5 +
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-sparcv9.pl                    |      1 +
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-sparcv9a.pl                   |      1 +
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl                     |    317 +-
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha256-armv4.pl                    |     36 +-
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha512-armv4.pl                    |     33 +-
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha512-s390x.pl                    |      5 +
 crypto/external/bsd/openssl/dist/crypto/sha/asm/sha512-sparcv9.pl                  |      1 +
 crypto/external/bsd/openssl/dist/crypto/sha/sha.h                                  |     14 +
 crypto/external/bsd/openssl/dist/crypto/sha/sha1dgst.c                             |      1 +
 crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c                             |     18 +-
 crypto/external/bsd/openssl/dist/crypto/sha/sha256.c                               |      4 +-
 crypto/external/bsd/openssl/dist/crypto/sha/sha512.c                               |      4 +-
 crypto/external/bsd/openssl/dist/crypto/sha/sha_dgst.c                             |      1 +
 crypto/external/bsd/openssl/dist/crypto/sha/sha_locl.h                             |      6 +-
 crypto/external/bsd/openssl/dist/crypto/sha/shatest.c                              |     14 +-
 crypto/external/bsd/openssl/dist/crypto/sparccpuid.S                               |     90 +-
 crypto/external/bsd/openssl/dist/crypto/sparcv9cap.c                               |     97 +-
 crypto/external/bsd/openssl/dist/crypto/stack/safestack.h                          |    131 +-
 crypto/external/bsd/openssl/dist/crypto/symhacks.h                                 |     34 +
 crypto/external/bsd/openssl/dist/crypto/threads/mttest.c                           |     40 +-
 crypto/external/bsd/openssl/dist/crypto/ts/Makefile                                |      3 +-
 crypto/external/bsd/openssl/dist/crypto/ts/ts_verify_ctx.c                         |      5 +-
 crypto/external/bsd/openssl/dist/crypto/ui/ui.h                                    |      2 +
 crypto/external/bsd/openssl/dist/crypto/ui/ui_lib.c                                |     19 +
 crypto/external/bsd/openssl/dist/crypto/vms_rms.h                                  |     51 +
 crypto/external/bsd/openssl/dist/crypto/whrlpool/whrlpool.h                        |      3 +
 crypto/external/bsd/openssl/dist/crypto/whrlpool/wp_dgst.c                         |      3 +-
 crypto/external/bsd/openssl/dist/crypto/x509/by_dir.c                              |      5 +-
 crypto/external/bsd/openssl/dist/crypto/x509/x509.h                                |     11 +-
 crypto/external/bsd/openssl/dist/crypto/x509/x509_cmp.c                            |     14 +
 crypto/external/bsd/openssl/dist/crypto/x509/x509_lu.c                             |     83 +-
 crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c                            |      2 +-
 crypto/external/bsd/openssl/dist/crypto/x509/x_all.c                               |      1 +
 crypto/external/bsd/openssl/dist/crypto/x509v3/pcy_tree.c                          |      3 +-
 crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.c                           |      3 +-
 crypto/external/bsd/openssl/dist/crypto/x509v3/v3_addr.c                           |      6 +
 crypto/external/bsd/openssl/dist/crypto/x509v3/v3_asid.c                           |     31 +-
 crypto/external/bsd/openssl/dist/crypto/x509v3/v3_ncons.c                          |      1 -
 crypto/external/bsd/openssl/dist/crypto/x509v3/v3_pci.c                            |     28 +-
 crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl                             |      3 +
 crypto/external/bsd/openssl/dist/crypto/x86cpuid.pl                                |      3 +
 crypto/external/bsd/openssl/dist/demos/cms/cms_enc.c                               |      2 +-
 crypto/external/bsd/openssl/dist/demos/cms/cms_ver.c                               |      6 +-
 crypto/external/bsd/openssl/dist/demos/pkcs12/pkread.c                             |      2 +-
 crypto/external/bsd/openssl/dist/doc/apps/smime.pod                                |      8 +-
 crypto/external/bsd/openssl/dist/doc/apps/tsget.pod                                |      8 +-
 crypto/external/bsd/openssl/dist/doc/apps/verify.pod                               |     12 +-
 crypto/external/bsd/openssl/dist/doc/apps/x509.pod                                 |     16 +
 crypto/external/bsd/openssl/dist/doc/crypto/BIO_f_buffer.pod                       |      9 +-
 crypto/external/bsd/openssl/dist/doc/crypto/BIO_s_file.pod                         |      4 +
 crypto/external/bsd/openssl/dist/doc/crypto/BIO_should_retry.pod                   |      2 +-
 crypto/external/bsd/openssl/dist/doc/crypto/EVP_PKEY_verify.pod                    |      2 +-
 crypto/external/bsd/openssl/dist/doc/crypto/EVP_PKEY_verifyrecover.pod             |      2 +-
 crypto/external/bsd/openssl/dist/doc/crypto/OPENSSL_ia32cap.pod                    |     41 +-
 crypto/external/bsd/openssl/dist/doc/crypto/X509_STORE_set_verify_cb_func.pod      |      2 +-
 crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_options.pod                   |    110 +-
 crypto/external/bsd/openssl/dist/doc/ssl/SSL_library_init.pod                      |     16 +-
 crypto/external/bsd/openssl/dist/e_os.h                                            |      1 -
 crypto/external/bsd/openssl/dist/e_os2.h                                           |      6 -
 crypto/external/bsd/openssl/dist/engines/Makefile                                  |      4 +-
 crypto/external/bsd/openssl/dist/engines/alpha.opt                                 |      1 +
 crypto/external/bsd/openssl/dist/engines/ccgost/Makefile                           |     10 +-
 crypto/external/bsd/openssl/dist/engines/ccgost/gost2001.c                         |      3 +
 crypto/external/bsd/openssl/dist/engines/ccgost/gost_ameth.c                       |      6 +-
 crypto/external/bsd/openssl/dist/engines/ccgost/gost_crypt.c                       |     10 +-
 crypto/external/bsd/openssl/dist/engines/e_aep.c                                   |      8 +-
 crypto/external/bsd/openssl/dist/engines/e_capi.c                                  |     34 +-
 crypto/external/bsd/openssl/dist/engines/e_capi_err.c                              |      2 +-
 crypto/external/bsd/openssl/dist/engines/e_chil.c                                  |     67 +-
 crypto/external/bsd/openssl/dist/engines/e_cswift.c                                |      2 -
 crypto/external/bsd/openssl/dist/engines/e_gmp.c                                   |      2 +
 crypto/external/bsd/openssl/dist/engines/e_padlock.c                               |    148 +-
 crypto/external/bsd/openssl/dist/engines/e_sureware.c                              |     15 +-
 crypto/external/bsd/openssl/dist/engines/e_ubsec.c                                 |      8 +-
 crypto/external/bsd/openssl/dist/engines/ia64.opt                                  |      1 +
 crypto/external/bsd/openssl/dist/engines/makeengines.com                           |    359 +-
 crypto/external/bsd/openssl/dist/install.com                                       |    217 +-
 crypto/external/bsd/openssl/dist/makevms.com                                       |    788 +-
 crypto/external/bsd/openssl/dist/ms/README                                         |      2 +-
 crypto/external/bsd/openssl/dist/ms/bcb4.bat                                       |     12 +-
 crypto/external/bsd/openssl/dist/ms/do_nt.bat                                      |     14 +-
 crypto/external/bsd/openssl/dist/ms/do_win64a.bat                                  |     18 +-
 crypto/external/bsd/openssl/dist/ms/do_win64i.bat                                  |     18 +-
 crypto/external/bsd/openssl/dist/ms/mingw32.bat                                    |    180 +-
 crypto/external/bsd/openssl/dist/ms/mw.bat                                         |     52 +-
 crypto/external/bsd/openssl/dist/ms/tenc.bat                                       |     28 +-
 crypto/external/bsd/openssl/dist/ms/tencce.bat                                     |     38 +-
 crypto/external/bsd/openssl/dist/ms/testenc.bat                                    |    188 +-
 crypto/external/bsd/openssl/dist/ms/testencce.bat                                  |    194 +-
 crypto/external/bsd/openssl/dist/ms/testpem.bat                                    |     64 +-
 crypto/external/bsd/openssl/dist/ms/testpemce.bat                                  |     84 +-
 crypto/external/bsd/openssl/dist/ms/testss.bat                                     |    196 +-
 crypto/external/bsd/openssl/dist/ms/testssce.bat                                   |    208 +-
 crypto/external/bsd/openssl/dist/ms/tpem.bat                                       |     12 +-
 crypto/external/bsd/openssl/dist/ms/tpemce.bat                                     |     16 +-
 crypto/external/bsd/openssl/dist/ms/x86asm.bat                                     |    114 +-
 crypto/external/bsd/openssl/dist/openssl.spec                                      |      4 +-
 crypto/external/bsd/openssl/dist/ssl/Makefile                                      |     73 +-
 crypto/external/bsd/openssl/dist/ssl/bio_ssl.c                                     |      4 +
 crypto/external/bsd/openssl/dist/ssl/d1_both.c                                     |    313 +-
 crypto/external/bsd/openssl/dist/ssl/d1_clnt.c                                     |     23 +-
 crypto/external/bsd/openssl/dist/ssl/d1_enc.c                                      |      6 +-
 crypto/external/bsd/openssl/dist/ssl/d1_lib.c                                      |     75 +-
 crypto/external/bsd/openssl/dist/ssl/d1_pkt.c                                      |     52 +-
 crypto/external/bsd/openssl/dist/ssl/d1_srvr.c                                     |     42 +-
 crypto/external/bsd/openssl/dist/ssl/dtls1.h                                       |     18 +-
 crypto/external/bsd/openssl/dist/ssl/install-ssl.com                               |    136 +
 crypto/external/bsd/openssl/dist/ssl/kssl.c                                        |     22 +
 crypto/external/bsd/openssl/dist/ssl/kssl.h                                        |      4 +
 crypto/external/bsd/openssl/dist/ssl/s23_clnt.c                                    |     48 +-
 crypto/external/bsd/openssl/dist/ssl/s23_lib.c                                     |      7 -
 crypto/external/bsd/openssl/dist/ssl/s23_meth.c                                    |      4 +
 crypto/external/bsd/openssl/dist/ssl/s23_srvr.c                                    |     50 +-
 crypto/external/bsd/openssl/dist/ssl/s2_srvr.c                                     |      7 +-
 crypto/external/bsd/openssl/dist/ssl/s3_both.c                                     |      2 +
 crypto/external/bsd/openssl/dist/ssl/s3_clnt.c                                     |    352 +-
 crypto/external/bsd/openssl/dist/ssl/s3_enc.c                                      |     27 +-
 crypto/external/bsd/openssl/dist/ssl/s3_lib.c                                      |    442 +-
 crypto/external/bsd/openssl/dist/ssl/s3_pkt.c                                      |     18 +-
 crypto/external/bsd/openssl/dist/ssl/s3_srvr.c                                     |    425 +-
 crypto/external/bsd/openssl/dist/ssl/ssl-lib.com                                   |    319 +-
 crypto/external/bsd/openssl/dist/ssl/ssl.h                                         |    198 +-
 crypto/external/bsd/openssl/dist/ssl/ssl2.h                                        |      4 +
 crypto/external/bsd/openssl/dist/ssl/ssl3.h                                        |     18 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_algs.c                                    |     12 +
 crypto/external/bsd/openssl/dist/ssl/ssl_asn1.c                                    |     44 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_cert.c                                    |     23 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c                                    |     53 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_err.c                                     |     22 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_lib.c                                     |    136 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_locl.h                                    |     27 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_sess.c                                    |     43 +-
 crypto/external/bsd/openssl/dist/ssl/ssl_stat.c                                    |     19 +
 crypto/external/bsd/openssl/dist/ssl/ssl_txt.c                                     |      6 +
 crypto/external/bsd/openssl/dist/ssl/ssltest.c                                     |    144 +-
 crypto/external/bsd/openssl/dist/ssl/t1_clnt.c                                     |      7 +
 crypto/external/bsd/openssl/dist/ssl/t1_enc.c                                      |    243 +-
 crypto/external/bsd/openssl/dist/ssl/t1_lib.c                                      |    403 +-
 crypto/external/bsd/openssl/dist/ssl/t1_meth.c                                     |      7 +
 crypto/external/bsd/openssl/dist/ssl/t1_reneg.c                                    |     12 +-
 crypto/external/bsd/openssl/dist/ssl/t1_srvr.c                                     |      7 +
 crypto/external/bsd/openssl/dist/ssl/tls1.h                                        |     81 +
 crypto/external/bsd/openssl/dist/ssl/tls_srp.c                                     |    527 +
 crypto/external/bsd/openssl/dist/test/CAtsa.cnf                                    |      5 +-
 crypto/external/bsd/openssl/dist/test/Makefile                                     |     57 +-
 crypto/external/bsd/openssl/dist/test/asn1test.c                                   |     22 +
 crypto/external/bsd/openssl/dist/test/bctest.com                                   |    152 +
 crypto/external/bsd/openssl/dist/test/bntest.com                                   |     76 +
 crypto/external/bsd/openssl/dist/test/clean_test.com                               |     35 +
 crypto/external/bsd/openssl/dist/test/cms-test.pl                                  |    102 +-
 crypto/external/bsd/openssl/dist/test/maketests.com                                |    434 +-
 crypto/external/bsd/openssl/dist/test/tcrl.com                                     |     15 +-
 crypto/external/bsd/openssl/dist/test/testca.com                                   |     10 +-
 crypto/external/bsd/openssl/dist/test/testenc.com                                  |     15 +-
 crypto/external/bsd/openssl/dist/test/testgen.com                                  |     23 +-
 crypto/external/bsd/openssl/dist/test/tests.com                                    |    179 +-
 crypto/external/bsd/openssl/dist/test/testss.com                                   |     19 +-
 crypto/external/bsd/openssl/dist/test/testssl                                      |     10 +
 crypto/external/bsd/openssl/dist/test/testssl.com                                  |     28 +-
 crypto/external/bsd/openssl/dist/test/testtsa.com                                  |    124 +-
 crypto/external/bsd/openssl/dist/test/tpkcs7.com                                   |     15 +-
 crypto/external/bsd/openssl/dist/test/tpkcs7d.com                                  |     15 +-
 crypto/external/bsd/openssl/dist/test/treq.com                                     |     15 +-
 crypto/external/bsd/openssl/dist/test/trsa.com                                     |     15 +-
 crypto/external/bsd/openssl/dist/test/tsid.com                                     |     15 +-
 crypto/external/bsd/openssl/dist/test/tverify.com                                  |     12 +-
 crypto/external/bsd/openssl/dist/test/tx509.com                                    |     15 +-
 crypto/external/bsd/openssl/dist/tools/c_rehash.in                                 |      3 +-
 crypto/external/bsd/openssl/dist/util/copy.pl                                      |     11 +
 crypto/external/bsd/openssl/dist/util/cygwin.sh                                    |     11 +-
 crypto/external/bsd/openssl/dist/util/libeay.num                                   |    103 +-
 crypto/external/bsd/openssl/dist/util/mk1mf.pl                                     |     28 +-
 crypto/external/bsd/openssl/dist/util/mkdef.pl                                     |     25 +-
 crypto/external/bsd/openssl/dist/util/mkerr.pl                                     |      4 +-
 crypto/external/bsd/openssl/dist/util/mkfiles.pl                                   |      1 +
 crypto/external/bsd/openssl/dist/util/mkstack.pl                                   |     20 +-
 crypto/external/bsd/openssl/dist/util/pl/VC-32.pl                                  |     43 +-
 crypto/external/bsd/openssl/dist/util/pod2man.pl                                   |      2 +-
 crypto/external/bsd/openssl/dist/util/ssleay.num                                   |     49 +
 crypto/external/bsd/openssl/lib/libcrypto/Makefile                                 |      8 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile                       |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S                      |      3 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S                    |    761 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S                       |      2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S                     |   2375 ++
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S                       |      2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S                      |     16 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S                      |      2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S                      |      2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S                   |    271 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S                          |      2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile                    |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S                   |    281 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppc.S                       |      2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S                  |      3 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha1-ppc.S                  |      1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S                |      1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile                    |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes-sparcv9.S               |     24 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha1-sparcv9.S              |      1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha1-sparcv9a.S             |   1634 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S            |      3 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile                     |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S                 |    227 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S                |   1838 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S                 |    111 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S                 |     30 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S                |     98 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S              |     29 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S              |    497 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S                  |     35 +-
 crypto/external/bsd/openssl/lib/libcrypto/bn.inc                                   |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/buffer.inc                               |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/cmac.inc                                 |     14 +
 crypto/external/bsd/openssl/lib/libcrypto/cms.inc                                  |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/crypto.inc                               |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/engine.inc                               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/evp.inc                                  |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3                       |     15 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_ssl.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_find_type.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new_CMS.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_push.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_read.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_accept.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_bio.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_connect.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_fd.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_file.3                         |     10 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_mem.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_null.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_socket.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_set_callback.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BIO_should_retry.3                   |      8 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_BLINDING_new.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_new.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_start.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_add.3                             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_add_word.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_bn2bin.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_cmp.3                             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_copy.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_generate_prime.3                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_inverse.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_montgomery.3              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_reciprocal.3              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_new.3                             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_num_bytes.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_rand.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_set_bit.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_swap.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/BN_zero.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add0_cert.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add1_recipient_cert.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_compress.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_decrypt.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_encrypt.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_final.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_RecipientInfos.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_SignerInfos.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_type.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get1_ReceiptRequest.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign_add1_signer.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign_receipt.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_uncompress.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify_receipt.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_free.3                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_load_file.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/CRYPTO_set_ex_data.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_key.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_parameters.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DH_get_ex_new_index.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DH_new.3                             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DH_set_method.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DH_size.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_SIG_new.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_do_sign.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_dup_DH.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_key.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_parameters.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_get_ex_new_index.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_new.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_set_method.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_sign.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/DSA_size.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_GET_LIB.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_clear_error.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_error_string.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_get_error.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_crypto_strings.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_strings.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_print_errors.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_put_error.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_remove_state.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ERR_set_mark.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_BytesToKey.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestInit.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestSignInit.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestVerifyInit.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_EncryptInit.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_OpenInit.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_new.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_cmp.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_decrypt.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_derive.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_encrypt.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_get_default_digest.3        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_keygen.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_new.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_print_private.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_set1_RSA.3                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_sign.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verify.3                    |      8 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verifyrecover.3             |      8 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SealInit.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SignInit.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/EVP_VerifyInit.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/OBJ_nid2obj.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_Applink.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_config.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3                    |     48 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_load_builtin_modules.3       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/OpenSSL_add_all_algorithms.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_CMS_stream.3           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_create.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_parse.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_decrypt.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_encrypt.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign_add_signer.3              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_verify.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RAND_add.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RAND_bytes.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RAND_cleanup.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RAND_egd.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RAND_load_file.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RAND_set_rand_method.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_blinding_on.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_check_key.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_generate_key.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_get_ex_new_index.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_new.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_print.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_private_encrypt.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_public_encrypt.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_set_method.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/RSA_size.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_CMS.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_PKCS7.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_CMS.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_PKCS7.3                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CIPHER_get_name.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_COMP_add_compression_method.3    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_session.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_ctrl.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_flush_sessions.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_free.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get_ex_new_index.3           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get_verify_mode.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_load_verify_locations.3      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_new.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_number.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sessions.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_store.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cipher_list.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_generate_session_id.3    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_info_callback.3          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_max_cert_list.3          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_mode.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_msg_callback.3           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_options.3                |    112 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_psk_client_callback.3    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_id_context.3     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_ssl_version.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_timeout.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tmp_rsa_callback.3       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_verify.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_certificate.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_psk_identity_hint.3      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_free.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_ex_new_index.3       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_time.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_accept.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_alert_type_string.3              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_clear.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_connect.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_do_handshake.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_free.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_SSL_CTX.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ciphers.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_client_CA_list.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_current_cipher.3             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_default_timeout.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_error.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ex_new_index.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_fd.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_cert_chain.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_certificate.3           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_psk_identity.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_rbio.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_session.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_verify_result.3              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_version.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_library_init.3                   |     23 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_load_client_CA_file.3            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_new.3                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_pending.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_read.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_rstate_string.3                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_session_reused.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_bio.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_connect_state.3              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_fd.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_session.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_shutdown.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_verify_result.3              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_shutdown.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_state_string.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_want.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSL_write.3                          |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/SSLeay_version.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_get_index_by_NID.3         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_print_ex.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_get_error.3           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_new.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3      |     15 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_new.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/X509_verify_cert.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/crypto.3                             |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_ASN1_OBJECT.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DHparams.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DSAPublicKey.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_PKCS8PrivateKey.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_RSAPublicKey.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_SSL_SESSION.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_ALGOR.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_CRL.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_NAME.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_REQ.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_SIG.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/des_modes.7                          |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/i2d_CMS_bio_stream.3                 |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/i2d_PKCS7_bio_stream.3               |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/lh_stats.3                           |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/libcrypto.pl                         |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl.1                            |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl.cnf.5                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_CA.pl.1                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_asn1parse.1                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bio.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_blowfish.3                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bn.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bn_internal.3                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_buffer.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ca.1                         |      8 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ciphers.1                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_cms.1                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl.1                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl2pkcs7.1                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_des.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dgst.1                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dh.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dhparam.1                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsa.1                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsa.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsaparam.1                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ec.1                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ecdsa.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ecparam.1                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_enc.1                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_engine.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_err.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_errstr.1                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_evp.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_gendsa.1                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genpkey.1                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genrsa.1                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_hmac.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_lhash.3                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_md5.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_mdc2.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_nseq.1                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ocsp.1                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_passwd.1                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pem.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs12.1                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs7.1                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs8.1                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkey.1                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyparam.1                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyutl.1                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rand.1                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rand.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rc4.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_req.1                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ripemd.3                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsa.1                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsa.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsautl.1                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_client.1                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_server.1                   |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_time.1                     |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_sess_id.1                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_sha.3                        |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_smime.1                      |     14 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_speed.1                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_spkac.1                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_threads.3                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ts.1                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_tsget.1                      |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ui.3                         |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ui_compat.3                  |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_verify.1                     |     18 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_version.1                    |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509.1                       |     20 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509.3                       |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509v3_config.1              |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/man/ssl.3                                |      6 +-
 crypto/external/bsd/openssl/lib/libcrypto/rsa.inc                                  |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/shlib_version                            |      4 +-
 crypto/external/bsd/openssl/lib/libcrypto/srcs.inc                                 |      8 +-
 crypto/external/bsd/openssl/lib/libcrypto/srp.inc                                  |     14 +
 crypto/external/bsd/openssl/lib/libssl/shlib_version                               |      4 +-
 crypto/external/bsd/openssl/lib/libssl/ssl.inc                                     |      3 +-
 distrib/acorn26/instkernel/list                                                    |      9 +-
 distrib/acorn32/ramdisk/list                                                       |      9 +-
 distrib/alpha/instkernel/ramdisk/list                                              |      7 +-
 distrib/amd64/cdroms/Makefile.cdrom                                                |      3 +-
 distrib/amd64/ramdisks/common/list.ramdisk                                         |      7 +-
 distrib/cats/ramdisk/list                                                          |      7 +-
 distrib/emips/instkernel/Makefile                                                  |      5 +-
 distrib/emips/miniroot/Makefile.inc                                                |      6 +-
 distrib/emips/miniroot/list                                                        |      4 +-
 distrib/emips/ramdisk/dot.profile                                                  |      5 +-
 distrib/emips/ramdisk/list                                                         |      9 +-
 distrib/evbarm/instkernel/ramdisk/list                                             |      7 +-
 distrib/evbmips/instkernel/ramdisk/list                                            |      7 +-
 distrib/evbppc/ramdisk/Makefile                                                    |      6 +-
 distrib/evbsh3/Makefile                                                            |      6 +-
 distrib/evbsh3/instkernel/ramdisk/list                                             |     11 +-
 distrib/evbsh3/rom/ramdiskcommon/list                                              |      6 +-
 distrib/i386/cdroms/Makefile.cdrom                                                 |      3 +-
 distrib/i386/ramdisks/common/list.ramdisk                                          |      6 +-
 distrib/landisk/ramdisk/list                                                       |      5 +-
 distrib/mac68k/instkernel/ramdisk/list                                             |      4 +-
 distrib/miniroot/list                                                              |      9 +-
 distrib/mipsco/ramdisk/list                                                        |      7 +-
 distrib/mvme68k/ramdisk/list                                                       |      4 +-
 distrib/ofppc/ramdisks/common/list.ramdisk                                         |      6 +-
 distrib/ofppc/ramdisks/ramdisk/list                                                |      5 +-
 distrib/pmax/ramdisk/list                                                          |      7 +-
 distrib/prep/floppies/ramdisk/list                                                 |      4 +-
 distrib/sets/lists/base/ad.mips64eb                                                |     10 +-
 distrib/sets/lists/base/ad.mips64el                                                |     10 +-
 distrib/sets/lists/base/md.amd64                                                   |      6 +-
 distrib/sets/lists/base/md.sparc64                                                 |      6 +-
 distrib/sets/lists/base/shl.mi                                                     |      8 +-
 distrib/sets/lists/comp/ad.mips64eb                                                |     14 +-
 distrib/sets/lists/comp/ad.mips64el                                                |     14 +-
 distrib/sets/lists/comp/ad.powerpc                                                 |      6 +-
 distrib/sets/lists/comp/md.amd64                                                   |      6 +-
 distrib/sets/lists/comp/md.amigappc                                                |      4 +-
 distrib/sets/lists/comp/md.bebox                                                   |      4 +-
 distrib/sets/lists/comp/md.evbppc                                                  |      4 +-
 distrib/sets/lists/comp/md.ibmnws                                                  |      4 +-
 distrib/sets/lists/comp/md.macppc                                                  |      4 +-
 distrib/sets/lists/comp/md.mvmeppc                                                 |      4 +-
 distrib/sets/lists/comp/md.ofppc                                                   |      4 +-
 distrib/sets/lists/comp/md.prep                                                    |      4 +-
 distrib/sets/lists/comp/md.rs6000                                                  |      4 +-
 distrib/sets/lists/comp/md.sandpoint                                               |      4 +-
 distrib/sets/lists/comp/md.sparc64                                                 |      6 +-
 distrib/sets/lists/comp/mi                                                         |     11 +-
 distrib/sets/lists/comp/shl.mi                                                     |      6 +-
 distrib/sets/lists/man/mi                                                          |     11 +-
 distrib/sets/lists/modules/md.amd64                                                |      6 +-
 distrib/sets/lists/modules/md.evbppc                                               |    283 +
 distrib/sets/lists/modules/md.i386                                                 |      6 +-
 distrib/sets/lists/tests/md.evbppc                                                 |      6 -
 distrib/sets/lists/tests/mi                                                        |     38 +-
 distrib/sgimips/ramdisk/list                                                       |      7 +-
 distrib/shark/instkernel/ramdisk/list                                              |      7 +-
 distrib/sparc64/cdroms/installcd/Makefile                                          |      3 +-
 distrib/sparc64/instfs/list                                                        |      9 +-
 distrib/sun2/miniroot/list                                                         |      5 +-
 distrib/sun3/miniroot/list                                                         |      5 +-
 distrib/utils/sysinst/Makefile.inc                                                 |      4 +-
 distrib/utils/sysinst/arch/hpcarm/md.c                                             |     34 +-
 distrib/utils/sysinst/arch/zaurus/md.c                                             |     34 +-
 distrib/utils/x_dhclient/Makefile                                                  |      4 +-
 distrib/utils/x_gzip/Makefile                                                      |      8 +-
 distrib/vax/ramdisk/list                                                           |      7 +-
 distrib/x68k/floppies/ramdisk/list                                                 |      4 +-
 doc/3RDPARTY                                                                       |     59 +-
 doc/BRANCHES                                                                       |     58 +-
 doc/CHANGES                                                                        |     36 +-
 etc/etc.evbppc/Makefile.inc                                                        |      9 +-
 etc/etc.sandpoint/MAKEDEV.conf                                                     |      7 +-
 etc/rc.d/fccache.in                                                                |      4 +-
 etc/rc.subr                                                                        |     11 +-
 etc/root/dot.cshrc                                                                 |      8 +-
 etc/root/dot.profile                                                               |      6 +-
 external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c                                |      2 +-
 external/bsd/am-utils/bin/amd/Makefile                                             |      4 +-
 external/bsd/am-utils/bin/amq/Makefile                                             |      4 +-
 external/bsd/am-utils/bin/pawd/Makefile                                            |      4 +-
 external/bsd/am-utils/lib/libamu/Makefile                                          |      4 +-
 external/bsd/atf/dist/NEWS                                                         |     29 +
 external/bsd/atf/dist/atf-c++/tests.cpp                                            |     12 +-
 external/bsd/atf/dist/atf-c/defs.h.in                                              |      3 +-
 external/bsd/atf/dist/atf-c/detail/test_helpers.c                                  |      2 +-
 external/bsd/atf/dist/atf-c/detail/tp_main.c                                       |     16 +
 external/bsd/atf/dist/atf-c/detail/user_test.c                                     |     10 +-
 external/bsd/atf/dist/atf-c/tc.h                                                   |     37 +-
 external/bsd/atf/dist/atf-run/atf-run.cpp                                          |     10 +-
 external/bsd/atf/dist/atf-run/integration_test.sh                                  |     65 +-
 external/bsd/atf/dist/atf-run/misc_helpers.cpp                                     |     47 +-
 external/bsd/atf/dist/atf-run/requirements.cpp                                     |     21 +-
 external/bsd/atf/dist/atf-run/requirements_test.cpp                                |     58 +-
 external/bsd/atf/dist/atf-run/test-program.cpp                                     |     19 +-
 external/bsd/atf/dist/atf-run/test_program_test.cpp                                |      5 +-
 external/bsd/atf/dist/atf-run/user_test.cpp                                        |      8 +
 external/bsd/atf/dist/atf-sh/atf-check_test.sh                                     |     13 +
 external/bsd/atf/dist/atf-sh/atf-sh.pc.in                                          |      8 +
 external/bsd/atf/dist/atf-sh/config_test.sh                                        |     12 +-
 external/bsd/atf/dist/atf-sh/libatf-sh.subr                                        |     21 +-
 external/bsd/atf/dist/atf-sh/misc_helpers.sh                                       |      9 +-
 external/bsd/atf/dist/atf-sh/tc_test.sh                                            |     15 +-
 external/bsd/atf/dist/atf-sh/tp_test.sh                                            |      4 +-
 external/bsd/atf/dist/doc/atf-test-case.4                                          |     41 +-
 external/bsd/atf/dist/test-programs/expect_test.sh                                 |     34 +-
 external/bsd/atf/dist/test-programs/meta_data_test.sh                              |     10 +-
 external/bsd/atf/dist/test-programs/result_test.sh                                 |     32 +-
 external/bsd/atf/dist/test-programs/srcdir_test.sh                                 |      6 +-
 external/bsd/atf/lib/libatf-c++/Makefile                                           |      4 +-
 external/bsd/atf/lib/libatf-c/Makefile                                             |      9 +-
 external/bsd/atf/lib/libatf-c/bconfig.h                                            |      6 +-
 external/bsd/atf/prepare-import.sh                                                 |      3 +-
 external/bsd/atf/usr.bin/atf-sh/Makefile                                           |     17 +-
 external/bsd/bind/Makefile.inc                                                     |      4 +-
 external/bsd/bind/bin/named/Makefile                                               |      4 +-
 external/bsd/bind/dist/lib/dns/openssl_link.c                                      |      6 +-
 external/bsd/bind/dist/lib/isc/unix/time.c                                         |      4 +-
 external/bsd/bind/lib/libdns/Makefile                                              |      4 +-
 external/bsd/fetch/lib/Makefile                                                    |      7 +-
 external/bsd/libpcap/dist/scanner.l                                                |      1 +
 external/bsd/llvm/Makefile.inc                                                     |      6 +-
 external/bsd/llvm/bin/tblgen/Makefile                                              |      3 +-
 external/bsd/llvm/lib/libLLVMAnalysis/Makefile                                     |      3 +-
 external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile                                   |      5 +-
 external/bsd/llvm/lib/libLLVMCodeGen/Makefile                                      |      3 +-
 external/bsd/llvm/lib/libLLVMCore/Makefile                                         |      3 +-
 external/bsd/llvm/lib/libLLVMJIT/Makefile                                          |      5 +-
 external/bsd/llvm/lib/libLLVMMC/Makefile                                           |      3 +-
 external/bsd/llvm/lib/libLLVMMCJIT/Makefile                                        |      5 +-
 external/bsd/llvm/lib/libclangFrontend/Makefile                                    |      3 +-
 external/bsd/llvm/lib/libclangTooling/Makefile                                     |     16 -
 external/bsd/llvm/tablegen.mk                                                      |     12 +-
 external/bsd/mdocml/dist/read.c                                                    |      4 +
 external/bsd/ntp/dist/libntp/ntp_lineedit.c                                        |     15 +-
 external/bsd/openldap/dist/libraries/liblutil/detach.c                             |      4 +-
 external/bsd/openresolv/dist/dnsmasq.in                                            |     32 +-
 external/bsd/openresolv/dist/libc.in                                               |     32 +-
 external/bsd/openresolv/dist/named.in                                              |     42 +-
 external/bsd/openresolv/dist/pdnsd.in                                              |    153 +
 external/bsd/openresolv/dist/resolvconf.8.in                                       |     22 +-
 external/bsd/openresolv/dist/resolvconf.conf.5.in                                  |     53 +-
 external/bsd/openresolv/dist/resolvconf.in                                         |     37 +-
 external/bsd/openresolv/dist/unbound.in                                            |     21 +-
 external/bsd/pcc/Makefile.inc                                                      |      9 +-
 external/bsd/pcc/libexec/ccom/Makefile                                             |      3 +-
 external/bsd/pcc/libexec/cpp/Makefile                                              |      3 +-
 external/bsd/pcc/prepare-import.sh                                                 |     17 +-
 external/bsd/pcc/usr.bin/pcc/Makefile                                              |      4 +-
 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c                             |     10 +-
 external/cddl/osnet/sys/sys/vnode.h                                                |      8 +-
 external/gpl2/xcvs/bin/xcvs/Makefile                                               |     13 +-
 external/gpl3/Makefile                                                             |      8 +-
 external/historical/nawk/bin/Makefile                                              |      4 +-
 gnu/dist/gcc4/gcc/config/m68k/fpgnulib.c                                           |    128 +-
 gnu/dist/gcc4/gcc/config/m68k/lb1sf68.asm                                          |    139 +-
 gnu/dist/gcc4/gcc/config/rs6000/netbsd.h                                           |      2 +
 gnu/usr.bin/Makefile                                                               |      4 +-
 gnu/usr.bin/gcc4/arch/powerpc/configargs.h                                         |     11 +-
 gnu/usr.bin/gdb6/bfd/Makefile                                                      |      8 +-
 include/mntopts.h                                                                  |      3 +-
 lib/Makefile                                                                       |     12 +-
 lib/csu/common_elf/Makefile.inc                                                    |      4 +-
 lib/i18n_module/UTF7/Makefile                                                      |      4 +-
 lib/libbz2/Makefile                                                                |      4 +-
 lib/libc/Makefile                                                                  |     11 +-
 lib/libc/arch/alpha/gen/__setjmp14.S                                               |      4 +-
 lib/libc/arch/alpha/gen/flt_rounds.c                                               |     36 +-
 lib/libc/arch/alpha/gen/fpgetround.c                                               |     17 +-
 lib/libc/arch/alpha/gen/fpsetround.c                                               |     32 +-
 lib/libc/arch/i386/gdtoa/gd_qnan.h                                                 |      4 +-
 lib/libc/arch/i386/gen/infinityl.c                                                 |      6 +-
 lib/libc/arch/i386/gen/isnanl.c                                                    |      4 +-
 lib/libc/arch/i386/stdlib/div.S                                                    |      5 +-
 lib/libc/arch/i386/stdlib/ldiv.S                                                   |      5 +-
 lib/libc/arch/x86_64/gdtoa/gd_qnan.h                                               |      4 +-
 lib/libc/arch/x86_64/gen/infinityl.c                                               |      6 +-
 lib/libc/arch/x86_64/gen/isnanl.c                                                  |      4 +-
 lib/libc/compat/sys/compat_getdents.c                                              |      9 +-
 lib/libc/db/btree/bt_split.c                                                       |     23 +-
 lib/libc/db/recno/rec_put.c                                                        |      6 +-
 lib/libc/gdtoa/gdtoaimp.h                                                          |      4 +-
 lib/libc/gdtoa/strtof.c                                                            |      7 +-
 lib/libc/gen/getgrent.c                                                            |      7 +-
 lib/libc/rpc/clnt_dg.c                                                             |     16 +-
 lib/libc/stdlib/jemalloc.3                                                         |     53 +-
 lib/libc/sys/accept.2                                                              |     13 +-
 lib/libc/sys/getpeername.2                                                         |     46 +-
 lib/libc/sys/mount.2                                                               |      8 +-
 lib/libc/time/ctime.3                                                              |      4 +-
 lib/libc/time/localtime.c                                                          |      7 +-
 lib/libcrypt/Makefile                                                              |      4 +-
 lib/libcurses/refresh.c                                                            |      6 +-
 lib/libedit/Makefile                                                               |     11 +-
 lib/libedit/eln.c                                                                  |      6 +-
 lib/libgssapi/Makefile                                                             |      4 +-
 lib/libhdb/Makefile                                                                |      8 +-
 lib/libheimntlm/Makefile                                                           |      4 +-
 lib/libhx509/Makefile                                                              |      8 +-
 lib/libisns/Makefile                                                               |      6 +-
 lib/libkadm5clnt/Makefile                                                          |      4 +-
 lib/libkadm5srv/Makefile                                                           |      4 +-
 lib/libm/Makefile                                                                  |      4 +-
 lib/libm/arch/i387/abi.h                                                           |     10 +-
 lib/libm/arch/i387/s_ceil.S                                                        |      4 +-
 lib/libm/arch/i387/s_ceilf.S                                                       |      4 +-
 lib/libm/arch/i387/s_copysign.S                                                    |     17 +-
 lib/libm/arch/i387/s_copysignf.S                                                   |     14 +-
 lib/libm/arch/i387/s_floor.S                                                       |      4 +-
 lib/libm/arch/i387/s_floorf.S                                                      |      4 +-
 lib/libm/gen/nan.3                                                                 |      4 +-
 lib/libpam/libpam/Makefile                                                         |      7 +-
 lib/libperfuse/ops.c                                                               |     29 +-
 lib/libpuffs/puffs_priv.h                                                          |      4 +-
 lib/libquota/getfsquota.c                                                          |      6 +-
 lib/libquota/getufsquota.c                                                         |      6 +-
 lib/librmt/rmtlib.c                                                                |      6 +-
 lib/libtelnet/Makefile                                                             |      4 +-
 lib/libterminfo/compiled_terms.c                                                   |    157 +-
 libexec/ipropd-master/Makefile                                                     |      4 +-
 libexec/ipropd-slave/Makefile                                                      |      4 +-
 libexec/kadmind/Makefile                                                           |      4 +-
 libexec/kpasswdd/Makefile                                                          |      4 +-
 libexec/ld.elf_so/Makefile                                                         |      9 +-
 regress/sys/kern/ras/ras1/Makefile                                                 |      4 +-
 regress/sys/kern/ras/ras2/Makefile                                                 |      4 +-
 regress/sys/kern/ras/ras3/Makefile                                                 |      4 +-
 rescue/list                                                                        |      4 +-
 sbin/dkctl/Makefile                                                                |      4 +-
 sbin/dump/Makefile                                                                 |      4 +-
 sbin/fsck/fsutil.c                                                                 |     47 +-
 sbin/fsck/fsutil.h                                                                 |      9 +-
 sbin/fsck_ext2fs/Makefile                                                          |      4 +-
 sbin/fsck_ext2fs/extern.h                                                          |      5 +-
 sbin/fsck_ext2fs/main.c                                                            |      5 +-
 sbin/fsck_ext2fs/utilities.c                                                       |     46 +-
 sbin/fsck_ffs/Makefile                                                             |      4 +-
 sbin/fsck_ffs/extern.h                                                             |      7 +-
 sbin/fsck_ffs/main.c                                                               |     12 +-
 sbin/fsck_ffs/pass1.c                                                              |     12 +-
 sbin/fsck_ffs/pass2.c                                                              |     10 +-
 sbin/fsck_ffs/pass6.c                                                              |      4 +-
 sbin/fsck_ffs/quota2.c                                                             |      4 +-
 sbin/fsck_ffs/setup.c                                                              |      6 +-
 sbin/fsck_ffs/utilities.c                                                          |     57 +-
 sbin/fsck_lfs/extern.h                                                             |      5 +-
 sbin/fsck_lfs/lfs.c                                                                |      5 +-
 sbin/fsck_lfs/main.c                                                               |      3 +-
 sbin/fsck_lfs/utilities.c                                                          |     40 +-
 sbin/fsck_msdos/main.c                                                             |     10 +-
 sbin/fsdb/Makefile                                                                 |      4 +-
 sbin/fsdb/fsdb.c                                                                   |      7 +-
 sbin/modstat/main.c                                                                |     21 +-
 sbin/mount/mount.8                                                                 |      8 +-
 sbin/mount_ffs/mount_ffs.c                                                         |      5 +-
 sbin/mount_smbfs/Makefile.inc                                                      |      4 +-
 sbin/newfs/Makefile                                                                |      4 +-
 sbin/newfs_sysvbfs/Makefile                                                        |      4 +-
 sbin/restore/Makefile                                                              |      4 +-
 sbin/route/route.8                                                                 |      5 +-
 share/man/man4/aibs.4                                                              |     76 +-
 share/man/man4/cdce.4                                                              |     12 +-
 share/man/man4/com.4                                                               |     29 +-
 share/man/man4/dm.4                                                                |      4 +-
 share/man/man4/man4.x86/Makefile                                                   |      9 +-
 share/man/man4/man4.x86/apic.4                                                     |    174 +
 share/man/man4/man4.x86/hpet.4                                                     |      7 +-
 share/man/man4/man4.x86/ioapic.4                                                   |    171 -
 share/man/man4/mpls.4                                                              |      4 +-
 share/man/man4/options.4                                                           |     29 +-
 share/man/man4/swsensor.4                                                          |     38 +-
 share/man/man4/swwdog.4                                                            |     12 +-
 share/man/man4/termios.4                                                           |     16 +-
 share/man/man4/xbdback.4                                                           |     36 +-
 share/man/man4/zstty.4                                                             |     34 +-
 share/man/man5/Makefile                                                            |      4 +-
 share/man/man5/floppytab.5                                                         |     55 +
 share/man/man5/login.conf.5                                                        |      6 +-
 share/man/man5/mk.conf.5                                                           |     14 +-
 share/man/man7/symlink.7                                                           |     14 +-
 share/man/man7/tests.7                                                             |     21 +-
 share/man/man9/Makefile                                                            |      4 +-
 share/man/man9/cpu_switchto.9                                                      |     11 +-
 share/man/man9/kmem.9                                                              |      7 +-
 share/man/man9/pool_cache.9                                                        |     15 +-
 share/man/man9/ubc.9                                                               |     14 +-
 share/man/man9/uvm_km.9                                                            |     24 +-
 share/man/man9/uvm_map.9                                                           |    176 +-
 share/man/man9/vnode.9                                                             |     24 +-
 share/man/man9/vnodeops.9                                                          |     31 +-
 share/man/man9/wsfont.9                                                            |     11 +-
 share/misc/acronyms.comp                                                           |     55 +-
 share/mk/bsd.hostprog.mk                                                           |      3 +-
 share/mk/bsd.kmodule.mk                                                            |      4 +-
 share/mk/bsd.own.mk                                                                |     20 +-
 share/mk/bsd.sys.mk                                                                |      6 +-
 share/terminfo/terminfo                                                            |   1183 +-
 sys/Makefile                                                                       |      6 +-
 sys/arch/acorn26/acorn26/fpu.c                                                     |     14 +-
 sys/arch/acorn26/acorn26/machdep.c                                                 |     31 +-
 sys/arch/acorn26/acorn26/mem.c                                                     |    184 -
 sys/arch/acorn26/conf/files.acorn26                                                |      3 +-
 sys/arch/acorn26/include/types.h                                                   |      4 +-
 sys/arch/acorn26/ioc/arckbd.c                                                      |      8 +-
 sys/arch/acorn26/ioc/ioeb.c                                                        |     18 +-
 sys/arch/acorn26/ioc/ioebvar.h                                                     |      4 +-
 sys/arch/acorn26/ioc/latches.c                                                     |      8 +-
 sys/arch/acorn26/ioc/ssn.c                                                         |     16 +-
 sys/arch/acorn32/acorn32/autoconf.c                                                |      6 +-
 sys/arch/acorn32/conf/EB7500ATX                                                    |      6 +-
 sys/arch/acorn32/eb7500atx/rsbus.c                                                 |     23 +-
 sys/arch/acorn32/include/podulebus_machdep.h                                       |      6 +-
 sys/arch/acorn32/mainbus/com_pioc.c                                                |      8 +-
 sys/arch/acorn32/mainbus/fd.c                                                      |     41 +-
 sys/arch/acorn32/mainbus/lpt_pioc.c                                                |      8 +-
 sys/arch/acorn32/mainbus/pioc.c                                                    |     32 +-
 sys/arch/acorn32/mainbus/wdc_pioc.c                                                |      8 +-
 sys/arch/acorn32/podulebus/amps.c                                                  |     18 +-
 sys/arch/acorn32/podulebus/asc.c                                                   |     12 +-
 sys/arch/acorn32/podulebus/cosc.c                                                  |     28 +-
 sys/arch/acorn32/podulebus/csc.c                                                   |     12 +-
 sys/arch/acorn32/podulebus/if_ie.c                                                 |     18 +-
 sys/arch/acorn32/podulebus/netslot.c                                               |      6 +-
 sys/arch/acorn32/podulebus/podulebus.c                                             |     29 +-
 sys/arch/acorn32/podulebus/ptsc.c                                                  |     26 +-
 sys/arch/algor/dev/mainbus.c                                                       |     18 +-
 sys/arch/alpha/Makefile                                                            |      4 +-
 sys/arch/alpha/a12/a12dc.c                                                         |    642 -
 sys/arch/alpha/a12/a12dcreg.h                                                      |    144 -
 sys/arch/alpha/a12/if_xb.c                                                         |    750 -
 sys/arch/alpha/a12/if_xb.h                                                         |     82 -
 sys/arch/alpha/alpha/api_up1000.c                                                  |     22 +-
 sys/arch/alpha/alpha/autoconf.c                                                    |      6 +-
 sys/arch/alpha/alpha/avalon_a12.c                                                  |    239 -
 sys/arch/alpha/alpha/compat_13_machdep.c                                           |      7 +-
 sys/arch/alpha/alpha/compat_16_machdep.c                                           |     16 +-
 sys/arch/alpha/alpha/core_machdep.c                                                |     12 +-
 sys/arch/alpha/alpha/cpu.c                                                         |    129 +-
 sys/arch/alpha/alpha/cpuconf.c                                                     |     12 +-
 sys/arch/alpha/alpha/dec_1000a.c                                                   |     22 +-
 sys/arch/alpha/alpha/dec_2000_300.c                                                |     18 +-
 sys/arch/alpha/alpha/dec_2100_a50.c                                                |     20 +-
 sys/arch/alpha/alpha/dec_2100_a500.c                                               |     22 +-
 sys/arch/alpha/alpha/dec_3000_300.c                                                |     24 +-
 sys/arch/alpha/alpha/dec_3000_500.c                                                |     24 +-
 sys/arch/alpha/alpha/dec_550.c                                                     |     22 +-
 sys/arch/alpha/alpha/dec_6600.c                                                    |     28 +-
 sys/arch/alpha/alpha/dec_alphabook1.c                                              |     20 +-
 sys/arch/alpha/alpha/dec_axppci_33.c                                               |     20 +-
 sys/arch/alpha/alpha/dec_eb164.c                                                   |     22 +-
 sys/arch/alpha/alpha/dec_eb64plus.c                                                |     20 +-
 sys/arch/alpha/alpha/dec_eb66.c                                                    |     20 +-
 sys/arch/alpha/alpha/dec_kn20aa.c                                                  |     20 +-
 sys/arch/alpha/alpha/dec_kn300.c                                                   |     24 +-
 sys/arch/alpha/alpha/dec_kn8ae.c                                                   |     22 +-
 sys/arch/alpha/alpha/disksubr.c                                                    |      6 +-
 sys/arch/alpha/alpha/fp_complete.c                                                 |     75 +-
 sys/arch/alpha/alpha/genassym.cf                                                   |      3 +-
 sys/arch/alpha/alpha/ipifuncs.c                                                    |     71 +-
 sys/arch/alpha/alpha/locore.s                                                      |     12 +-
 sys/arch/alpha/alpha/machdep.c                                                     |    178 +-
 sys/arch/alpha/alpha/mem.c                                                         |    183 -
 sys/arch/alpha/alpha/process_machdep.c                                             |     11 +-
 sys/arch/alpha/alpha/trap.c                                                        |     87 +-
 sys/arch/alpha/alpha/vm_machdep.c                                                  |     78 +-
 sys/arch/alpha/conf/files.alpha                                                    |     32 +-
 sys/arch/alpha/conf/majors.alpha                                                   |      4 +-
 sys/arch/alpha/include/alpha.h                                                     |     31 +-
 sys/arch/alpha/include/cpu.h                                                       |      4 +-
 sys/arch/alpha/include/cpuconf.h                                                   |      4 +-
 sys/arch/alpha/include/cpuvar.h                                                    |      4 +-
 sys/arch/alpha/include/eisa_machdep.h                                              |      4 +-
 sys/arch/alpha/include/intr.h                                                      |     10 +-
 sys/arch/alpha/include/isa_machdep.h                                               |      4 +-
 sys/arch/alpha/include/pcb.h                                                       |      4 +-
 sys/arch/alpha/include/pci_machdep.h                                               |     12 +-
 sys/arch/alpha/include/proc.h                                                      |     25 +-
 sys/arch/alpha/include/types.h                                                     |      9 +-
 sys/arch/alpha/isa/isa_machdep.c                                                   |     14 +-
 sys/arch/alpha/jensenio/com_jensenio.c                                             |      6 +-
 sys/arch/alpha/pci/a12c.c                                                          |    165 -
 sys/arch/alpha/pci/a12c_bus_mem.c                                                  |    516 -
 sys/arch/alpha/pci/a12c_dma.c                                                      |    145 -
 sys/arch/alpha/pci/a12c_pci.c                                                      |    210 -
 sys/arch/alpha/pci/a12creg.h                                                       |    148 -
 sys/arch/alpha/pci/a12cvar.h                                                       |     93 -
 sys/arch/alpha/pci/apecs.c                                                         |     12 +-
 sys/arch/alpha/pci/apecs_pci.c                                                     |     11 +-
 sys/arch/alpha/pci/cia.c                                                           |     30 +-
 sys/arch/alpha/pci/cia_pci.c                                                       |     11 +-
 sys/arch/alpha/pci/ciavar.h                                                        |      4 +-
 sys/arch/alpha/pci/dwlpx.c                                                         |     73 +-
 sys/arch/alpha/pci/dwlpx_dma.c                                                     |      6 +-
 sys/arch/alpha/pci/dwlpx_pci.c                                                     |     10 +-
 sys/arch/alpha/pci/dwlpxvar.h                                                      |      4 +-
 sys/arch/alpha/pci/irongate.c                                                      |     20 +-
 sys/arch/alpha/pci/irongate_pci.c                                                  |      8 +-
 sys/arch/alpha/pci/irongatevar.h                                                   |      4 +-
 sys/arch/alpha/pci/lca.c                                                           |     19 +-
 sys/arch/alpha/pci/lca_pci.c                                                       |     11 +-
 sys/arch/alpha/pci/lcavar.h                                                        |      4 +-
 sys/arch/alpha/pci/mcpcia.c                                                        |     23 +-
 sys/arch/alpha/pci/mcpcia_pci.c                                                    |      8 +-
 sys/arch/alpha/pci/mcpciavar.h                                                     |      4 +-
 sys/arch/alpha/pci/pci_550.c                                                       |     10 +-
 sys/arch/alpha/pci/pci_6600.c                                                      |     10 +-
 sys/arch/alpha/pci/pci_a12.c                                                       |    290 -
 sys/arch/alpha/pci/pci_a12.h                                                       |     44 -
 sys/arch/alpha/pci/pci_eb164.c                                                     |      6 +-
 sys/arch/alpha/pci/pci_up1000.c                                                    |      6 +-
 sys/arch/alpha/pci/sio.c                                                           |     45 +-
 sys/arch/alpha/pci/tsp_pci.c                                                       |      8 +-
 sys/arch/alpha/pci/ttwoga.c                                                        |     34 +-
 sys/arch/alpha/pci/ttwoga_pci.c                                                    |      8 +-
 sys/arch/alpha/sableio/sableio.c                                                   |     21 +-
 sys/arch/alpha/tc/ioasic.c                                                         |     21 +-
 sys/arch/alpha/tc/tc_3000_300.c                                                    |     10 +-
 sys/arch/alpha/tc/tc_3000_500.c                                                    |     14 +-
 sys/arch/alpha/tc/tc_conf.h                                                        |     14 +-
 sys/arch/alpha/tc/tcasic.c                                                         |     14 +-
 sys/arch/alpha/tlsb/gbus.c                                                         |     32 +-
 sys/arch/alpha/tlsb/kftxx.c                                                        |     37 +-
 sys/arch/alpha/tlsb/tlsb.c                                                         |     20 +-
 sys/arch/alpha/tlsb/tlsbmem.c                                                      |     24 +-
 sys/arch/amd64/amd64/cpufunc.S                                                     |      7 +-
 sys/arch/amd64/amd64/genassym.cf                                                   |     14 +-
 sys/arch/amd64/amd64/machdep.c                                                     |     26 +-
 sys/arch/amd64/amd64/mem.c                                                         |    228 -
 sys/arch/amd64/amd64/vector.S                                                      |    164 +-
 sys/arch/amd64/conf/GENERIC                                                        |     11 +-
 sys/arch/amd64/conf/Makefile.amd64                                                 |      5 +-
 sys/arch/amd64/conf/files.amd64                                                    |      3 +-
 sys/arch/amd64/include/stdarg.h                                                    |      7 +-
 sys/arch/amd64/include/types.h                                                     |      3 +-
 sys/arch/amiga/amiga/amiga_init.c                                                  |     21 +-
 sys/arch/amiga/amiga/autoconf.c                                                    |     20 +-
 sys/arch/amiga/amiga/machdep.c                                                     |     12 +-
 sys/arch/amiga/amiga/mem.c                                                         |    210 -
 sys/arch/amiga/conf/files.amiga                                                    |      3 +-
 sys/arch/amiga/dev/a2kbbc.c                                                        |     14 +-
 sys/arch/amiga/dev/a34kbbc.c                                                       |     14 +-
 sys/arch/amiga/dev/clock.c                                                         |     18 +-
 sys/arch/amiga/dev/fd.c                                                            |     53 +-
 sys/arch/amiga/dev/grf.c                                                           |     16 +-
 sys/arch/amiga/dev/gvpbus.c                                                        |     14 +-
 sys/arch/amiga/dev/kbd.c                                                           |     16 +-
 sys/arch/amiga/dev/msc.c                                                           |     14 +-
 sys/arch/amiga/dev/toccata.c                                                       |     23 +-
 sys/arch/amiga/dev/zbus.c                                                          |     16 +-
 sys/arch/amiga/include/types.h                                                     |      3 +-
 sys/arch/amiga/stand/bootblock/txlt/txlt.l                                         |      4 +-
 sys/arch/amigappc/amigappc/autoconf.c                                              |     20 +-
 sys/arch/amigappc/amigappc/cpu.c                                                   |     14 +-
 sys/arch/amigappc/amigappc/locore.S                                                |      4 +-
 sys/arch/amigappc/amigappc/mainbus.c                                               |     14 +-
 sys/arch/amigappc/amigappc/pic_amiga.c                                             |      6 +-
 sys/arch/amigappc/include/cpu.h                                                    |     16 +-
 sys/arch/amigappc/include/intr.h                                                   |     16 +-
 sys/arch/amigappc/include/param.h                                                  |     14 +-
 sys/arch/amigappc/include/psl.h                                                    |     19 +-
 sys/arch/amigappc/include/vmparam.h                                                |      4 +-
 sys/arch/arm/arm32/arm32_machdep.c                                                 |     13 +-
 sys/arch/arm/arm32/mem.c                                                           |    187 -
 sys/arch/arm/arm32/pmap.c                                                          |     35 +-
 sys/arch/arm/at91/at91aic.c                                                        |      6 +-
 sys/arch/arm/conf/files.arm                                                        |      3 +-
 sys/arch/arm/include/arm32/pmap.h                                                  |      3 +-
 sys/arch/arm/mainbus/cpu_mainbus.c                                                 |     18 +-
 sys/arch/arm/mainbus/mainbus.c                                                     |     24 +-
 sys/arch/arm/marvell/mvsoctmr.c                                                    |     82 +-
 sys/arch/arm/ofw/ofwgencfg_machdep.c                                               |     10 +-
 sys/arch/arm/xscale/pxa2x0.c                                                       |     35 +-
 sys/arch/arm/xscale/pxa2x0_ac97.c                                                  |     52 +-
 sys/arch/arm/xscale/pxa2x0_dmac.c                                                  |     24 +-
 sys/arch/arm/xscale/pxa2x0_gpio.c                                                  |     40 +-
 sys/arch/arm/xscale/pxa2x0_i2c.c                                                   |    165 +-
 sys/arch/arm/xscale/pxa2x0_i2c.h                                                   |     25 +-
 sys/arch/arm/xscale/pxa2x0_intr.c                                                  |     14 +-
 sys/arch/arm/xscale/pxa2x0_udc.c                                                   |     35 +-
 sys/arch/arm/xscale/pxa2x0reg.h                                                    |     17 +-
 sys/arch/atari/atari/autoconf.c                                                    |     57 +-
 sys/arch/atari/atari/machdep.c                                                     |     35 +-
 sys/arch/atari/atari/mem.c                                                         |    182 -
 sys/arch/atari/conf/files.atari                                                    |      3 +-
 sys/arch/atari/dev/atari5380.c                                                     |     11 +-
 sys/arch/atari/dev/clock.c                                                         |     34 +-
 sys/arch/atari/dev/grf.c                                                           |     28 +-
 sys/arch/atari/dev/grfvar.h                                                        |      4 +-
 sys/arch/atari/dev/hdfd.c                                                          |    100 +-
 sys/arch/atari/dev/ite.c                                                           |   1072 +-
 sys/arch/atari/dev/ite_cc.c                                                        |     94 +-
 sys/arch/atari/dev/ite_et.c                                                        |     95 +-
 sys/arch/atari/dev/itevar.h                                                        |      4 +-
 sys/arch/atari/dev/kbd.c                                                           |     20 +-
 sys/arch/atari/dev/ncr5380.c                                                       |     28 +-
 sys/arch/atari/dev/ncr5380reg.h                                                    |      4 +-
 sys/arch/atari/dev/nvram.c                                                         |     35 +-
 sys/arch/atari/dev/nvramvar.h                                                      |      6 +-
 sys/arch/atari/include/types.h                                                     |      4 +-
 sys/arch/atari/isa/isa_machdep.c                                                   |     32 +-
 sys/arch/atari/pci/pci_machdep.c                                                   |     26 +-
 sys/arch/atari/vme/et4000.c                                                        |     22 +-
 sys/arch/atari/vme/leo.c                                                           |     26 +-
 sys/arch/atari/vme/vme.c                                                           |     24 +-
 sys/arch/atari/vme/vme_machdep.c                                                   |     22 +-
 sys/arch/atari/vme/vmevar.h                                                        |      4 +-
 sys/arch/bebox/bebox/autoconf.c                                                    |      6 +-
 sys/arch/bebox/bebox/cpu.c                                                         |     14 +-
 sys/arch/bebox/bebox/locore.S                                                      |      4 +-
 sys/arch/bebox/bebox/machdep.c                                                     |     21 +-
 sys/arch/bebox/bebox/mainbus.c                                                     |     14 +-
 sys/arch/bebox/bebox/pic_bebox.c                                                   |      5 +-
 sys/arch/bebox/include/atomic.h                                                    |      3 -
 sys/arch/bebox/include/cpu.h                                                       |     10 +-
 sys/arch/bebox/include/intr.h                                                      |     12 +-
 sys/arch/bebox/include/param.h                                                     |     24 +-
 sys/arch/bebox/include/vmparam.h                                                   |      7 +-
 sys/arch/bebox/stand/boot/cpu.c                                                    |      3 +-
 sys/arch/cats/pci/pcib.c                                                           |     18 +-
 sys/arch/cesfic/cesfic/autoconf.c                                                  |     23 +-
 sys/arch/cesfic/cesfic/machdep.c                                                   |     12 +-
 sys/arch/cesfic/cesfic/mem.c                                                       |    209 -
 sys/arch/cesfic/conf/files.cesfic                                                  |      3 +-
 sys/arch/emips/conf/Makefile.emips.inc                                             |      5 -
 sys/arch/emips/ebus/ace_ebus.c                                                     |   2019 +-
 sys/arch/emips/ebus/clock_ebus.c                                                   |    284 +-
 sys/arch/emips/ebus/dz_ebus.c                                                      |    451 +-
 sys/arch/emips/ebus/ebus.c                                                         |     61 +-
 sys/arch/emips/ebus/ebus_emips.c                                                   |     45 +-
 sys/arch/emips/ebus/ebusvar.h                                                      |     25 +-
 sys/arch/emips/ebus/flash_ebus.c                                                   |     12 +-
 sys/arch/emips/ebus/gpio_ebus.c                                                    |     69 +-
 sys/arch/emips/ebus/icap_ebus.c                                                    |      8 +-
 sys/arch/emips/ebus/if_le_ebus.c                                                   |    898 +-
 sys/arch/emips/emips/autoconf.c                                                    |     97 +-
 sys/arch/emips/emips/cons.h                                                        |      9 +-
 sys/arch/emips/emips/interrupt.c                                                   |     35 +-
 sys/arch/emips/emips/machdep.c                                                     |      7 +-
 sys/arch/emips/emips/mainbus.c                                                     |     17 +-
 sys/arch/emips/emips/promcall.c                                                    |    103 +-
 sys/arch/emips/include/intr.h                                                      |      4 +-
 sys/arch/emips/include/types.h                                                     |      4 +-
 sys/arch/evbarm/adi_brh/obio.c                                                     |     24 +-
 sys/arch/evbarm/conf/BEAGLEBOARD                                                   |      4 +-
 sys/arch/evbarm/conf/SHEEVAPLUG                                                    |      4 +-
 sys/arch/evbarm/conf/TWINTAIL                                                      |      4 +-
 sys/arch/evbarm/gumstix/gxiic.c                                                    |      8 +-
 sys/arch/evbarm/hdl_g/obio.c                                                       |     24 +-
 sys/arch/evbarm/iq80310/obio.c                                                     |     24 +-
 sys/arch/evbarm/iq80321/obio.c                                                     |     24 +-
 sys/arch/evbarm/ixm1200/nappi_nppb.c                                               |     14 +-
 sys/arch/evbmips/conf/files.gdium                                                  |      3 +-
 sys/arch/evbmips/gdium/gdium_dma.c                                                 |     25 +-
 sys/arch/evbmips/gdium/gdium_intr.c                                                |     64 +-
 sys/arch/evbmips/gdium/machdep.c                                                   |     59 +-
 sys/arch/evbmips/malta/dev/gt.c                                                    |     20 +-
 sys/arch/evbmips/malta/dev/mainbus.c                                               |     27 +-
 sys/arch/evbmips/malta/pci/pchb.c                                                  |     18 +-
 sys/arch/evbppc/conf/INSTALL.inc                                                   |     21 +
 sys/arch/evbppc/conf/INSTALL_MPC8536DS                                             |      9 +
 sys/arch/evbppc/conf/INSTALL_MPC8548CDS                                            |      9 +
 sys/arch/evbppc/conf/INSTALL_OPENBLOCKS266                                         |     23 +-
 sys/arch/evbppc/conf/INSTALL_P2020DS                                               |     10 +
 sys/arch/evbppc/conf/INSTALL_P2020RDB                                              |      9 +
 sys/arch/evbppc/conf/INSTALL_PMPPC                                                 |     25 +-
 sys/arch/evbppc/conf/INSTALL_WALNUT                                                |     17 +-
 sys/arch/evbppc/conf/MPC8536DS                                                     |     20 +-
 sys/arch/evbppc/conf/MPC8548CDS                                                    |     19 +-
 sys/arch/evbppc/conf/Makefile.evbppc.inc                                           |     10 +-
 sys/arch/evbppc/conf/OPENBLOCKS266                                                 |      6 +-
 sys/arch/evbppc/conf/P2020DS                                                       |     44 +-
 sys/arch/evbppc/conf/P2020RDB                                                      |     18 +-
 sys/arch/evbppc/conf/RB800                                                         |     20 +-
 sys/arch/evbppc/conf/WALNUT                                                        |      5 +-
 sys/arch/evbppc/conf/files.explora                                                 |      6 +-
 sys/arch/evbppc/conf/files.virtex                                                  |      4 +-
 sys/arch/evbppc/conf/files.walnut                                                  |      3 +-
 sys/arch/evbppc/conf/std.explora                                                   |      4 +-
 sys/arch/evbppc/conf/std.mpc85xx                                                   |      6 +-
 sys/arch/evbppc/conf/std.obs405                                                    |      4 +-
 sys/arch/evbppc/conf/std.virtex                                                    |      4 +-
 sys/arch/evbppc/conf/std.walnut                                                    |      4 +-
 sys/arch/evbppc/ev64260/autoconf.c                                                 |     21 +-
 sys/arch/evbppc/ev64260/ev64260_locore.S                                           |      4 +-
 sys/arch/evbppc/ev64260/machdep.c                                                  |     11 +-
 sys/arch/evbppc/ev64260/mainbus.c                                                  |      8 +-
 sys/arch/evbppc/evbppc/evbppc_machdep.c                                            |      9 +-
 sys/arch/evbppc/explora/autoconf.c                                                 |     11 +-
 sys/arch/evbppc/explora/dev/elb.c                                                  |     46 +-
 sys/arch/evbppc/explora/dev/fb_elb.c                                               |     22 +-
 sys/arch/evbppc/explora/explora_start.S                                            |      5 +-
 sys/arch/evbppc/explora/machdep.c                                                  |    171 +-
 sys/arch/evbppc/include/atomic.h                                                   |      3 -
 sys/arch/evbppc/include/cpu.h                                                      |     22 +-
 sys/arch/evbppc/include/obs405.h                                                   |      4 +-
 sys/arch/evbppc/include/param.h                                                    |      9 +-
 sys/arch/evbppc/include/pmppc_intr.h                                               |      4 +-
 sys/arch/evbppc/include/psl.h                                                      |     27 +-
 sys/arch/evbppc/include/vmparam.h                                                  |     14 +-
 sys/arch/evbppc/mpc85xx/autoconf.c                                                 |      6 +-
 sys/arch/evbppc/mpc85xx/machdep.c                                                  |     67 +-
 sys/arch/evbppc/mpc85xx/mpc85xx_start.S                                            |     40 +-
 sys/arch/evbppc/obs405/dev/century_bios.c                                          |      8 +-
 sys/arch/evbppc/obs405/dev/obsled.c                                                |     23 +-
 sys/arch/evbppc/obs405/obs200_autoconf.c                                           |      7 +-
 sys/arch/evbppc/obs405/obs200_locore.S                                             |      3 +-
 sys/arch/evbppc/obs405/obs200_machdep.c                                            |     51 +-
 sys/arch/evbppc/obs405/obs266_autoconf.c                                           |     12 +-
 sys/arch/evbppc/obs405/obs266_machdep.c                                            |     53 +-
 sys/arch/evbppc/obs405/obs405_autoconf.c                                           |     12 +-
 sys/arch/evbppc/obs405/obs405_machdep.c                                            |     10 +-
 sys/arch/evbppc/obs405/obs600_autoconf.c                                           |     14 +-
 sys/arch/evbppc/obs405/obs600_locore.S                                             |      3 +-
 sys/arch/evbppc/obs405/obs600_machdep.c                                            |     54 +-
 sys/arch/evbppc/obs405/rbus_machdep.c                                              |      7 +-
 sys/arch/evbppc/pmppc/autoconf.c                                                   |      6 +-
 sys/arch/evbppc/pmppc/dev/cpc_mainbus.c                                            |     18 +-
 sys/arch/evbppc/pmppc/dev/flash.c                                                  |     24 +-
 sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c                                          |     14 +-
 sys/arch/evbppc/pmppc/machdep.c                                                    |     25 +-
 sys/arch/evbppc/pmppc/mainbus.c                                                    |     33 +-
 sys/arch/evbppc/pmppc/pmppc_locore.S                                               |      4 +-
 sys/arch/evbppc/virtex/autoconf.c                                                  |     12 +-
 sys/arch/evbppc/virtex/design_gsrd1.c                                              |     14 +-
 sys/arch/evbppc/virtex/design_gsrd2.c                                              |     13 +-
 sys/arch/evbppc/virtex/dev/if_temac.c                                              |    159 +-
 sys/arch/evbppc/virtex/dev/pstwo.c                                                 |     22 +-
 sys/arch/evbppc/virtex/dev/tft_ll.c                                                |     43 +-
 sys/arch/evbppc/virtex/dev/tft_plb.c                                               |     32 +-
 sys/arch/evbppc/virtex/dev/tftvar.h                                                |      6 +-
 sys/arch/evbppc/virtex/dev/xcvbus.c                                                |      8 +-
 sys/arch/evbppc/virtex/dev/xlcom.c                                                 |     36 +-
 sys/arch/evbppc/virtex/machdep.c                                                   |    179 +-
 sys/arch/evbppc/virtex/virtex_start.S                                              |      3 +-
 sys/arch/evbppc/walnut/autoconf.c                                                  |     15 +-
 sys/arch/evbppc/walnut/dev/ds1743.c                                                |     36 +-
 sys/arch/evbppc/walnut/dev/pbus.c                                                  |     21 +-
 sys/arch/evbppc/walnut/machdep.c                                                   |    197 +-
 sys/arch/evbppc/walnut/pci/pchb.c                                                  |     22 +-
 sys/arch/evbppc/walnut/walnut_start.S                                              |      3 +-
 sys/arch/hp300/conf/files.hp300                                                    |      3 +-
 sys/arch/hp300/hp300/machdep.c                                                     |     26 +-
 sys/arch/hp300/hp300/mem.c                                                         |    209 -
 sys/arch/hp300/include/types.h                                                     |      3 +-
 sys/arch/hp700/dev/mem.c                                                           |    132 +-
 sys/arch/hp700/gsc/if_ie_gsc.c                                                     |     13 +-
 sys/arch/hp700/hp700/machdep.c                                                     |     47 +-
 sys/arch/hp700/include/types.h                                                     |      5 +-
 sys/arch/hp700/stand/Makefile.inc                                                  |      4 +-
 sys/arch/hp700/stand/xxboot/Makefile                                               |      6 +-
 sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c                                        |      6 +-
 sys/arch/hpcmips/tx/txioman.c                                                      |     18 +-
 sys/arch/hpcsh/dev/hd64465/hd64465.c                                               |     21 +-
 sys/arch/hppa/hppa/pmap.c                                                          |     87 +-
 sys/arch/hppa/include/pmap.h                                                       |      5 +-
 sys/arch/i386/conf/ALL                                                             |      7 +-
 sys/arch/i386/conf/GENERIC                                                         |     11 +-
 sys/arch/i386/conf/Makefile.i386                                                   |      5 +-
 sys/arch/i386/conf/files.i386                                                      |      3 +-
 sys/arch/i386/i386/genassym.cf                                                     |     14 +-
 sys/arch/i386/i386/i386func.S                                                      |     11 +-
 sys/arch/i386/i386/machdep.c                                                       |     45 +-
 sys/arch/i386/i386/mem.c                                                           |    234 -
 sys/arch/i386/i386/vector.S                                                        |    160 +-
 sys/arch/i386/include/asm.h                                                        |      4 +-
 sys/arch/i386/include/cdefs.h                                                      |      6 +-
 sys/arch/i386/include/frame.h                                                      |     14 +-
 sys/arch/i386/include/types.h                                                      |      3 +-
 sys/arch/i386/isa/npx.c                                                            |     12 +-
 sys/arch/i386/pci/pci_intr_fixup.c                                                 |      6 +-
 sys/arch/i386/pci/viapcib.c                                                        |     29 +-
 sys/arch/i386/pnpbios/wss_pnpbios.c                                                |      7 +-
 sys/arch/i386/pnpbios/ym_pnpbios.c                                                 |      8 +-
 sys/arch/i386/stand/Makefile.booters                                               |      8 +-
 sys/arch/i386/stand/Makefile.inc                                                   |      8 +-
 sys/arch/i386/stand/boot/Makefile.boot                                             |     10 +-
 sys/arch/i386/stand/bootxx/Makefile.bootxx                                         |     12 +-
 sys/arch/i386/stand/lib/Makefile                                                   |      5 +-
 sys/arch/i386/stand/lib/bios_disk.S                                                |    121 +-
 sys/arch/i386/stand/lib/biosgetrtc.S                                               |     26 +-
 sys/arch/i386/stand/lib/biosgetsystime.S                                           |     18 +-
 sys/arch/i386/stand/lib/biosmem.S                                                  |     36 +-
 sys/arch/i386/stand/lib/biosmemps2.S                                               |     24 +-
 sys/arch/i386/stand/lib/biosreboot.S                                               |     16 +-
 sys/arch/i386/stand/lib/conio.S                                                    |     79 +-
 sys/arch/i386/stand/lib/cpufunc.S                                                  |      6 +-
 sys/arch/i386/stand/lib/dosfile.c                                                  |     14 +-
 sys/arch/i386/stand/lib/getextmemx.c                                               |      6 +-
 sys/arch/i386/stand/lib/libi386.h                                                  |     20 +-
 sys/arch/i386/stand/lib/pcio.c                                                     |      6 +-
 sys/arch/i386/stand/lib/putstr32.S                                                 |     69 +
 sys/arch/i386/stand/libsa/nfs.c                                                    |     14 +-
 sys/arch/i386/stand/netboot/ne2000_isa/Makefile                                    |      4 +-
 sys/arch/ia64/acpi/acpi_machdep.c                                                  |     24 +-
 sys/arch/ia64/conf/files.ia64                                                      |      3 +-
 sys/arch/ia64/ia64/machdep.c                                                       |     10 +-
 sys/arch/ia64/ia64/mem.c                                                           |     50 -
 sys/arch/ia64/include/acpi_machdep.h                                               |      8 +-
 sys/arch/ibmnws/ibmnws/autoconf.c                                                  |      4 +-
 sys/arch/ibmnws/ibmnws/locore.S                                                    |      4 +-
 sys/arch/ibmnws/ibmnws/machdep.c                                                   |     25 +-
 sys/arch/ibmnws/include/atomic.h                                                   |      3 -
 sys/arch/ibmnws/include/cpu.h                                                      |     10 +-
 sys/arch/ibmnws/include/intr.h                                                     |     10 +-
 sys/arch/ibmnws/include/param.h                                                    |     14 +-
 sys/arch/ibmnws/include/vmparam.h                                                  |      7 +-
 sys/arch/iyonix/iyonix/obio.c                                                      |     24 +-
 sys/arch/luna68k/conf/files.luna68k                                                |      3 +-
 sys/arch/luna68k/luna68k/machdep.c                                                 |     15 +-
 sys/arch/luna68k/luna68k/mainbus.c                                                 |     14 +-
 sys/arch/luna68k/luna68k/mem.c                                                     |    199 -
 sys/arch/m68k/include/pmap_motorola.h                                              |      6 +-
 sys/arch/m68k/m68k/pmap_motorola.c                                                 |     36 +-
 sys/arch/mac68k/conf/files.mac68k                                                  |      3 +-
 sys/arch/mac68k/dev/adb.c                                                          |     22 +-
 sys/arch/mac68k/mac68k/machdep.c                                                   |     13 +-
 sys/arch/mac68k/mac68k/mainbus.c                                                   |     18 +-
 sys/arch/mac68k/mac68k/mem.c                                                       |    198 -
 sys/arch/mac68k/obio/obio.c                                                        |     24 +-
 sys/arch/macppc/conf/Makefile.macppc                                               |    130 -
 sys/arch/macppc/conf/Makefile.macppc.inc                                           |      8 +
 sys/arch/macppc/dev/abtn.c                                                         |     14 +-
 sys/arch/macppc/dev/adb.c                                                          |     14 +-
 sys/arch/macppc/dev/aed.c                                                          |     14 +-
 sys/arch/macppc/dev/akbd.c                                                         |     14 +-
 sys/arch/macppc/dev/ams.c                                                          |     14 +-
 sys/arch/macppc/dev/apm.c                                                          |     12 +-
 sys/arch/macppc/dev/battery.c                                                      |     31 +-
 sys/arch/macppc/dev/cuda.c                                                         |     22 +-
 sys/arch/macppc/dev/gpio.c                                                         |     20 +-
 sys/arch/macppc/dev/if_bm.c                                                        |     72 +-
 sys/arch/macppc/dev/if_gm.c                                                        |     62 +-
 sys/arch/macppc/dev/if_mc.c                                                        |     14 +-
 sys/arch/macppc/dev/if_wi_obio.c                                                   |     10 +-
 sys/arch/macppc/dev/ki2c.c                                                         |     12 +-
 sys/arch/macppc/dev/mediabay.c                                                     |     18 +-
 sys/arch/macppc/dev/nvram.c                                                        |     14 +-
 sys/arch/macppc/dev/obio.c                                                         |     14 +-
 sys/arch/macppc/dev/ofb.c                                                          |     14 +-
 sys/arch/macppc/dev/ofcons.c                                                       |     12 +-
 sys/arch/macppc/dev/pmu.c                                                          |     60 +-
 sys/arch/macppc/dev/smartbat.c                                                     |     14 +-
 sys/arch/macppc/dev/uni-n.c                                                        |     14 +-
 sys/arch/macppc/include/atomic.h                                                   |      3 -
 sys/arch/macppc/include/autoconf.h                                                 |      4 +-
 sys/arch/macppc/include/cpu.h                                                      |     10 +-
 sys/arch/macppc/include/intr.h                                                     |     13 +-
 sys/arch/macppc/include/param.h                                                    |     28 +-
 sys/arch/macppc/include/pci_machdep.h                                              |      4 +-
 sys/arch/macppc/include/vmparam.h                                                  |      4 +-
 sys/arch/macppc/macppc/cpu.c                                                       |     23 +-
 sys/arch/macppc/macppc/ipi_hammerhead.c                                            |     32 +-
 sys/arch/macppc/macppc/locore.S                                                    |      4 +-
 sys/arch/macppc/macppc/machdep.c                                                   |     39 +-
 sys/arch/macppc/macppc/mainbus.c                                                   |     14 +-
 sys/arch/macppc/macppc/memory.c                                                    |     14 +-
 sys/arch/macppc/macppc/pic_heathrow.c                                              |      8 +-
 sys/arch/macppc/macppc/pic_ohare.c                                                 |     14 +-
 sys/arch/macppc/pci/bandit.c                                                       |     14 +-
 sys/arch/macppc/pci/grackle.c                                                      |     14 +-
 sys/arch/macppc/pci/pci_machdep.c                                                  |      6 +-
 sys/arch/macppc/pci/u3.c                                                           |     10 +-
 sys/arch/macppc/pci/uninorth.c                                                     |     14 +-
 sys/arch/mips/alchemy/dev/auaudio.c                                                |     14 +-
 sys/arch/mips/alchemy/dev/auspi.c                                                  |      8 +-
 sys/arch/mips/atheros/dev/arspi.c                                                  |      8 +-
 sys/arch/mips/conf/files.mips                                                      |      3 +-
 sys/arch/mips/include/types.h                                                      |      6 +-
 sys/arch/mips/mips/cache.c                                                         |     50 +-
 sys/arch/mips/mips/cache_ls2.c                                                     |     37 +-
 sys/arch/mips/mips/core_machdep.c                                                  |     10 +-
 sys/arch/mips/mips/mem.c                                                           |    188 -
 sys/arch/mips/mips/mips_machdep.c                                                  |     69 +-
 sys/arch/mips/mips/pmap.c                                                          |      8 +-
 sys/arch/mips/mips/vm_machdep.c                                                    |     12 +-
 sys/arch/mipsco/obio/obio.c                                                        |     24 +-
 sys/arch/mmeye/mmeye/mainbus.c                                                     |     10 +-
 sys/arch/mvme68k/conf/files.mvme68k                                                |      3 +-
 sys/arch/mvme68k/dev/mainbus.c                                                     |     14 +-
 sys/arch/mvme68k/mvme68k/machdep.c                                                 |     12 +-
 sys/arch/mvme68k/mvme68k/mem.c                                                     |    203 -
 sys/arch/mvmeppc/include/atomic.h                                                  |      3 -
 sys/arch/mvmeppc/include/cpu.h                                                     |     18 +-
 sys/arch/mvmeppc/include/intr.h                                                    |     14 +-
 sys/arch/mvmeppc/include/param.h                                                   |     14 +-
 sys/arch/mvmeppc/include/platform.h                                                |      4 +-
 sys/arch/mvmeppc/include/vmparam.h                                                 |      6 +-
 sys/arch/mvmeppc/mvmeppc/autoconf.c                                                |      8 +-
 sys/arch/mvmeppc/mvmeppc/cpu.c                                                     |     14 +-
 sys/arch/mvmeppc/mvmeppc/locore.S                                                  |      4 +-
 sys/arch/mvmeppc/mvmeppc/machdep.c                                                 |     16 +-
 sys/arch/mvmeppc/mvmeppc/mainbus.c                                                 |     14 +-
 sys/arch/mvmeppc/mvmeppc/platform_160x.c                                           |      8 +-
 sys/arch/netwinder/pci/pcib.c                                                      |     18 +-
 sys/arch/news68k/conf/files.news68k                                                |      3 +-
 sys/arch/news68k/include/types.h                                                   |      3 +-
 sys/arch/news68k/news68k/machdep.c                                                 |     20 +-
 sys/arch/news68k/news68k/mem.c                                                     |    204 -
 sys/arch/next68k/conf/files.next68k                                                |      3 +-
 sys/arch/next68k/dev/intio.c                                                       |     24 +-
 sys/arch/next68k/next68k/machdep.c                                                 |     13 +-
 sys/arch/next68k/next68k/mainbus.c                                                 |     18 +-
 sys/arch/next68k/next68k/mem.c                                                     |    208 -
 sys/arch/ofppc/include/atomic.h                                                    |      3 -
 sys/arch/ofppc/include/autoconf.h                                                  |      4 +-
 sys/arch/ofppc/include/cpu.h                                                       |     10 +-
 sys/arch/ofppc/include/intr.h                                                      |     13 +-
 sys/arch/ofppc/include/param.h                                                     |     11 +-
 sys/arch/ofppc/include/vmparam.h                                                   |      8 +-
 sys/arch/ofppc/ofppc/cpu.c                                                         |     21 +-
 sys/arch/ofppc/ofppc/locore.S                                                      |      4 +-
 sys/arch/ofppc/ofppc/machdep.c                                                     |      6 +-
 sys/arch/ofppc/ofppc/mainbus.c                                                     |     14 +-
 sys/arch/ofppc/pci/ofwpci.c                                                        |     20 +-
 sys/arch/pmax/ibus/mcclock_ibus.c                                                  |      7 +-
 sys/arch/pmax/ibus/pm.c                                                            |     19 +-
 sys/arch/pmax/ibus/sii.c                                                           |     87 +-
 sys/arch/pmax/ibus/sii_ds.c                                                        |      7 +-
 sys/arch/pmax/ibus/siivar.h                                                        |      4 +-
 sys/arch/pmax/pmax/clock.c                                                         |     10 +-
 sys/arch/pmax/tc/dt.c                                                              |     36 +-
 sys/arch/pmax/tc/dtkbd.c                                                           |     29 +-
 sys/arch/pmax/tc/dtms.c                                                            |     27 +-
 sys/arch/pmax/tc/dtvar.h                                                           |      8 +-
 sys/arch/pmax/tc/ioasic.c                                                          |     24 +-
 sys/arch/pmax/tc/mcclock_ioasic.c                                                  |     19 +-
 sys/arch/pmax/tc/tcbus.c                                                           |     22 +-
 sys/arch/powerpc/booke/booke_autoconf.c                                            |      6 +-
 sys/arch/powerpc/booke/booke_cache.c                                               |     49 +-
 sys/arch/powerpc/booke/booke_machdep.c                                             |     86 +-
 sys/arch/powerpc/booke/booke_pmap.c                                                |     20 +-
 sys/arch/powerpc/booke/booke_stubs.c                                               |    109 +-
 sys/arch/powerpc/booke/copyin.c                                                    |      6 +-
 sys/arch/powerpc/booke/copyout.c                                                   |      8 +-
 sys/arch/powerpc/booke/dev/pq3ehci.c                                               |      7 +-
 sys/arch/powerpc/booke/dev/pq3etsec.c                                              |     17 +-
 sys/arch/powerpc/booke/e500_intr.c                                                 |    248 +-
 sys/arch/powerpc/booke/e500_mpsubr.S                                               |    113 +
 sys/arch/powerpc/booke/e500_tlb.c                                                  |     36 +-
 sys/arch/powerpc/booke/genassym.cf                                                 |    193 +-
 sys/arch/powerpc/booke/pci/pq3pci.c                                                |     14 +-
 sys/arch/powerpc/booke/spe.c                                                       |      9 +-
 sys/arch/powerpc/booke/trap.c                                                      |     70 +-
 sys/arch/powerpc/booke/trap_subr.S                                                 |    169 +-
 sys/arch/powerpc/conf/Makefile.powerpc                                             |      9 +-
 sys/arch/powerpc/conf/files.ibm4xx                                                 |      5 +-
 sys/arch/powerpc/conf/files.powerpc                                                |      9 +-
 sys/arch/powerpc/ibm4xx/board_prop.c                                               |      7 +-
 sys/arch/powerpc/ibm4xx/clock.c                                                    |     20 +-
 sys/arch/powerpc/ibm4xx/cpu.c                                                      |    378 +-
 sys/arch/powerpc/ibm4xx/dev/com_opb.c                                              |      7 +-
 sys/arch/powerpc/ibm4xx/dev/comopbvar.h                                            |      4 +-
 sys/arch/powerpc/ibm4xx/dev/ecc_plb.c                                              |     38 +-
 sys/arch/powerpc/ibm4xx/dev/exb.c                                                  |     10 +-
 sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c                                            |     45 +-
 sys/arch/powerpc/ibm4xx/dev/gpio_opb.c                                             |    154 +-
 sys/arch/powerpc/ibm4xx/dev/ibm405gp.c                                             |      6 +-
 sys/arch/powerpc/ibm4xx/dev/if_emac.c                                              |     30 +-
 sys/arch/powerpc/ibm4xx/dev/mal.c                                                  |     12 +-
 sys/arch/powerpc/ibm4xx/dev/opb.c                                                  |     11 +-
 sys/arch/powerpc/ibm4xx/dev/opbvar.h                                               |      4 +-
 sys/arch/powerpc/ibm4xx/dev/plb.c                                                  |     25 +-
 sys/arch/powerpc/ibm4xx/dev/plbvar.h                                               |      4 +-
 sys/arch/powerpc/ibm4xx/dev/wdog.c                                                 |     43 +-
 sys/arch/powerpc/ibm4xx/genassym.cf                                                |    167 +-
 sys/arch/powerpc/ibm4xx/ibm40x_machdep.c                                           |      7 +-
 sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c                                          |     14 +-
 sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c                                           |    204 +-
 sys/arch/powerpc/ibm4xx/intr.c                                                     |    891 -
 sys/arch/powerpc/ibm4xx/openbios/locore.S                                          |      3 +-
 sys/arch/powerpc/ibm4xx/openbios/openbios.c                                        |      8 +-
 sys/arch/powerpc/ibm4xx/pci/pchb.c                                                 |     18 +-
 sys/arch/powerpc/ibm4xx/pci/pci_machdep.c                                          |     11 +-
 sys/arch/powerpc/ibm4xx/pic_uic.c                                                  |    380 +
 sys/arch/powerpc/ibm4xx/pmap.c                                                     |     25 +-
 sys/arch/powerpc/ibm4xx/trap.c                                                     |     51 +-
 sys/arch/powerpc/ibm4xx/trap_subr.S                                                |     37 +-
 sys/arch/powerpc/include/Makefile                                                  |      6 +-
 sys/arch/powerpc/include/asm.h                                                     |     11 +-
 sys/arch/powerpc/include/atomic.h                                                  |    129 -
 sys/arch/powerpc/include/booke/cpuvar.h                                            |      9 +-
 sys/arch/powerpc/include/booke/e500reg.h                                           |     10 +-
 sys/arch/powerpc/include/booke/e500var.h                                           |     22 +-
 sys/arch/powerpc/include/booke/etsecreg.h                                          |     12 +-
 sys/arch/powerpc/include/booke/intr.h                                              |     47 +-
 sys/arch/powerpc/include/booke/pmap.h                                              |     15 +-
 sys/arch/powerpc/include/booke/pte.h                                               |     26 +-
 sys/arch/powerpc/include/booke/spr.h                                               |      4 +-
 sys/arch/powerpc/include/booke/vmparam.h                                           |     89 +-
 sys/arch/powerpc/include/bus.h                                                     |      4 +-
 sys/arch/powerpc/include/cpu.h                                                     |    268 +-
 sys/arch/powerpc/include/cpuset.h                                                  |     57 +
 sys/arch/powerpc/include/db_machdep.h                                              |     20 +-
 sys/arch/powerpc/include/frame.h                                                   |      4 +-
 sys/arch/powerpc/include/ibm4xx/cpu.h                                              |     50 +-
 sys/arch/powerpc/include/ibm4xx/ibm4xx_intr.h                                      |     96 -
 sys/arch/powerpc/include/ibm4xx/pci_machdep.h                                      |      4 +-
 sys/arch/powerpc/include/ibm4xx/pmap.h                                             |     13 +-
 sys/arch/powerpc/include/ibm4xx/spr.h                                              |     26 +-
 sys/arch/powerpc/include/ibm4xx/vmparam.h                                          |      6 +-
 sys/arch/powerpc/include/intr.h                                                    |     73 +-
 sys/arch/powerpc/include/isa_machdep.h                                             |      7 +-
 sys/arch/powerpc/include/netbsd32_machdep.h                                        |      4 +-
 sys/arch/powerpc/include/oea/bat.h                                                 |      4 +-
 sys/arch/powerpc/include/oea/pmap.h                                                |     27 +-
 sys/arch/powerpc/include/oea/vmparam.h                                             |     21 -
 sys/arch/powerpc/include/param.h                                                   |      9 +-
 sys/arch/powerpc/include/pmap.h                                                    |     47 +-
 sys/arch/powerpc/include/proc.h                                                    |      3 +-
 sys/arch/powerpc/include/psl.h                                                     |     29 +-
 sys/arch/powerpc/include/softint.h                                                 |     77 +
 sys/arch/powerpc/include/types.h                                                   |      7 +-
 sys/arch/powerpc/include/userret.h                                                 |      3 +-
 sys/arch/powerpc/include/vmparam.h                                                 |     90 +
 sys/arch/powerpc/isa/isa_machdep_common.c                                          |      8 +-
 sys/arch/powerpc/marvell/marvell_intr.h                                            |     94 +-
 sys/arch/powerpc/marvell/pic_discovery.c                                           |      9 +-
 sys/arch/powerpc/oea/altivec.c                                                     |      9 +-
 sys/arch/powerpc/oea/cpu_subr.c                                                    |     80 +-
 sys/arch/powerpc/oea/genassym.cf                                                   |    192 +-
 sys/arch/powerpc/oea/oea_machdep.c                                                 |     21 +-
 sys/arch/powerpc/oea/ofw_autoconf.c                                                |     10 +-
 sys/arch/powerpc/oea/ofw_subr.S                                                    |     88 +-
 sys/arch/powerpc/oea/ofwoea_machdep.c                                              |      9 +-
 sys/arch/powerpc/oea/pmap.c                                                        |     11 +-
 sys/arch/powerpc/oea/pmap_kernel.c                                                 |     17 +-
 sys/arch/powerpc/pci/pchb.c                                                        |     42 +-
 sys/arch/powerpc/pci/pci_machdep_common.c                                          |     18 +-
 sys/arch/powerpc/pci/pci_machdep_ofw.c                                             |      9 +-
 sys/arch/powerpc/pci/pcib.c                                                        |      9 +-
 sys/arch/powerpc/pci/pciconf_indirect.c                                            |     13 +-
 sys/arch/powerpc/pci/pciconf_ofmethod.c                                            |     14 +-
 sys/arch/powerpc/pic/files.pic                                                     |      4 +-
 sys/arch/powerpc/pic/i8259_common.c                                                |      8 +-
 sys/arch/powerpc/pic/intr.c                                                        |    594 +-
 sys/arch/powerpc/pic/ipi.c                                                         |     53 +-
 sys/arch/powerpc/pic/ipi_openpic.c                                                 |     50 +-
 sys/arch/powerpc/pic/ipivar.h                                                      |     28 +-
 sys/arch/powerpc/pic/openpic_common.c                                              |     11 +-
 sys/arch/powerpc/pic/pic_distopenpic.c                                             |     11 +-
 sys/arch/powerpc/pic/pic_i8259.c                                                   |      8 +-
 sys/arch/powerpc/pic/pic_mpcsoc.c                                                  |      6 +-
 sys/arch/powerpc/pic/pic_openpic.c                                                 |      6 +-
 sys/arch/powerpc/pic/pic_prepivr.c                                                 |      8 +-
 sys/arch/powerpc/pic/pic_soft.c                                                    |    152 -
 sys/arch/powerpc/pic/picvar.h                                                      |      8 +-
 sys/arch/powerpc/powerpc/bus_dma.c                                                 |     42 +-
 sys/arch/powerpc/powerpc/bus_space.c                                               |     12 +-
 sys/arch/powerpc/powerpc/clock.c                                                   |      7 +-
 sys/arch/powerpc/powerpc/compat_13_machdep.c                                       |      6 +-
 sys/arch/powerpc/powerpc/compat_16_machdep.c                                       |      5 +-
 sys/arch/powerpc/powerpc/core_machdep.c                                            |     11 +-
 sys/arch/powerpc/powerpc/db_interface.c                                            |     14 +-
 sys/arch/powerpc/powerpc/db_trace.c                                                |     14 +-
 sys/arch/powerpc/powerpc/fixup.c                                                   |     13 +-
 sys/arch/powerpc/powerpc/fpu.c                                                     |      9 +-
 sys/arch/powerpc/powerpc/genassym.cf                                               |    231 +
 sys/arch/powerpc/powerpc/intr_stubs.c                                              |    211 +
 sys/arch/powerpc/powerpc/kobj_machdep.c                                            |     88 +-
 sys/arch/powerpc/powerpc/lock_stubs.S                                              |     22 +-
 sys/arch/powerpc/powerpc/locore_subr.S                                             |     30 +-
 sys/arch/powerpc/powerpc/mem.c                                                     |    137 -
 sys/arch/powerpc/powerpc/ofwreal.S                                                 |      8 +-
 sys/arch/powerpc/powerpc/powerpc_machdep.c                                         |    219 +-
 sys/arch/powerpc/powerpc/process_machdep.c                                         |     29 +-
 sys/arch/powerpc/powerpc/rtas.c                                                    |     36 +-
 sys/arch/powerpc/powerpc/setfault.S                                                |      3 +-
 sys/arch/powerpc/powerpc/sig_machdep.c                                             |      5 +-
 sys/arch/powerpc/powerpc/softint_machdep.c                                         |    125 +
 sys/arch/powerpc/powerpc/trap.c                                                    |     59 +-
 sys/arch/powerpc/powerpc/trap_subr.S                                               |     62 +-
 sys/arch/powerpc/powerpc/vm_machdep.c                                              |     87 +-
 sys/arch/prep/eisa/eisa_machdep.c                                                  |      6 +-
 sys/arch/prep/include/atomic.h                                                     |      3 -
 sys/arch/prep/include/cpu.h                                                        |     10 +-
 sys/arch/prep/include/eisa_machdep.h                                               |      4 +-
 sys/arch/prep/include/gtenvar.h                                                    |      4 +-
 sys/arch/prep/include/intr.h                                                       |     13 +-
 sys/arch/prep/include/param.h                                                      |     22 +-
 sys/arch/prep/include/platform.h                                                   |      6 +-
 sys/arch/prep/include/vmparam.h                                                    |      6 +-
 sys/arch/prep/isa/isabeep.c                                                        |     14 +-
 sys/arch/prep/isa/paud_isa.c                                                       |     19 +-
 sys/arch/prep/pci/gten.c                                                           |     21 +-
 sys/arch/prep/pci/pceb.c                                                           |     20 +-
 sys/arch/prep/pci/prep_pciconf_direct.c                                            |      8 +-
 sys/arch/prep/pnpbus/if_we_pnpbus.c                                                |     16 +-
 sys/arch/prep/pnpbus/nvram_pnpbus.c                                                |     14 +-
 sys/arch/prep/pnpbus/pnpbus.c                                                      |     23 +-
 sys/arch/prep/pnpbus/pnpbusvar.h                                                   |      4 +-
 sys/arch/prep/prep/autoconf.c                                                      |     16 +-
 sys/arch/prep/prep/cpu.c                                                           |     14 +-
 sys/arch/prep/prep/locore.S                                                        |      4 +-
 sys/arch/prep/prep/machdep.c                                                       |     22 +-
 sys/arch/prep/prep/mainbus.c                                                       |     14 +-
 sys/arch/prep/prep/platform.c                                                      |     15 +-
 sys/arch/rs6000/include/atomic.h                                                   |      3 -
 sys/arch/rs6000/include/cpu.h                                                      |     10 +-
 sys/arch/rs6000/include/intr.h                                                     |      7 +-
 sys/arch/rs6000/include/mca_machdep.h                                              |      5 +-
 sys/arch/rs6000/include/param.h                                                    |     14 +-
 sys/arch/rs6000/include/vmparam.h                                                  |      6 +-
 sys/arch/rs6000/ioplanar/ioplanarvar.h                                             |      2 +-
 sys/arch/rs6000/mca/ioplanar.c                                                     |     23 +-
 sys/arch/rs6000/mca/mca_machdep.c                                                  |      7 +-
 sys/arch/rs6000/rs6000/autoconf.c                                                  |      8 +-
 sys/arch/rs6000/rs6000/cpu.c                                                       |     14 +-
 sys/arch/rs6000/rs6000/locore.S                                                    |      4 +-
 sys/arch/rs6000/rs6000/machdep.c                                                   |     26 +-
 sys/arch/rs6000/rs6000/mainbus.c                                                   |     14 +-
 sys/arch/rs6000/rs6000/pic_iocc.c                                                  |      6 +-
 sys/arch/sandpoint/include/atomic.h                                                |      3 -
 sys/arch/sandpoint/include/cpu.h                                                   |     10 +-
 sys/arch/sandpoint/include/intr.h                                                  |      3 +-
 sys/arch/sandpoint/include/param.h                                                 |     15 +-
 sys/arch/sandpoint/include/pci_machdep.h                                           |      4 +-
 sys/arch/sandpoint/include/vmparam.h                                               |      4 +-
 sys/arch/sandpoint/pci/pci_machdep.c                                               |      7 +-
 sys/arch/sandpoint/pci/pciide_machdep.c                                            |      8 +-
 sys/arch/sandpoint/sandpoint/autoconf.c                                            |     16 +-
 sys/arch/sandpoint/sandpoint/eumb.c                                                |     19 +-
 sys/arch/sandpoint/sandpoint/iic_eumb.c                                            |      8 +-
 sys/arch/sandpoint/sandpoint/locore.S                                              |      4 +-
 sys/arch/sandpoint/sandpoint/machdep.c                                             |     25 +-
 sys/arch/sandpoint/sandpoint/mainbus.c                                             |     24 +-
 sys/arch/sandpoint/stand/altboot/README.altboot                                    |      6 +-
 sys/arch/sandpoint/stand/altboot/dsk.c                                             |     46 +-
 sys/arch/sgimips/hpc/pi1ppc.c                                                      |    150 +-
 sys/arch/sgimips/hpc/pi1ppcvar.h                                                   |     37 +-
 sys/arch/sh3/conf/files.sh3                                                        |      3 +-
 sys/arch/sh3/include/types.h                                                       |      7 +-
 sys/arch/sh3/sh3/mem.c                                                             |    175 -
 sys/arch/sh3/sh3/vm_machdep.c                                                      |     58 +-
 sys/arch/shark/ofw/cpu_ofbus.c                                                     |     14 +-
 sys/arch/shark/ofw/ofisapc.c                                                       |     14 +-
 sys/arch/shark/ofw/ofisascr.c                                                      |     14 +-
 sys/arch/shark/ofw/ofrom.c                                                         |      8 +-
 sys/arch/shark/shark/shark_machdep.c                                               |     18 +-
 sys/arch/sparc/conf/GENERIC                                                        |      6 +-
 sys/arch/sparc/conf/files.sparc                                                    |      3 +-
 sys/arch/sparc/dev/audioamd.c                                                      |     15 +-
 sys/arch/sparc/dev/if_ie_obio.c                                                    |      7 +-
 sys/arch/sparc/dev/tctrl.c                                                         |      7 +-
 sys/arch/sparc/include/types.h                                                     |     15 +-
 sys/arch/sparc/sparc/kobj_machdep.c                                                |      4 +-
 sys/arch/sparc/sparc/machdep.c                                                     |     47 +-
 sys/arch/sparc/sparc/mem.c                                                         |    194 -
 sys/arch/sparc/sparc/pmap.c                                                        |     13 +-
 sys/arch/sparc64/conf/files.sparc64                                                |      4 +-
 sys/arch/sparc64/dev/auxio.c                                                       |     34 +-
 sys/arch/sparc64/dev/com_ebus.c                                                    |     52 +-
 sys/arch/sparc64/dev/cons.h                                                        |      4 +-
 sys/arch/sparc64/dev/ebus.c                                                        |     18 +-
 sys/arch/sparc64/dev/ebus_mainbus.c                                                |     13 +-
 sys/arch/sparc64/dev/ebusvar.h                                                     |      4 +-
 sys/arch/sparc64/dev/fdc.c                                                         |    123 +-
 sys/arch/sparc64/dev/ffb.c                                                         |     33 +-
 sys/arch/sparc64/dev/ffb_mainbus.c                                                 |     23 +-
 sys/arch/sparc64/dev/ffbvar.h                                                      |      4 +-
 sys/arch/sparc64/dev/lom.c                                                         |     66 +-
 sys/arch/sparc64/dev/pcf8591_envctrl.c                                             |      3 +-
 sys/arch/sparc64/dev/pcons.c                                                       |     17 +-
 sys/arch/sparc64/dev/pld_wdog.c                                                    |     32 +-
 sys/arch/sparc64/dev/power.c                                                       |     20 +-
 sys/arch/sparc64/dev/psm.c                                                         |     29 +-
 sys/arch/sparc64/dev/psycho.c                                                      |     37 +-
 sys/arch/sparc64/dev/psychovar.h                                                   |      4 +-
 sys/arch/sparc64/dev/pyro.c                                                        |     21 +-
 sys/arch/sparc64/dev/pyrovar.h                                                     |      2 +-
 sys/arch/sparc64/dev/sab.c                                                         |     45 +-
 sys/arch/sparc64/dev/schizo.c                                                      |     34 +-
 sys/arch/sparc64/dev/schizovar.h                                                   |      4 +-
 sys/arch/sparc64/dev/upa.c                                                         |     15 +-
 sys/arch/sparc64/include/db_machdep.h                                              |      5 +-
 sys/arch/sparc64/include/pmap.h                                                    |      3 +-
 sys/arch/sparc64/sparc64/autoconf.c                                                |     94 +-
 sys/arch/sparc64/sparc64/cache.c                                                   |    106 +
 sys/arch/sparc64/sparc64/cache.h                                                   |     96 +-
 sys/arch/sparc64/sparc64/clock.c                                                   |     14 +-
 sys/arch/sparc64/sparc64/cpu.c                                                     |      5 +-
 sys/arch/sparc64/sparc64/db_trace.c                                                |      9 +-
 sys/arch/sparc64/sparc64/genassym.cf                                               |      6 +-
 sys/arch/sparc64/sparc64/intr.c                                                    |     47 +-
 sys/arch/sparc64/sparc64/ipifuncs.c                                                |     25 +-
 sys/arch/sparc64/sparc64/locore.s                                                  |    147 +-
 sys/arch/sparc64/sparc64/machdep.c                                                 |     85 +-
 sys/arch/sparc64/sparc64/mem.c                                                     |    252 -
 sys/arch/sparc64/sparc64/pmap.c                                                    |     37 +-
 sys/arch/sun2/conf/files.sun2                                                      |      4 +-
 sys/arch/sun2/dev/if_ie_mbmem.c                                                    |     21 +-
 sys/arch/sun2/dev/if_ie_obio.c                                                     |     25 +-
 sys/arch/sun2/include/pmap.h                                                       |     10 +-
 sys/arch/sun2/include/types.h                                                      |      6 +-
 sys/arch/sun2/sun2/machdep.c                                                       |     44 +-
 sys/arch/sun2/sun2/mem.c                                                           |    325 -
 sys/arch/sun2/sun2/mm_md.c                                                         |    122 +
 sys/arch/sun2/sun2/pmap.c                                                          |     21 +-
 sys/arch/sun3/conf/files.sun3                                                      |      6 +-
 sys/arch/sun3/include/pmap3.h                                                      |     10 +-
 sys/arch/sun3/include/pmap3x.h                                                     |     12 +-
 sys/arch/sun3/include/types.h                                                      |      6 +-
 sys/arch/sun3/sun3/machdep.c                                                       |     50 +-
 sys/arch/sun3/sun3/mem.c                                                           |    352 -
 sys/arch/sun3/sun3/mm_md.c                                                         |    145 +
 sys/arch/sun3/sun3/pmap.c                                                          |     21 +-
 sys/arch/sun3/sun3x/machdep.c                                                      |     48 +-
 sys/arch/sun3/sun3x/mem.c                                                          |    306 -
 sys/arch/sun3/sun3x/mm_md.c                                                        |    145 +
 sys/arch/sun3/sun3x/pmap.c                                                         |     22 +-
 sys/arch/usermode/conf/files.usermode                                              |      3 +-
 sys/arch/usermode/usermode/mem.c                                                   |     52 -
 sys/arch/vax/conf/files.vax                                                        |      3 +-
 sys/arch/vax/include/cpu.h                                                         |      4 +-
 sys/arch/vax/include/nexus.h                                                       |      4 +-
 sys/arch/vax/include/types.h                                                       |      6 +-
 sys/arch/vax/uba/uba_ubi.c                                                         |      8 +-
 sys/arch/vax/vax/ka6400.c                                                          |      6 +-
 sys/arch/vax/vax/ka730.c                                                           |     16 +-
 sys/arch/vax/vax/ka820.c                                                           |      6 +-
 sys/arch/vax/vax/ka88.c                                                            |      6 +-
 sys/arch/vax/vax/machdep.c                                                         |     40 +-
 sys/arch/vax/vax/mem.c                                                             |    171 -
 sys/arch/vax/vax/multicpu.c                                                        |      6 +-
 sys/arch/vax/vax/ubi.c                                                             |     14 +-
 sys/arch/vax/vsa/tc_vsbus.c                                                        |      5 +-
 sys/arch/x68k/conf/files.x68k                                                      |      3 +-
 sys/arch/x68k/x68k/machdep.c                                                       |     19 +-
 sys/arch/x68k/x68k/mem.c                                                           |    216 -
 sys/arch/x86/acpi/acpi_cpu_md.c                                                    |     67 +-
 sys/arch/x86/acpi/acpi_machdep.c                                                   |    297 +
 sys/arch/x86/acpi/acpi_pdc.c                                                       |    144 +
 sys/arch/x86/conf/files.x86                                                        |      7 +-
 sys/arch/x86/include/acpi_machdep.h                                                |      5 +-
 sys/arch/x86/include/cpu.h                                                         |      4 +-
 sys/arch/x86/include/cpuvar.h                                                      |      4 +-
 sys/arch/x86/include/i82489var.h                                                   |      9 +-
 sys/arch/x86/include/pmap.h                                                        |     52 +-
 sys/arch/x86/include/pmap_pv.h                                                     |      6 +-
 sys/arch/x86/pci/amdpcib_hpet.c                                                    |     84 +-
 sys/arch/x86/pci/amdtemp.c                                                         |    114 +-
 sys/arch/x86/pci/files.pci                                                         |      7 +-
 sys/arch/x86/pci/ichlpcib.c                                                        |     95 +-
 sys/arch/x86/pci/ichlpcib_hpet.c                                                   |    112 +
 sys/arch/x86/x86/acpi_machdep.c                                                    |    305 -
 sys/arch/x86/x86/coretemp.c                                                        |      5 +-
 sys/arch/x86/x86/cpu.c                                                             |      9 +-
 sys/arch/x86/x86/lapic.c                                                           |     10 +-
 sys/arch/x86/x86/pmap.c                                                            |   1095 +-
 sys/arch/x86/x86/pmap_tlb.c                                                        |    470 +
 sys/arch/x86/x86/viac7temp.c                                                       |      5 +-
 sys/arch/x86/x86/x86_machdep.c                                                     |     12 +-
 sys/arch/xen/conf/files.xen                                                        |      9 +-
 sys/arch/xen/include/i386/hypercalls.h                                             |     16 +-
 sys/arch/xen/include/xenpmap.h                                                     |      5 +-
 sys/arch/xen/x86/cpu.c                                                             |     10 +-
 sys/arch/xen/x86/x86_xpmap.c                                                       |     14 +-
 sys/arch/xen/x86/xen_pmap.c                                                        |    200 +-
 sys/arch/xen/xen/privcmd.c                                                         |     56 +-
 sys/arch/xen/xen/xbdback_xenbus.c                                                  |     18 +-
 sys/arch/xen/xen/xengnt.c                                                          |      5 +-
 sys/arch/xen/xenbus/xenbus_xs.c                                                    |      8 +-
 sys/arch/zaurus/conf/GENERIC                                                       |     18 +-
 sys/arch/zaurus/conf/INSTALL                                                       |      9 +-
 sys/arch/zaurus/conf/files.zaurus                                                  |     21 +-
 sys/arch/zaurus/dev/ioexp.c                                                        |    343 +
 sys/arch/zaurus/dev/ioexpreg.h                                                     |     55 +
 sys/arch/zaurus/dev/ioexpvar.h                                                     |     82 +
 sys/arch/zaurus/dev/scoop.c                                                        |     58 +-
 sys/arch/zaurus/dev/scoop_pcic.c                                                   |     10 +-
 sys/arch/zaurus/dev/zapm.c                                                         |     12 +-
 sys/arch/zaurus/dev/zapm.h                                                         |     21 -
 sys/arch/zaurus/dev/zaudio.c                                                       |    307 +-
 sys/arch/zaurus/dev/ziic.c                                                         |    198 +
 sys/arch/zaurus/dev/zkbd.c                                                         |     17 +-
 sys/arch/zaurus/dev/zkbdmap.h                                                      |     28 +-
 sys/arch/zaurus/dev/zlcd.c                                                         |    110 +-
 sys/arch/zaurus/dev/zlcdvar.h                                                      |     44 +
 sys/arch/zaurus/dev/zmci.c                                                         |     12 +-
 sys/arch/zaurus/dev/zrc.c                                                          |     32 +-
 sys/arch/zaurus/dev/zssp.c                                                         |      9 +-
 sys/arch/zaurus/dev/zusb.c                                                         |      6 +-
 sys/arch/zaurus/stand/zboot/boot.c                                                 |      4 +-
 sys/arch/zaurus/stand/zboot/compat_linux.h                                         |      3 +-
 sys/arch/zaurus/stand/zboot/diskprobe.c                                            |    143 +-
 sys/arch/zaurus/stand/zboot/pathnames.h                                            |      7 +-
 sys/arch/zaurus/stand/zboot/unixdev.h                                              |      3 +-
 sys/arch/zaurus/stand/zboot/unixsys.S                                              |      3 +-
 sys/arch/zaurus/stand/zboot/version                                                |      3 +-
 sys/arch/zaurus/zaurus/machdep.c                                                   |     51 +-
 sys/arch/zaurus/zaurus/zaurus_var.h                                                |      4 +-
 sys/coda/coda_vnops.c                                                              |     16 +-
 sys/common/pmap/tlb/pmap.c                                                         |    618 +-
 sys/common/pmap/tlb/pmap.h                                                         |     20 +-
 sys/common/pmap/tlb/pmap_segtab.c                                                  |      6 +-
 sys/common/pmap/tlb/pmap_tlb.c                                                     |     54 +-
 sys/common/pmap/tlb/tlb.h                                                          |     71 +
 sys/common/pmap/tlb/vmpagemd.h                                                     |    112 +
 sys/compat/common/compat_sigaltstack.h                                             |      4 +-
 sys/compat/linux/arch/alpha/linux_machdep.c                                        |      7 +-
 sys/compat/linux/common/linux_sched.c                                              |      6 +-
 sys/compat/netbsd32/netbsd32_fs.c                                                  |      6 +-
 sys/compat/netbsd32/netbsd32_netbsd.c                                              |      6 +-
 sys/conf/Makefile.kern.inc                                                         |     15 +-
 sys/ddb/db_xxx.c                                                                   |      6 +-
 sys/dev/acpi/acpi.c                                                                |     49 +-
 sys/dev/acpi/acpi_acad.c                                                           |     16 +-
 sys/dev/acpi/acpi_bat.c                                                            |      7 +-
 sys/dev/acpi/acpi_cpu.c                                                            |    119 +-
 sys/dev/acpi/acpi_cpu.h                                                            |      3 +-
 sys/dev/acpi/acpi_cpu_pstate.c                                                     |      8 +-
 sys/dev/acpi/acpi_cpu_tstate.c                                                     |      8 +-
 sys/dev/acpi/acpi_fan.c                                                            |      4 +-
 sys/dev/acpi/acpi_pmtr.c                                                           |     23 +-
 sys/dev/acpi/acpi_power.c                                                          |     10 +-
 sys/dev/acpi/acpi_resource.c                                                       |     21 +-
 sys/dev/acpi/acpi_tz.c                                                             |     56 +-
 sys/dev/acpi/acpi_util.c                                                           |    221 +-
 sys/dev/acpi/acpi_util.h                                                           |     13 +-
 sys/dev/acpi/acpica/OsdEnvironment.c                                               |      8 +-
 sys/dev/acpi/acpidevs                                                              |      3 +-
 sys/dev/acpi/acpidevs_data.h                                                       |      8 +-
 sys/dev/acpi/acpivar.h                                                             |      9 +-
 sys/dev/acpi/aibs_acpi.c                                                           |    743 +
 sys/dev/acpi/atk0110.c                                                             |    458 -
 sys/dev/acpi/files.acpi                                                            |     14 +-
 sys/dev/acpi/hpet_acpi.c                                                           |    218 +-
 sys/dev/acpi/thinkpad_acpi.c                                                       |     10 +-
 sys/dev/acpi/wss_acpi.c                                                            |     25 +-
 sys/dev/acpi/ym_acpi.c                                                             |     11 +-
 sys/dev/ata/ld_ataraid.c                                                           |     10 +-
 sys/dev/ccd.c                                                                      |     29 +-
 sys/dev/cgd.c                                                                      |     31 +-
 sys/dev/dec/mcclock.c                                                              |     22 +-
 sys/dev/dec/mcclockvar.h                                                           |      4 +-
 sys/dev/dkwedge/dk.c                                                               |     12 +-
 sys/dev/dm/dm_target_stripe.c                                                      |      4 +-
 sys/dev/ebus/cs4231_ebus.c                                                         |     14 +-
 sys/dev/flash/flash.c                                                              |      6 +-
 sys/dev/fss.c                                                                      |      6 +-
 sys/dev/gpio/gpio.c                                                                |      6 +-
 sys/dev/hpc/hpckbd.c                                                               |     13 +-
 sys/dev/i2c/adm1021.c                                                              |      8 +-
 sys/dev/i2c/dbcool.c                                                               |      8 +-
 sys/dev/i2c/g760a.c                                                                |      5 +-
 sys/dev/i2c/lm75.c                                                                 |      5 +-
 sys/dev/i2c/pic16lc.c                                                              |      6 +-
 sys/dev/i2c/smscmon.c                                                              |      5 +-
 sys/dev/ic/ad1848var.h                                                             |      4 +-
 sys/dev/ic/am7930var.h                                                             |      4 +-
 sys/dev/ic/cac.c                                                                   |      6 +-
 sys/dev/ic/ciss.c                                                                  |      9 +-
 sys/dev/ic/cs4231.c                                                                |     24 +-
 sys/dev/ic/cs4231var.h                                                             |      5 +-
 sys/dev/ic/hpet.c                                                                  |     42 +-
 sys/dev/ic/hpetvar.h                                                               |     12 +-
 sys/dev/ic/i82586.c                                                                |     92 +-
 sys/dev/ic/i82586var.h                                                             |      4 +-
 sys/dev/ic/i82801lpcvar.h                                                          |     39 +
 sys/dev/ic/mfi.c                                                                   |      6 +-
 sys/dev/ic/nslm7x.c                                                                |      5 +-
 sys/dev/ic/ug.c                                                                    |      8 +-
 sys/dev/ic/vga.c                                                                   |     64 +-
 sys/dev/isa/ad1848_isa.c                                                           |      8 +-
 sys/dev/isa/finsio_isa.c                                                           |      5 +-
 sys/dev/isa/if_ai.c                                                                |     18 +-
 sys/dev/isa/if_ef.c                                                                |     21 +-
 sys/dev/isa/if_ix.c                                                                |     21 +-
 sys/dev/isa/itesio_isa.c                                                           |      8 +-
 sys/dev/isa/nsclpcsio_isa.c                                                        |      5 +-
 sys/dev/isa/smsc.c                                                                 |      5 +-
 sys/dev/isa/wss.c                                                                  |     10 +-
 sys/dev/isa/wss_isa.c                                                              |     28 +-
 sys/dev/isa/ym.c                                                                   |     16 +-
 sys/dev/isapnp/wss_isapnp.c                                                        |      9 +-
 sys/dev/isapnp/ym_isapnp.c                                                         |      7 +-
 sys/dev/mca/if_elmc_mca.c                                                          |     23 +-
 sys/dev/mca/mca.c                                                                  |      6 +-
 sys/dev/mii/brgphy.c                                                               |      7 +-
 sys/dev/mii/miidevs                                                                |      3 +-
 sys/dev/mii/miidevs.h                                                              |      6 +-
 sys/dev/mii/miidevs_data.h                                                         |      5 +-
 sys/dev/mm.c                                                                       |    395 +-
 sys/dev/mm.h                                                                       |     95 +
 sys/dev/mvme/if_ie_mvme.c                                                          |     19 +-
 sys/dev/ofisa/ofisa.c                                                              |      6 +-
 sys/dev/ofw/ofbus.c                                                                |      6 +-
 sys/dev/onewire/owtemp.c                                                           |      5 +-
 sys/dev/pci/arcmsr.c                                                               |     61 +-
 sys/dev/pci/arcmsrvar.h                                                            |     10 +-
 sys/dev/pci/gcscaudio.c                                                            |      6 +-
 sys/dev/pci/if_bge.c                                                               |     14 +-
 sys/dev/pci/pci_subr.c                                                             |     10 +-
 sys/dev/pci/pcidevs                                                                |      6 +-
 sys/dev/pci/pcidevs.h                                                              |      8 +-
 sys/dev/pci/pcidevs_data.h                                                         |  10444 +++++----
 sys/dev/pci/pcireg.h                                                               |      4 +-
 sys/dev/pci/viaenv.c                                                               |      7 +-
 sys/dev/podulebus/if_ei.c                                                          |     20 +-
 sys/dev/sbus/cs4231_sbus.c                                                         |     14 +-
 sys/dev/spi/spi.c                                                                  |     35 +-
 sys/dev/spi/spivar.h                                                               |      5 +-
 sys/dev/spi/tmp121.c                                                               |      5 +-
 sys/dev/sysmon/swsensor.c                                                          |    203 +-
 sys/dev/sysmon/sysmon_envsys.c                                                     |    328 +-
 sys/dev/sysmon/sysmon_envsys_events.c                                              |     13 +-
 sys/dev/sysmon/sysmon_envsys_tables.c                                              |     63 +-
 sys/dev/sysmon/sysmon_envsysvar.h                                                  |      5 +-
 sys/dev/sysmon/sysmonvar.h                                                         |      6 +-
 sys/dev/tc/bba.c                                                                   |     17 +-
 sys/dev/tc/ioasic_subr.c                                                           |      6 +-
 sys/dev/tc/ioasicvar.h                                                             |      4 +-
 sys/dev/tc/tc.c                                                                    |      8 +-
 sys/dev/tc/tcvar.h                                                                 |      4 +-
 sys/dev/usb/ehci.c                                                                 |     21 +-
 sys/dev/usb/files.usb                                                              |      3 +-
 sys/dev/usb/if_cdce.c                                                              |     30 +-
 sys/dev/usb/ohci.c                                                                 |      6 +-
 sys/dev/usb/ubsa.c                                                                 |      6 +-
 sys/dev/usb/udl.c                                                                  |      5 +-
 sys/dev/usb/uhci.c                                                                 |      6 +-
 sys/dev/usb/uhub.c                                                                 |      8 +-
 sys/dev/usb/usb.c                                                                  |      5 +-
 sys/dev/usb/usb_mem.c                                                              |    117 +-
 sys/dev/usb/usb_subr.c                                                             |      6 +-
 sys/dev/usb/usbdevs                                                                |      4 +-
 sys/dev/usb/usbdevs.h                                                              |      6 +-
 sys/dev/usb/usbdevs_data.h                                                         |     16 +-
 sys/dev/usb/usbdi.c                                                                |     12 +-
 sys/dev/vme/if_ie_vme.c                                                            |     11 +-
 sys/dev/vnd.c                                                                      |     14 +-
 sys/dev/wscons/wsconsio.h                                                          |      3 +-
 sys/dev/wsfb/genfb.c                                                               |     38 +-
 sys/dev/wsfb/genfbvar.h                                                            |      5 +-
 sys/external/bsd/drm/dist/bsd-core/drmP.h                                          |      2 +-
 sys/fs/adosfs/adutil.c                                                             |      6 +-
 sys/fs/adosfs/advfsops.c                                                           |      6 +-
 sys/fs/cd9660/cd9660_node.c                                                        |      6 +-
 sys/fs/cd9660/cd9660_vfsops.c                                                      |      7 +-
 sys/fs/efs/efs_ihash.c                                                             |      6 +-
 sys/fs/efs/efs_vfsops.c                                                            |      6 +-
 sys/fs/filecorefs/filecore_node.c                                                  |      6 +-
 sys/fs/filecorefs/filecore_vfsops.c                                                |     12 +-
 sys/fs/hfs/hfs_nhash.c                                                             |      6 +-
 sys/fs/hfs/hfs_vfsops.c                                                            |      8 +-
 sys/fs/msdosfs/msdosfs_denode.c                                                    |     23 +-
 sys/fs/msdosfs/msdosfs_vfsops.c                                                    |      8 +-
 sys/fs/msdosfs/msdosfs_vnops.c                                                     |     15 +-
 sys/fs/nilfs/nilfs_subr.c                                                          |      8 +-
 sys/fs/nilfs/nilfs_vnops.c                                                         |     14 +-
 sys/fs/ntfs/ntfs_vfsops.c                                                          |     12 +-
 sys/fs/ptyfs/ptyfs_subr.c                                                          |      9 +-
 sys/fs/ptyfs/ptyfs_vnops.c                                                         |      8 +-
 sys/fs/puffs/puffs_msgif.c                                                         |      6 +-
 sys/fs/puffs/puffs_node.c                                                          |     13 +-
 sys/fs/puffs/puffs_vfsops.c                                                        |     16 +-
 sys/fs/puffs/puffs_vnops.c                                                         |     32 +-
 sys/fs/smbfs/smbfs_kq.c                                                            |     28 +-
 sys/fs/smbfs/smbfs_node.c                                                          |      8 +-
 sys/fs/smbfs/smbfs_subr.c                                                          |     10 +-
 sys/fs/smbfs/smbfs_vfsops.c                                                        |     12 +-
 sys/fs/sysvbfs/sysvbfs_vfsops.c                                                    |     12 +-
 sys/fs/tmpfs/tmpfs_subr.c                                                          |     32 +-
 sys/fs/tmpfs/tmpfs_vnops.c                                                         |     23 +-
 sys/fs/udf/udf_allocation.c                                                        |     13 +-
 sys/fs/udf/udf_readwrite.c                                                         |      8 +-
 sys/fs/udf/udf_subr.c                                                              |     20 +-
 sys/fs/udf/udf_vnops.c                                                             |     18 +-
 sys/fs/union/union_subr.c                                                          |     14 +-
 sys/fs/union/union_vnops.c                                                         |     32 +-
 sys/fs/unionfs/unionfs_subr.c                                                      |     17 +-
 sys/fs/unionfs/unionfs_vnops.c                                                     |     41 +-
 sys/kern/init_main.c                                                               |     12 +-
 sys/kern/kern_exec.c                                                               |     11 +-
 sys/kern/kern_exit.c                                                               |      9 +-
 sys/kern/kern_ktrace.c                                                             |     23 +-
 sys/kern/kern_lwp.c                                                                |     29 +-
 sys/kern/kern_mutex_obj.c                                                          |     20 +-
 sys/kern/kern_pmf.c                                                                |      8 +-
 sys/kern/kern_resource.c                                                           |      8 +-
 sys/kern/kern_stub.c                                                               |      5 +-
 sys/kern/makesyscalls.sh                                                           |      3 +-
 sys/kern/subr_exec_fd.c                                                            |     33 +-
 sys/kern/subr_pcu.c                                                                |     76 +-
 sys/kern/sys_descrip.c                                                             |      6 +-
 sys/kern/sysv_shm.c                                                                |     14 +-
 sys/kern/uipc_usrreq.c                                                             |     14 +-
 sys/kern/vfs_bio.c                                                                 |     28 +-
 sys/kern/vfs_cache.c                                                               |     10 +-
 sys/kern/vfs_mount.c                                                               |     25 +-
 sys/kern/vfs_subr.c                                                                |     36 +-
 sys/kern/vfs_syscalls.c                                                            |     63 +-
 sys/kern/vfs_vnode.c                                                               |    112 +-
 sys/kern/vfs_vnops.c                                                               |     38 +-
 sys/kern/vfs_wapbl.c                                                               |      8 +-
 sys/lib/libkern/arch/sparc/divrem.m4                                               |      4 +-
 sys/lib/libsa/Makefile                                                             |      6 +-
 sys/lib/libsa/alloc.c                                                              |      6 +-
 sys/lib/libsa/cd9660.c                                                             |     14 +-
 sys/lib/libsa/dosfs.c                                                              |     14 +-
 sys/lib/libsa/ext2fs.c                                                             |     14 +-
 sys/lib/libsa/nfs.c                                                                |     14 +-
 sys/lib/libsa/nullfs.c                                                             |     14 +-
 sys/lib/libsa/stand.h                                                              |     30 +-
 sys/lib/libsa/tftp.c                                                               |     14 +-
 sys/lib/libsa/ufs.c                                                                |     14 +-
 sys/lib/libsa/ustarfs.c                                                            |     14 +-
 sys/miscfs/deadfs/dead_vnops.c                                                     |     10 +-
 sys/miscfs/fdesc/fdesc_vnops.c                                                     |      8 +-
 sys/miscfs/genfs/genfs_io.c                                                        |     58 +-
 sys/miscfs/genfs/genfs_vnops.c                                                     |     30 +-
 sys/miscfs/genfs/layer_subr.c                                                      |     16 +-
 sys/miscfs/genfs/layer_vnops.c                                                     |     32 +-
 sys/miscfs/kernfs/kernfs_subr.c                                                    |     12 +-
 sys/miscfs/procfs/procfs_subr.c                                                    |     18 +-
 sys/miscfs/specfs/spec_vnops.c                                                     |     12 +-
 sys/miscfs/syncfs/sync_subr.c                                                      |     12 +-
 sys/miscfs/syncfs/sync_vnops.c                                                     |     23 +-
 sys/modules/Makefile                                                               |      8 +-
 sys/modules/aibs/Makefile                                                          |      4 +-
 sys/modules/padlock/Makefile                                                       |      4 +-
 sys/net/bpf.c                                                                      |      5 +-
 sys/net/if_ethersubr.c                                                             |      7 +-
 sys/net/if_loop.c                                                                  |     25 +-
 sys/net/if_mpls.c                                                                  |     11 +-
 sys/net/pfkeyv2.h                                                                  |      8 +-
 sys/net80211/ieee80211_acl.c                                                       |      7 +-
 sys/net80211/ieee80211_ioctl.c                                                     |     15 +-
 sys/net80211/ieee80211_ioctl.h                                                     |      4 +-
 sys/netinet/tcp_usrreq.c                                                           |      6 +-
 sys/netinet/tcp_vtw.c                                                              |    277 +-
 sys/netinet/tcp_vtw.h                                                              |      3 +
 sys/netinet6/ip6_input.c                                                           |      6 +-
 sys/netipsec/ipsec.c                                                               |     78 +-
 sys/netipsec/ipsec.h                                                               |     14 +-
 sys/netipsec/ipsec6.h                                                              |      6 +-
 sys/netipsec/ipsec_output.c                                                        |    149 +-
 sys/netipsec/key.c                                                                 |     74 +-
 sys/netipsec/key.h                                                                 |      4 +-
 sys/netipsec/xform_ipip.c                                                          |     27 +-
 sys/nfs/nfs_bio.c                                                                  |     57 +-
 sys/nfs/nfs_clntsubs.c                                                             |      8 +-
 sys/nfs/nfs_kq.c                                                                   |     28 +-
 sys/nfs/nfs_node.c                                                                 |     11 +-
 sys/nfs/nfs_subs.c                                                                 |     12 +-
 sys/nfs/nfs_vfsops.c                                                               |      8 +-
 sys/nfs/nfs_vnops.c                                                                |      6 +-
 sys/opencrypto/crypto.c                                                            |     14 +-
 sys/opencrypto/cryptodev.c                                                         |     11 +-
 sys/opencrypto/cryptodev.h                                                         |     11 +-
 sys/opencrypto/cryptosoft.c                                                        |     16 +-
 sys/opencrypto/cryptosoft_xform.c                                                  |     56 +-
 sys/opencrypto/gmac.c                                                              |    112 +-
 sys/opencrypto/gmac.h                                                              |     16 +-
 sys/rump/dev/lib/libusb/opt/opt_usb.h                                              |      2 +
 sys/rump/librump/rumpkern/Makefile.rumpkern                                        |      4 +-
 sys/rump/librump/rumpkern/vm.c                                                     |     31 +-
 sys/rump/librump/rumpvfs/rump_vfs.c                                                |      6 +-
 sys/rump/librump/rumpvfs/rumpfs.c                                                  |     14 +-
 sys/rump/librump/rumpvfs/vm_vfs.c                                                  |     35 +-
 sys/sys/cdefs.h                                                                    |      9 +-
 sys/sys/conf.h                                                                     |      4 +-
 sys/sys/extattr.h                                                                  |      6 +-
 sys/sys/filedesc.h                                                                 |      3 +-
 sys/sys/fstypes.h                                                                  |     12 +-
 sys/sys/kernhist.h                                                                 |     36 +-
 sys/sys/ktrace.h                                                                   |     19 +-
 sys/sys/param.h                                                                    |      4 +-
 sys/sys/pcu.h                                                                      |      6 +-
 sys/sys/quota.h                                                                    |      4 +-
 sys/sys/resourcevar.h                                                              |      6 +-
 sys/sys/statvfs.h                                                                  |      3 +-
 sys/sys/userret.h                                                                  |      3 +-
 sys/sys/vfs_syscalls.h                                                             |      3 +-
 sys/sys/vnode.h                                                                    |     17 +-
 sys/ufs/ext2fs/ext2fs_inode.c                                                      |      7 +-
 sys/ufs/ext2fs/ext2fs_readwrite.c                                                  |      8 +-
 sys/ufs/ext2fs/ext2fs_vfsops.c                                                     |     13 +-
 sys/ufs/ffs/ffs_alloc.c                                                            |     12 +-
 sys/ufs/ffs/ffs_extern.h                                                           |      5 +-
 sys/ufs/ffs/ffs_inode.c                                                            |     11 +-
 sys/ufs/ffs/ffs_quota2.c                                                           |     14 +-
 sys/ufs/ffs/ffs_snapshot.c                                                         |     12 +-
 sys/ufs/ffs/ffs_vfsops.c                                                           |     56 +-
 sys/ufs/ffs/ffs_vnops.c                                                            |     24 +-
 sys/ufs/lfs/lfs_alloc.c                                                            |     10 +-
 sys/ufs/lfs/lfs_bio.c                                                              |     16 +-
 sys/ufs/lfs/lfs_inode.c                                                            |     19 +-
 sys/ufs/lfs/lfs_segment.c                                                          |     90 +-
 sys/ufs/lfs/lfs_syscalls.c                                                         |     13 +-
 sys/ufs/lfs/lfs_vfsops.c                                                           |     23 +-
 sys/ufs/lfs/lfs_vnops.c                                                            |     78 +-
 sys/ufs/mfs/mfs_vfsops.c                                                           |      6 +-
 sys/ufs/ufs/extattr.h                                                              |      6 +-
 sys/ufs/ufs/quota1_subr.c                                                          |      6 +-
 sys/ufs/ufs/quota2.h                                                               |      4 +-
 sys/ufs/ufs/quota2_subr.c                                                          |      6 +-
 sys/ufs/ufs/ufs_extattr.c                                                          |    170 +-
 sys/ufs/ufs/ufs_ihash.c                                                            |      6 +-
 sys/ufs/ufs/ufs_inode.c                                                            |     14 +-
 sys/ufs/ufs/ufs_quota1.c                                                           |     16 +-
 sys/ufs/ufs/ufs_quota2.c                                                           |      6 +-
 sys/ufs/ufs/ufs_readwrite.c                                                        |     18 +-
 sys/uvm/uvm_amap.c                                                                 |    500 +-
 sys/uvm/uvm_amap.h                                                                 |     15 +-
 sys/uvm/uvm_anon.c                                                                 |    233 +-
 sys/uvm/uvm_anon.h                                                                 |     23 +-
 sys/uvm/uvm_aobj.c                                                                 |     69 +-
 sys/uvm/uvm_bio.c                                                                  |    200 +-
 sys/uvm/uvm_device.c                                                               |     38 +-
 sys/uvm/uvm_extern.h                                                               |     17 +-
 sys/uvm/uvm_fault.c                                                                |    269 +-
 sys/uvm/uvm_fault_i.h                                                              |     10 +-
 sys/uvm/uvm_glue.c                                                                 |     31 +-
 sys/uvm/uvm_km.c                                                                   |     29 +-
 sys/uvm/uvm_loan.c                                                                 |    125 +-
 sys/uvm/uvm_map.c                                                                  |     61 +-
 sys/uvm/uvm_map.h                                                                  |      5 +-
 sys/uvm/uvm_mmap.c                                                                 |     12 +-
 sys/uvm/uvm_mremap.c                                                               |      8 +-
 sys/uvm/uvm_object.c                                                               |    109 +-
 sys/uvm/uvm_object.h                                                               |     32 +-
 sys/uvm/uvm_page.c                                                                 |     51 +-
 sys/uvm/uvm_page.h                                                                 |      3 +-
 sys/uvm/uvm_pager.c                                                                |     10 +-
 sys/uvm/uvm_pdaemon.c                                                              |     12 +-
 sys/uvm/uvm_pdpolicy_clock.c                                                       |     31 +-
 sys/uvm/uvm_pdpolicy_clockpro.c                                                    |     52 +-
 sys/uvm/uvm_readahead.c                                                            |     12 +-
 sys/uvm/uvm_swap.c                                                                 |     26 +-
 sys/uvm/uvm_vnode.c                                                                |     28 +-
 tests/Makefile                                                                     |      4 +-
 tests/crypto/libcrypto/Makefile                                                    |      6 +-
 tests/crypto/libcrypto/Makefile.inc                                                |      5 +-
 tests/crypto/libcrypto/idea/Makefile                                               |      4 +-
 tests/crypto/libcrypto/mdc2/Makefile                                               |      5 +-
 tests/crypto/libcrypto/rc5/Makefile                                                |      4 +-
 tests/crypto/libcrypto/t_ciphers.sh                                                |     13 +-
 tests/crypto/libcrypto/t_pubkey.sh                                                 |     13 +-
 tests/fs/ffs/h_quota2_tests.c                                                      |     22 +-
 tests/fs/ffs/t_quota2_1.c                                                          |      8 +-
 tests/fs/ffs/t_quota2_remount.c                                                    |      8 +-
 tests/fs/nfs/nfsservice/rpcbind/util.c                                             |      4 +-
 tests/fs/tmpfs/h_tools.c                                                           |     14 +-
 tests/h_macros.h                                                                   |      4 +-
 tests/kernel/t_extent.c                                                            |      8 +-
 tests/kernel/t_writev.c                                                            |      6 +-
 tests/lib/libc/Makefile                                                            |      5 +-
 tests/lib/libc/gen/Makefile                                                        |      5 +-
 tests/lib/libc/gen/t_assert.c                                                      |    132 +
 tests/lib/libc/gen/t_dir.c                                                         |     20 +-
 tests/lib/libc/gen/t_getcwd.c                                                      |      6 +-
 tests/lib/libc/gen/t_humanize_number.c                                             |      4 +-
 tests/lib/libc/gen/t_setdomainname.c                                               |    132 +
 tests/lib/libc/gen/t_sethostname.c                                                 |    132 +
 tests/lib/libc/locale/t_wctomb.c                                                   |      6 +-
 tests/lib/libc/net/Makefile.inc                                                    |      1 +
 tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh                                    |      6 +-
 tests/lib/libc/ssp/Makefile                                                        |      7 +-
 tests/lib/libc/ssp/h_raw.c                                                         |     51 +
 tests/lib/libc/ssp/t_ssp.sh                                                        |     16 +-
 tests/lib/libc/stdio/t_popen.c                                                     |      7 +-
 tests/lib/libc/stdlib/Makefile                                                     |      5 +-
 tests/lib/libc/stdlib/t_strtod.c                                                   |    176 +-
 tests/lib/libc/stdlib/t_strtol.c                                                   |    234 +
 tests/lib/libc/string/Makefile                                                     |      3 +-
 tests/lib/libc/string/t_memset.c                                                   |    192 +
 tests/lib/libc/t_convfp.c                                                          |     80 +-
 tests/lib/libc/t_gdtoa.c                                                           |      4 +-
 tests/lib/libc/tls/Makefile.inc                                                    |      1 +
 tests/lib/libcurses/Makefile                                                       |      4 +-
 tests/lib/libcurses/Makefile.inc                                                   |      1 +
 tests/lib/libcurses/director/director.c                                            |    165 +-
 tests/lib/libcurses/director/testlang_conf.l                                       |     22 +-
 tests/lib/libcurses/director/testlang_parse.y                                      |    402 +-
 tests/lib/libcurses/slave/Makefile                                                 |      4 +-
 tests/lib/libcurses/slave/commands.c                                               |     70 +-
 tests/lib/libcurses/slave/curses_commands.c                                        |    326 +-
 tests/lib/libcurses/slave/slave.c                                                  |     26 +-
 tests/lib/libcurses/slave/slave.h                                                  |      6 +-
 tests/lib/libcurses/t_curses.sh                                                    |     12 +-
 tests/lib/libposix/Makefile.inc                                                    |      1 +
 tests/libexec/Makefile                                                             |      4 +-
 tests/libexec/ld.elf_so/Makefile.inc                                               |      1 +
 tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c                                |      6 +-
 tests/libexec/ld.elf_so/helper_dso2/h_helper_dso2.c                                |      4 +-
 tests/rump/kernspace/busypage.c                                                    |     18 +-
 tests/syscall/Makefile                                                             |     11 +-
 tests/syscall/t_getlogin.c                                                         |    237 +
 tests/syscall/t_getrusage.c                                                        |      8 +-
 tests/syscall/t_mincore.c                                                          |    189 +
 tests/syscall/t_mprotect.c                                                         |      6 +-
 tests/syscall/t_msync.c                                                            |     10 +-
 tests/syscall/t_poll.c                                                             |    135 +
 tests/syscall/t_pollts.c                                                           |      6 +-
 tests/syscall/t_stat.c                                                             |    374 +
 tests/syscall/t_truncate.c                                                         |    175 +
 tests/syscall/t_umask.c                                                            |      6 +-
 tests/usr.bin/mkdep/t_mkdep.sh                                                     |      3 +-
 tests/util/sort/t_sort.sh                                                          |      6 +-
 tools/Makefile                                                                     |      9 +-
 tools/gcc/Makefile                                                                 |     55 +-
 tools/gcc/README.mknative                                                          |      9 +-
 tools/gcc/mknative-gcc                                                             |    130 +-
 tools/pcc/Makefile                                                                 |      8 +-
 usr.bin/awk/Makefile                                                               |      4 +-
 usr.bin/calendar/calendars/calendar.history                                        |      1 +
 usr.bin/crontab/Makefile                                                           |      4 +-
 usr.bin/ctags/Makefile                                                             |      4 +-
 usr.bin/extattr/getextattr.1                                                       |      6 +-
 usr.bin/gzip/Makefile                                                              |      8 +-
 usr.bin/gzip/gzip.1                                                                |      5 +-
 usr.bin/gzip/gzip.c                                                                |     74 +-
 usr.bin/gzip/unxz.c                                                                |    121 +
 usr.bin/kdump/kdump.c                                                              |     23 +-
 usr.bin/ktrace/ktrace.1                                                            |      6 +-
 usr.bin/ktrace/subr.c                                                              |      7 +-
 usr.bin/make/meta.c                                                                |      4 +-
 usr.bin/make/unit-tests/modts                                                      |     27 +-
 usr.bin/make/unit-tests/sysv                                                       |     19 +-
 usr.bin/make/unit-tests/test.exp                                                   |      4 +
 usr.bin/make/var.c                                                                 |     23 +-
 usr.bin/man/man.1                                                                  |     10 +-
 usr.bin/man/man.c                                                                  |     63 +-
 usr.bin/mkubootimage/mkubootimage.c                                                |     70 +-
 usr.bin/nvi/build/Makefile                                                         |      4 +-
 usr.bin/pmap/pmap.c                                                                |      6 +-
 usr.bin/quota/getvfsquota.c                                                        |      6 +-
 usr.bin/script/script.1                                                            |     10 +-
 usr.bin/script/script.c                                                            |      8 +-
 usr.bin/telnet/Makefile                                                            |      4 +-
 usr.bin/tr/Makefile                                                                |      4 +-
 usr.sbin/acpitools/aml/aml_parse.c                                                 |      6 +-
 usr.sbin/bootp/bootptest/Makefile                                                  |      4 +-
 usr.sbin/cron/Makefile                                                             |      4 +-
 usr.sbin/dhcp/Makefile.inc                                                         |      4 +-
 usr.sbin/dumplfs/Makefile                                                          |      4 +-
 usr.sbin/envstat/config.c                                                          |     14 +-
 usr.sbin/envstat/envstat.8                                                         |     10 +-
 usr.sbin/envstat/envstat.c                                                         |    162 +-
 usr.sbin/extattrctl/extattrctl.8                                                   |     49 +-
 usr.sbin/hprop/Makefile                                                            |      4 +-
 usr.sbin/installboot/Makefile                                                      |      4 +-
 usr.sbin/installboot/installboot.h                                                 |      4 +-
 usr.sbin/installboot/machines.c                                                    |      6 +-
 usr.sbin/iprop-log/Makefile                                                        |      4 +-
 usr.sbin/isdn/isdnd/Makefile                                                       |      4 +-
 usr.sbin/isdn/isdnmonitor/Makefile                                                 |      4 +-
 usr.sbin/isdn/isdntel/Makefile                                                     |      4 +-
 usr.sbin/isdn/isdntrace/Makefile                                                   |      4 +-
 usr.sbin/ldpd/conffile.c                                                           |     16 +-
 usr.sbin/ldpd/fsm.c                                                                |     23 +-
 usr.sbin/ldpd/ldp.h                                                                |      3 +-
 usr.sbin/ldpd/ldp_command.c                                                        |     88 +-
 usr.sbin/ldpd/ldp_command.h                                                        |     25 +-
 usr.sbin/ldpd/ldp_errors.h                                                         |      3 +-
 usr.sbin/ldpd/main.c                                                               |      6 +-
 usr.sbin/ldpd/mpls_interface.c                                                     |     10 +-
 usr.sbin/ldpd/mpls_routes.c                                                        |     80 +-
 usr.sbin/ldpd/socketops.c                                                          |     73 +-
 usr.sbin/ldpd/socketops.h                                                          |      4 +-
 usr.sbin/ldpd/tlv_stack.c                                                          |     13 +-
 usr.sbin/makefs/cd9660/Makefile.inc                                                |      4 +-
 usr.sbin/mopd/common/Makefile                                                      |      4 +-
 usr.sbin/mopd/mopd/Makefile                                                        |      4 +-
 usr.sbin/mopd/mopprobe/Makefile                                                    |      4 +-
 usr.sbin/mscdlabel/Makefile                                                        |      4 +-
 usr.sbin/ndiscvt/inf-token.l                                                       |      4 +-
 usr.sbin/ndp/ndp.c                                                                 |     15 +-
 usr.sbin/pppd/Makefile.inc                                                         |      4 +-
 usr.sbin/pppd/pppd/Makefile                                                        |      4 +-
 usr.sbin/quotactl/quotactl.c                                                       |      6 +-
 usr.sbin/rarpd/Makefile                                                            |      4 +-
 usr.sbin/rbootd/Makefile                                                           |      4 +-
 usr.sbin/rpc.pcnfsd/Makefile                                                       |      4 +-
 usr.sbin/rtadvd/Makefile                                                           |      4 +-
 usr.sbin/syslogd/syslogd.c                                                         |     32 +-
 usr.sbin/tcpdump/Makefile                                                          |      4 +-
 usr.sbin/wiconfig/Makefile                                                         |      4 +-
 usr.sbin/wsfontload/wsfontload.8                                                   |     90 +-
 usr.sbin/wsfontload/wsfontload.c                                                   |      7 +-
 2600 files changed, 63398 insertions(+), 43935 deletions(-)

diffs (truncated from 200009 to 300 lines):

diff -r 443828d7c3af -r 672a21ed5c98 Makefile
--- a/Makefile  Fri Jun 03 13:27:37 2011 +0000
+++ b/Makefile  Thu Jun 23 14:17:47 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.282 2011/01/29 16:56:26 jym Exp $
+#      $NetBSD: Makefile,v 1.282.2.1 2011/06/23 14:17:47 cherry Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -199,10 +199,10 @@
 # Targets (in order!) called by "make build".
 #
 .if defined(HAVE_GCC)
-.if ${HAVE_GCC} == "3"
-LIBGCC_EXT=3
+.if ${HAVE_GCC} == "4"
+LIBGCC_EXT=4
 .else
-LIBGCC_EXT=4
+LIBGCC_EXT=45
 .endif
 .endif
 
@@ -239,7 +239,7 @@
 .endif
 BUILDTARGETS+= do-lib-libc
 BUILDTARGETS+= do-lib
-.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
+.if ${MKKMOD} != "no"
 BUILDTARGETS+= do-sys-modules
 .endif
 BUILDTARGETS+= do-sys-rump-dev-lib do-sys-rump-fs-lib
@@ -444,10 +444,8 @@
 .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
        ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
 .endif
-.endif
        ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
 .endif
 .endif
diff -r 443828d7c3af -r 672a21ed5c98 bin/pax/cpio.1
--- a/bin/pax/cpio.1    Fri Jun 03 13:27:37 2011 +0000
+++ b/bin/pax/cpio.1    Thu Jun 23 14:17:47 2011 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: cpio.1,v 1.11 2007/12/02 21:16:02 wiz Exp $
+.\" $NetBSD: cpio.1,v 1.11.26.1 2011/06/23 14:17:47 cherry Exp $
 .\"
 .\" Copyright (c) 1997 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\"
 .\"    OpenBSD: cpio.1,v 1.14 2000/11/10 17:52:02 aaron Exp
 .\"
-.Dd April 23, 2007
+.Dd June 18, 2011
 .Dt CPIO 1
 .Os
 .Sh NAME
@@ -69,16 +69,16 @@
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl o , -create
+.It Fl o , Fl Fl create
 Create an archive.
 Reads the list of files to store in the
 archive from standard input, and writes the archive on standard
 output.
 .Bl -tag -width Ds
-.It Fl a , -reset-access-time
+.It Fl a , Fl Fl reset-access-time
 Reset the access times on files that have been copied to the
 archive.
-.It Fl A , -append
+.It Fl A , Fl Fl append
 Append to the specified archive.
 .It Fl B
 Set block size of output to 5120 bytes.
@@ -119,16 +119,20 @@
 .It Fl v
 Be verbose about operations.
 List filenames as they are written to the archive.
-.It Fl z
-Compress archive using
-.Xr gzip 1
+.It Fl Fl xz
+Compress/decompress archive using
+.Xr xz 1
 format.
 .It Fl Z
 Compress archive using
 .Xr compress 1
 format.
+.It Fl z
+Compress/decompress archive using
+.Xr gzip 1
+format.
 .El
-.It Fl i , -extract
+.It Fl i , Fl Fl extract
 Restore files from an archive.
 Reads the archive file from
 standard input and extracts files matching the
@@ -146,20 +150,20 @@
 .It Fl C Ar bytes
 Read archive written with a block size of
 .Ar bytes .
-.It Fl d , -make-directories
+.It Fl d , Fl Fl make-directories
 Create any intermediate directories as needed during
 restore.
-.It Fl E Ar file , Fl -pattern-file Ar file
+.It Fl E Ar file , Fl Fl pattern-file Ar file
 Read list of file name patterns to extract or list from
 .Ar file .
-.It Fl f , -nonmatching
+.It Fl f , Fl Fl nonmatching
 Restore all files except those matching the
 .Ar patterns
 given on the command line.
-.It Fl F Ar archive , Fl -file Ar archive
+.It Fl F Ar archive , Fl Fl file Ar archive
 .It Fl I Ar archive
 Use the specified file as the input for the archive.
-.It Fl H Ar format , Fl -format Ar format
+.It Fl H Ar format , Fl Fl format Ar format
 Read an archive of the specified format.
 Recognized formats are:
 .Pp
@@ -183,19 +187,19 @@
 .El
 .It Fl m
 Restore modification times on files.
-.It Fl r , -rename
+.It Fl r , Fl Fl rename
 Rename restored files interactively.
 .It Fl s
 Swap bytes after reading data from the archive.
-.It Fl S , -swap-halfwords
+.It Fl S , Fl Fl swap-halfwords
 Swap words after reading data from the archive.
-.It Fl t , -list
+.It Fl t , Fl Fl list
 Only list the contents of the archive, no files or
 directories will be created.
-.It Fl u , -unconditional
+.It Fl u , Fl Fl unconditional
 Overwrite files even when the file in the archive is
 older than the one that will be overwritten.
-.It Fl v , -verbose
+.It Fl v , Fl Fl verbose
 Be verbose about operations.
 List filenames as they are copied in from the archive.
 .It Fl z
@@ -211,7 +215,7 @@
 .Nm
 format archives.
 .El
-.It Fl p , -pass-through
+.It Fl p , Fl Fl pass-through
 Copy files from one location to another in a single pass.
 The list of files to copy are read from standard input and
 written out to a directory relative to the specified
@@ -223,24 +227,24 @@
 .It Fl d
 Create any intermediate directories as needed to write
 the files at the new location.
-.It Fl l , -link
+.It Fl l , Fl Fl link
 When possible, link files rather than creating an
 extra copy.
-.It Fl L , -dereference
+.It Fl L , Fl Fl dereference
 Follow symbolic links.
-.It Fl m , -preserve-modification-time
+.It Fl m , Fl Fl preserve-modification-time
 Restore modification times on files.
-.It Fl u , -unconditional
+.It Fl u , Fl Fl unconditional
 Overwrite files even when the original file being copied is
 older than the one that will be overwritten.
-.It Fl v , -verbose
+.It Fl v , Fl Fl verbose
 Be verbose about operations.
 List filenames as they are copied.
-.It Fl -force-local
+.It Fl Fl force-local
 Do not interpret filenames that contain a
 .Sq \&:
 as remote files.
-.It Fl -insecure
+.It Fl Fl insecure
 Normally
 .Nm
 ignores filenames that contain
diff -r 443828d7c3af -r 672a21ed5c98 bin/pax/extern.h
--- a/bin/pax/extern.h  Fri Jun 03 13:27:37 2011 +0000
+++ b/bin/pax/extern.h  Thu Jun 23 14:17:47 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.56 2009/04/07 19:52:35 perry Exp $        */
+/*     $NetBSD: extern.h,v 1.56.4.1 2011/06/23 14:17:47 cherry Exp $   */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -233,14 +233,12 @@
 extern int cwdfd;
 extern int dflag;
 extern int iflag;
-extern int jflag;
 extern int kflag;
 extern int lflag;
 extern int nflag;
 extern int tflag;
 extern int uflag;
 extern int vflag;
-extern int zflag;
 extern int Dflag;
 extern int Hflag;
 extern int Lflag;
diff -r 443828d7c3af -r 672a21ed5c98 bin/pax/options.c
--- a/bin/pax/options.c Fri Jun 03 13:27:37 2011 +0000
+++ b/bin/pax/options.c Thu Jun 23 14:17:47 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.109 2010/08/31 03:16:06 enami Exp $      */
+/*     $NetBSD: options.c,v 1.109.4.1 2011/06/23 14:17:47 cherry Exp $ */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.109 2010/08/31 03:16:06 enami Exp $");
+__RCSID("$NetBSD: options.c,v 1.109.4.1 2011/06/23 14:17:47 cherry Exp $");
 #endif
 #endif /* not lint */
 
@@ -102,6 +102,7 @@
 
 #define BZIP2_CMD      "bzip2"         /* command to run as bzip2 */
 #define GZIP_CMD       "gzip"          /* command to run as gzip */
+#define XZ_CMD         "xz"            /* command to run as xz */
 #define COMPRESS_CMD   "compress"      /* command to run as compress */
 
 /*
@@ -124,8 +125,9 @@
 #define        OPT_INSECURE                    14
 #define        OPT_STRICT                      15
 #define        OPT_SPARSE                      16
+#define OPT_XZ                         17
 #if !HAVE_NBTOOL_CONFIG_H
-#define        OPT_CHROOT                      17
+#define        OPT_CHROOT                      18
 #endif
 
 /*
@@ -242,6 +244,8 @@
                                                OPT_FORCE_LOCAL },
        { "use-compress-program", required_argument,    0,
                                                OPT_USE_COMPRESS_PROGRAM },
+       { "xz",                 no_argument,            0,
+                                               OPT_XZ },
        { 0,                    0,                      0,
                                                0 },
 };
@@ -320,7 +324,6 @@
                        /*
                         * pass through bzip2
                         */
-                       jflag = 1;
                        gzip_program = BZIP2_CMD;
                        break;
                case 'k':
@@ -476,7 +479,6 @@
                        /*
                         * use gzip.  Non standard option.
                         */
-                       zflag = 1;
                        gzip_program = GZIP_CMD;
                        break;
                case 'A':
@@ -646,9 +648,11 @@
                        forcelocal = 1;
                        break;
                case OPT_USE_COMPRESS_PROGRAM:
-                       zflag = 1;
                        gzip_program = optarg;
                        break;
+               case OPT_XZ:
+                       gzip_program = XZ_CMD;
+                       break;
                case '?':
                default:
                        pax_usage();
@@ -786,6 +790,8 @@
                                                OPT_EXCLUDE },
        { "no-recursion",       no_argument,            0,



Home | Main Index | Thread Index | Old Index