From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 01:43:42 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4DCE106564A;
	Sun,  8 Apr 2012 01:43:42 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9028F8FC14;
	Sun,  8 Apr 2012 01:43:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q381hgB7087435;
	Sun, 8 Apr 2012 01:43:42 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q381hg51087406;
	Sun, 8 Apr 2012 01:43:42 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201204080143.q381hg51087406@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 8 Apr 2012 01:43:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234010 - in stable/9: contrib/bind9 contrib/bind9/bin
	contrib/bind9/bin/check contrib/bind9/bin/confgen
	contrib/bind9/bin/confgen/include/confgen
	contrib/bind9/bin/confgen/unix contrib...
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 01:43:43 -0000

Author: dougb
Date: Sun Apr  8 01:43:41 2012
New Revision: 234010
URL: http://svn.freebsd.org/changeset/base/234010

Log:
  MFC r233909:
  
  Add Bv9ARM.pdf to the list of docs to install.
  
  MFV/MFC r233914:
  
  Update to version 9.8.2, the latest from ISC, which contains numerous bug fixes.

Deleted:
  stable/9/contrib/bind9/bin/rndc/unix/
Modified:
  stable/9/contrib/bind9/CHANGES
  stable/9/contrib/bind9/COPYRIGHT
  stable/9/contrib/bind9/FAQ.xml
  stable/9/contrib/bind9/Makefile.in
  stable/9/contrib/bind9/README
  stable/9/contrib/bind9/acconfig.h
  stable/9/contrib/bind9/bin/Makefile.in
  stable/9/contrib/bind9/bin/check/Makefile.in
  stable/9/contrib/bind9/bin/check/check-tool.c
  stable/9/contrib/bind9/bin/check/check-tool.h
  stable/9/contrib/bind9/bin/check/named-checkconf.8
  stable/9/contrib/bind9/bin/check/named-checkconf.c
  stable/9/contrib/bind9/bin/check/named-checkconf.docbook
  stable/9/contrib/bind9/bin/check/named-checkconf.html
  stable/9/contrib/bind9/bin/check/named-checkzone.8
  stable/9/contrib/bind9/bin/check/named-checkzone.c
  stable/9/contrib/bind9/bin/check/named-checkzone.docbook
  stable/9/contrib/bind9/bin/check/named-checkzone.html
  stable/9/contrib/bind9/bin/confgen/Makefile.in
  stable/9/contrib/bind9/bin/confgen/ddns-confgen.8
  stable/9/contrib/bind9/bin/confgen/ddns-confgen.c
  stable/9/contrib/bind9/bin/confgen/ddns-confgen.docbook
  stable/9/contrib/bind9/bin/confgen/ddns-confgen.html
  stable/9/contrib/bind9/bin/confgen/include/confgen/os.h
  stable/9/contrib/bind9/bin/confgen/keygen.c
  stable/9/contrib/bind9/bin/confgen/keygen.h
  stable/9/contrib/bind9/bin/confgen/rndc-confgen.8
  stable/9/contrib/bind9/bin/confgen/rndc-confgen.c
  stable/9/contrib/bind9/bin/confgen/rndc-confgen.docbook
  stable/9/contrib/bind9/bin/confgen/rndc-confgen.html
  stable/9/contrib/bind9/bin/confgen/unix/Makefile.in
  stable/9/contrib/bind9/bin/confgen/unix/os.c
  stable/9/contrib/bind9/bin/confgen/util.c
  stable/9/contrib/bind9/bin/confgen/util.h
  stable/9/contrib/bind9/bin/dig/Makefile.in
  stable/9/contrib/bind9/bin/dig/dig.1
  stable/9/contrib/bind9/bin/dig/dig.c
  stable/9/contrib/bind9/bin/dig/dig.docbook
  stable/9/contrib/bind9/bin/dig/dig.html
  stable/9/contrib/bind9/bin/dig/dighost.c
  stable/9/contrib/bind9/bin/dig/host.1
  stable/9/contrib/bind9/bin/dig/host.c
  stable/9/contrib/bind9/bin/dig/host.docbook
  stable/9/contrib/bind9/bin/dig/host.html
  stable/9/contrib/bind9/bin/dig/include/dig/dig.h
  stable/9/contrib/bind9/bin/dig/nslookup.1
  stable/9/contrib/bind9/bin/dig/nslookup.c
  stable/9/contrib/bind9/bin/dig/nslookup.docbook
  stable/9/contrib/bind9/bin/dig/nslookup.html
  stable/9/contrib/bind9/bin/dnssec/Makefile.in
  stable/9/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
  stable/9/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  stable/9/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
  stable/9/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
  stable/9/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  stable/9/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  stable/9/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  stable/9/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  stable/9/contrib/bind9/bin/dnssec/dnssec-keygen.8
  stable/9/contrib/bind9/bin/dnssec/dnssec-keygen.c
  stable/9/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  stable/9/contrib/bind9/bin/dnssec/dnssec-keygen.html
  stable/9/contrib/bind9/bin/dnssec/dnssec-revoke.8
  stable/9/contrib/bind9/bin/dnssec/dnssec-revoke.c
  stable/9/contrib/bind9/bin/dnssec/dnssec-revoke.docbook
  stable/9/contrib/bind9/bin/dnssec/dnssec-revoke.html
  stable/9/contrib/bind9/bin/dnssec/dnssec-settime.8
  stable/9/contrib/bind9/bin/dnssec/dnssec-settime.c
  stable/9/contrib/bind9/bin/dnssec/dnssec-settime.docbook
  stable/9/contrib/bind9/bin/dnssec/dnssec-settime.html
  stable/9/contrib/bind9/bin/dnssec/dnssec-signzone.8
  stable/9/contrib/bind9/bin/dnssec/dnssec-signzone.c
  stable/9/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  stable/9/contrib/bind9/bin/dnssec/dnssec-signzone.html
  stable/9/contrib/bind9/bin/dnssec/dnssectool.c
  stable/9/contrib/bind9/bin/dnssec/dnssectool.h
  stable/9/contrib/bind9/bin/named/Makefile.in
  stable/9/contrib/bind9/bin/named/bind.keys.h
  stable/9/contrib/bind9/bin/named/bind9.xsl
  stable/9/contrib/bind9/bin/named/bind9.xsl.h
  stable/9/contrib/bind9/bin/named/builtin.c
  stable/9/contrib/bind9/bin/named/client.c
  stable/9/contrib/bind9/bin/named/config.c
  stable/9/contrib/bind9/bin/named/control.c
  stable/9/contrib/bind9/bin/named/controlconf.c
  stable/9/contrib/bind9/bin/named/convertxsl.pl
  stable/9/contrib/bind9/bin/named/include/dlz/dlz_dlopen_driver.h
  stable/9/contrib/bind9/bin/named/include/named/builtin.h
  stable/9/contrib/bind9/bin/named/include/named/client.h
  stable/9/contrib/bind9/bin/named/include/named/config.h
  stable/9/contrib/bind9/bin/named/include/named/control.h
  stable/9/contrib/bind9/bin/named/include/named/globals.h
  stable/9/contrib/bind9/bin/named/include/named/interfacemgr.h
  stable/9/contrib/bind9/bin/named/include/named/listenlist.h
  stable/9/contrib/bind9/bin/named/include/named/log.h
  stable/9/contrib/bind9/bin/named/include/named/logconf.h
  stable/9/contrib/bind9/bin/named/include/named/lwaddr.h
  stable/9/contrib/bind9/bin/named/include/named/lwdclient.h
  stable/9/contrib/bind9/bin/named/include/named/lwresd.h
  stable/9/contrib/bind9/bin/named/include/named/lwsearch.h
  stable/9/contrib/bind9/bin/named/include/named/main.h
  stable/9/contrib/bind9/bin/named/include/named/notify.h
  stable/9/contrib/bind9/bin/named/include/named/ns_smf_globals.h
  stable/9/contrib/bind9/bin/named/include/named/query.h
  stable/9/contrib/bind9/bin/named/include/named/server.h
  stable/9/contrib/bind9/bin/named/include/named/sortlist.h
  stable/9/contrib/bind9/bin/named/include/named/statschannel.h
  stable/9/contrib/bind9/bin/named/include/named/tkeyconf.h
  stable/9/contrib/bind9/bin/named/include/named/tsigconf.h
  stable/9/contrib/bind9/bin/named/include/named/types.h
  stable/9/contrib/bind9/bin/named/include/named/update.h
  stable/9/contrib/bind9/bin/named/include/named/xfrout.h
  stable/9/contrib/bind9/bin/named/include/named/zoneconf.h
  stable/9/contrib/bind9/bin/named/interfacemgr.c
  stable/9/contrib/bind9/bin/named/listenlist.c
  stable/9/contrib/bind9/bin/named/log.c
  stable/9/contrib/bind9/bin/named/logconf.c
  stable/9/contrib/bind9/bin/named/lwaddr.c
  stable/9/contrib/bind9/bin/named/lwdclient.c
  stable/9/contrib/bind9/bin/named/lwderror.c
  stable/9/contrib/bind9/bin/named/lwdgabn.c
  stable/9/contrib/bind9/bin/named/lwdgnba.c
  stable/9/contrib/bind9/bin/named/lwdgrbn.c
  stable/9/contrib/bind9/bin/named/lwdnoop.c
  stable/9/contrib/bind9/bin/named/lwresd.8
  stable/9/contrib/bind9/bin/named/lwresd.c
  stable/9/contrib/bind9/bin/named/lwresd.docbook
  stable/9/contrib/bind9/bin/named/lwresd.html
  stable/9/contrib/bind9/bin/named/lwsearch.c
  stable/9/contrib/bind9/bin/named/main.c
  stable/9/contrib/bind9/bin/named/named.8
  stable/9/contrib/bind9/bin/named/named.conf.5
  stable/9/contrib/bind9/bin/named/named.conf.docbook
  stable/9/contrib/bind9/bin/named/named.conf.html
  stable/9/contrib/bind9/bin/named/named.docbook
  stable/9/contrib/bind9/bin/named/named.html
  stable/9/contrib/bind9/bin/named/notify.c
  stable/9/contrib/bind9/bin/named/query.c
  stable/9/contrib/bind9/bin/named/server.c
  stable/9/contrib/bind9/bin/named/sortlist.c
  stable/9/contrib/bind9/bin/named/statschannel.c
  stable/9/contrib/bind9/bin/named/tkeyconf.c
  stable/9/contrib/bind9/bin/named/tsigconf.c
  stable/9/contrib/bind9/bin/named/unix/Makefile.in
  stable/9/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c
  stable/9/contrib/bind9/bin/named/unix/include/named/os.h
  stable/9/contrib/bind9/bin/named/unix/os.c
  stable/9/contrib/bind9/bin/named/update.c
  stable/9/contrib/bind9/bin/named/xfrout.c
  stable/9/contrib/bind9/bin/named/zoneconf.c
  stable/9/contrib/bind9/bin/nsupdate/Makefile.in
  stable/9/contrib/bind9/bin/nsupdate/nsupdate.1
  stable/9/contrib/bind9/bin/nsupdate/nsupdate.c
  stable/9/contrib/bind9/bin/nsupdate/nsupdate.docbook
  stable/9/contrib/bind9/bin/nsupdate/nsupdate.html
  stable/9/contrib/bind9/bin/rndc/Makefile.in
  stable/9/contrib/bind9/bin/rndc/include/rndc/os.h
  stable/9/contrib/bind9/bin/rndc/rndc.8
  stable/9/contrib/bind9/bin/rndc/rndc.c
  stable/9/contrib/bind9/bin/rndc/rndc.conf
  stable/9/contrib/bind9/bin/rndc/rndc.conf.5
  stable/9/contrib/bind9/bin/rndc/rndc.conf.docbook
  stable/9/contrib/bind9/bin/rndc/rndc.conf.html
  stable/9/contrib/bind9/bin/rndc/rndc.docbook
  stable/9/contrib/bind9/bin/rndc/rndc.html
  stable/9/contrib/bind9/bin/rndc/util.c
  stable/9/contrib/bind9/bin/rndc/util.h
  stable/9/contrib/bind9/bin/tools/Makefile.in
  stable/9/contrib/bind9/bin/tools/arpaname.1
  stable/9/contrib/bind9/bin/tools/arpaname.c
  stable/9/contrib/bind9/bin/tools/arpaname.docbook
  stable/9/contrib/bind9/bin/tools/arpaname.html
  stable/9/contrib/bind9/bin/tools/genrandom.8
  stable/9/contrib/bind9/bin/tools/genrandom.c
  stable/9/contrib/bind9/bin/tools/genrandom.docbook
  stable/9/contrib/bind9/bin/tools/genrandom.html
  stable/9/contrib/bind9/bin/tools/isc-hmac-fixup.8
  stable/9/contrib/bind9/bin/tools/isc-hmac-fixup.c
  stable/9/contrib/bind9/bin/tools/isc-hmac-fixup.docbook
  stable/9/contrib/bind9/bin/tools/isc-hmac-fixup.html
  stable/9/contrib/bind9/bin/tools/named-journalprint.8
  stable/9/contrib/bind9/bin/tools/named-journalprint.c
  stable/9/contrib/bind9/bin/tools/named-journalprint.docbook
  stable/9/contrib/bind9/bin/tools/named-journalprint.html
  stable/9/contrib/bind9/bin/tools/nsec3hash.8
  stable/9/contrib/bind9/bin/tools/nsec3hash.c
  stable/9/contrib/bind9/bin/tools/nsec3hash.docbook
  stable/9/contrib/bind9/bin/tools/nsec3hash.html
  stable/9/contrib/bind9/config.h.in
  stable/9/contrib/bind9/config.threads.in
  stable/9/contrib/bind9/configure.in
  stable/9/contrib/bind9/doc/Makefile.in
  stable/9/contrib/bind9/doc/arm/Bv9ARM-book.xml
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.pdf
  stable/9/contrib/bind9/doc/arm/Makefile.in
  stable/9/contrib/bind9/doc/arm/README-SGML
  stable/9/contrib/bind9/doc/arm/dnssec.xml
  stable/9/contrib/bind9/doc/arm/libdns.xml
  stable/9/contrib/bind9/doc/arm/man.arpaname.html
  stable/9/contrib/bind9/doc/arm/man.ddns-confgen.html
  stable/9/contrib/bind9/doc/arm/man.dig.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-keygen.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-revoke.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-settime.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-signzone.html
  stable/9/contrib/bind9/doc/arm/man.genrandom.html
  stable/9/contrib/bind9/doc/arm/man.host.html
  stable/9/contrib/bind9/doc/arm/man.isc-hmac-fixup.html
  stable/9/contrib/bind9/doc/arm/man.named-checkconf.html
  stable/9/contrib/bind9/doc/arm/man.named-checkzone.html
  stable/9/contrib/bind9/doc/arm/man.named-journalprint.html
  stable/9/contrib/bind9/doc/arm/man.named.html
  stable/9/contrib/bind9/doc/arm/man.nsec3hash.html
  stable/9/contrib/bind9/doc/arm/man.nsupdate.html
  stable/9/contrib/bind9/doc/arm/man.rndc-confgen.html
  stable/9/contrib/bind9/doc/arm/man.rndc.conf.html
  stable/9/contrib/bind9/doc/arm/man.rndc.html
  stable/9/contrib/bind9/doc/arm/managed-keys.xml
  stable/9/contrib/bind9/doc/arm/pkcs11.xml
  stable/9/contrib/bind9/doc/misc/Makefile.in
  stable/9/contrib/bind9/doc/misc/dnssec
  stable/9/contrib/bind9/doc/misc/format-options.pl
  stable/9/contrib/bind9/doc/misc/ipv6
  stable/9/contrib/bind9/doc/misc/migration
  stable/9/contrib/bind9/doc/misc/migration-4to9
  stable/9/contrib/bind9/doc/misc/options
  stable/9/contrib/bind9/doc/misc/rfc-compliance
  stable/9/contrib/bind9/doc/misc/roadmap
  stable/9/contrib/bind9/doc/misc/sdb
  stable/9/contrib/bind9/doc/misc/sort-options.pl
  stable/9/contrib/bind9/isc-config.sh.in
  stable/9/contrib/bind9/lib/Makefile.in
  stable/9/contrib/bind9/lib/bind9/Makefile.in
  stable/9/contrib/bind9/lib/bind9/api
  stable/9/contrib/bind9/lib/bind9/check.c
  stable/9/contrib/bind9/lib/bind9/getaddresses.c
  stable/9/contrib/bind9/lib/bind9/include/Makefile.in
  stable/9/contrib/bind9/lib/bind9/include/bind9/Makefile.in
  stable/9/contrib/bind9/lib/bind9/include/bind9/check.h
  stable/9/contrib/bind9/lib/bind9/include/bind9/getaddresses.h
  stable/9/contrib/bind9/lib/bind9/include/bind9/version.h
  stable/9/contrib/bind9/lib/bind9/version.c
  stable/9/contrib/bind9/lib/dns/Makefile.in
  stable/9/contrib/bind9/lib/dns/acache.c
  stable/9/contrib/bind9/lib/dns/acl.c
  stable/9/contrib/bind9/lib/dns/adb.c
  stable/9/contrib/bind9/lib/dns/api
  stable/9/contrib/bind9/lib/dns/byaddr.c
  stable/9/contrib/bind9/lib/dns/cache.c
  stable/9/contrib/bind9/lib/dns/callbacks.c
  stable/9/contrib/bind9/lib/dns/client.c
  stable/9/contrib/bind9/lib/dns/compress.c
  stable/9/contrib/bind9/lib/dns/db.c
  stable/9/contrib/bind9/lib/dns/dbiterator.c
  stable/9/contrib/bind9/lib/dns/dbtable.c
  stable/9/contrib/bind9/lib/dns/diff.c
  stable/9/contrib/bind9/lib/dns/dispatch.c
  stable/9/contrib/bind9/lib/dns/dlz.c
  stable/9/contrib/bind9/lib/dns/dns64.c
  stable/9/contrib/bind9/lib/dns/dnssec.c
  stable/9/contrib/bind9/lib/dns/ds.c
  stable/9/contrib/bind9/lib/dns/dst_api.c
  stable/9/contrib/bind9/lib/dns/dst_internal.h
  stable/9/contrib/bind9/lib/dns/dst_lib.c
  stable/9/contrib/bind9/lib/dns/dst_openssl.h
  stable/9/contrib/bind9/lib/dns/dst_parse.c
  stable/9/contrib/bind9/lib/dns/dst_parse.h
  stable/9/contrib/bind9/lib/dns/dst_result.c
  stable/9/contrib/bind9/lib/dns/ecdb.c
  stable/9/contrib/bind9/lib/dns/forward.c
  stable/9/contrib/bind9/lib/dns/gen-unix.h
  stable/9/contrib/bind9/lib/dns/gen.c
  stable/9/contrib/bind9/lib/dns/gssapi_link.c
  stable/9/contrib/bind9/lib/dns/gssapictx.c
  stable/9/contrib/bind9/lib/dns/hmac_link.c
  stable/9/contrib/bind9/lib/dns/include/Makefile.in
  stable/9/contrib/bind9/lib/dns/include/dns/Makefile.in
  stable/9/contrib/bind9/lib/dns/include/dns/acache.h
  stable/9/contrib/bind9/lib/dns/include/dns/acl.h
  stable/9/contrib/bind9/lib/dns/include/dns/adb.h
  stable/9/contrib/bind9/lib/dns/include/dns/bit.h
  stable/9/contrib/bind9/lib/dns/include/dns/byaddr.h
  stable/9/contrib/bind9/lib/dns/include/dns/cache.h
  stable/9/contrib/bind9/lib/dns/include/dns/callbacks.h
  stable/9/contrib/bind9/lib/dns/include/dns/cert.h
  stable/9/contrib/bind9/lib/dns/include/dns/client.h
  stable/9/contrib/bind9/lib/dns/include/dns/compress.h
  stable/9/contrib/bind9/lib/dns/include/dns/db.h
  stable/9/contrib/bind9/lib/dns/include/dns/dbiterator.h
  stable/9/contrib/bind9/lib/dns/include/dns/dbtable.h
  stable/9/contrib/bind9/lib/dns/include/dns/diff.h
  stable/9/contrib/bind9/lib/dns/include/dns/dispatch.h
  stable/9/contrib/bind9/lib/dns/include/dns/dlz.h
  stable/9/contrib/bind9/lib/dns/include/dns/dlz_dlopen.h
  stable/9/contrib/bind9/lib/dns/include/dns/dns64.h
  stable/9/contrib/bind9/lib/dns/include/dns/dnssec.h
  stable/9/contrib/bind9/lib/dns/include/dns/ds.h
  stable/9/contrib/bind9/lib/dns/include/dns/ecdb.h
  stable/9/contrib/bind9/lib/dns/include/dns/events.h
  stable/9/contrib/bind9/lib/dns/include/dns/fixedname.h
  stable/9/contrib/bind9/lib/dns/include/dns/forward.h
  stable/9/contrib/bind9/lib/dns/include/dns/iptable.h
  stable/9/contrib/bind9/lib/dns/include/dns/journal.h
  stable/9/contrib/bind9/lib/dns/include/dns/keydata.h
  stable/9/contrib/bind9/lib/dns/include/dns/keyflags.h
  stable/9/contrib/bind9/lib/dns/include/dns/keytable.h
  stable/9/contrib/bind9/lib/dns/include/dns/keyvalues.h
  stable/9/contrib/bind9/lib/dns/include/dns/lib.h
  stable/9/contrib/bind9/lib/dns/include/dns/log.h
  stable/9/contrib/bind9/lib/dns/include/dns/lookup.h
  stable/9/contrib/bind9/lib/dns/include/dns/master.h
  stable/9/contrib/bind9/lib/dns/include/dns/masterdump.h
  stable/9/contrib/bind9/lib/dns/include/dns/message.h
  stable/9/contrib/bind9/lib/dns/include/dns/name.h
  stable/9/contrib/bind9/lib/dns/include/dns/ncache.h
  stable/9/contrib/bind9/lib/dns/include/dns/nsec.h
  stable/9/contrib/bind9/lib/dns/include/dns/nsec3.h
  stable/9/contrib/bind9/lib/dns/include/dns/opcode.h
  stable/9/contrib/bind9/lib/dns/include/dns/order.h
  stable/9/contrib/bind9/lib/dns/include/dns/peer.h
  stable/9/contrib/bind9/lib/dns/include/dns/portlist.h
  stable/9/contrib/bind9/lib/dns/include/dns/private.h
  stable/9/contrib/bind9/lib/dns/include/dns/rbt.h
  stable/9/contrib/bind9/lib/dns/include/dns/rcode.h
  stable/9/contrib/bind9/lib/dns/include/dns/rdata.h
  stable/9/contrib/bind9/lib/dns/include/dns/rdataclass.h
  stable/9/contrib/bind9/lib/dns/include/dns/rdatalist.h
  stable/9/contrib/bind9/lib/dns/include/dns/rdataset.h
  stable/9/contrib/bind9/lib/dns/include/dns/rdatasetiter.h
  stable/9/contrib/bind9/lib/dns/include/dns/rdataslab.h
  stable/9/contrib/bind9/lib/dns/include/dns/rdatatype.h
  stable/9/contrib/bind9/lib/dns/include/dns/request.h
  stable/9/contrib/bind9/lib/dns/include/dns/resolver.h
  stable/9/contrib/bind9/lib/dns/include/dns/result.h
  stable/9/contrib/bind9/lib/dns/include/dns/rootns.h
  stable/9/contrib/bind9/lib/dns/include/dns/rpz.h
  stable/9/contrib/bind9/lib/dns/include/dns/rriterator.h
  stable/9/contrib/bind9/lib/dns/include/dns/sdb.h
  stable/9/contrib/bind9/lib/dns/include/dns/sdlz.h
  stable/9/contrib/bind9/lib/dns/include/dns/secalg.h
  stable/9/contrib/bind9/lib/dns/include/dns/secproto.h
  stable/9/contrib/bind9/lib/dns/include/dns/soa.h
  stable/9/contrib/bind9/lib/dns/include/dns/ssu.h
  stable/9/contrib/bind9/lib/dns/include/dns/stats.h
  stable/9/contrib/bind9/lib/dns/include/dns/tcpmsg.h
  stable/9/contrib/bind9/lib/dns/include/dns/time.h
  stable/9/contrib/bind9/lib/dns/include/dns/timer.h
  stable/9/contrib/bind9/lib/dns/include/dns/tkey.h
  stable/9/contrib/bind9/lib/dns/include/dns/tsec.h
  stable/9/contrib/bind9/lib/dns/include/dns/tsig.h
  stable/9/contrib/bind9/lib/dns/include/dns/ttl.h
  stable/9/contrib/bind9/lib/dns/include/dns/types.h
  stable/9/contrib/bind9/lib/dns/include/dns/validator.h
  stable/9/contrib/bind9/lib/dns/include/dns/version.h
  stable/9/contrib/bind9/lib/dns/include/dns/view.h
  stable/9/contrib/bind9/lib/dns/include/dns/xfrin.h
  stable/9/contrib/bind9/lib/dns/include/dns/zone.h
  stable/9/contrib/bind9/lib/dns/include/dns/zonekey.h
  stable/9/contrib/bind9/lib/dns/include/dns/zt.h
  stable/9/contrib/bind9/lib/dns/include/dst/Makefile.in
  stable/9/contrib/bind9/lib/dns/include/dst/dst.h
  stable/9/contrib/bind9/lib/dns/include/dst/gssapi.h
  stable/9/contrib/bind9/lib/dns/include/dst/lib.h
  stable/9/contrib/bind9/lib/dns/include/dst/result.h
  stable/9/contrib/bind9/lib/dns/iptable.c
  stable/9/contrib/bind9/lib/dns/journal.c
  stable/9/contrib/bind9/lib/dns/key.c
  stable/9/contrib/bind9/lib/dns/keydata.c
  stable/9/contrib/bind9/lib/dns/keytable.c
  stable/9/contrib/bind9/lib/dns/lib.c
  stable/9/contrib/bind9/lib/dns/log.c
  stable/9/contrib/bind9/lib/dns/lookup.c
  stable/9/contrib/bind9/lib/dns/master.c
  stable/9/contrib/bind9/lib/dns/masterdump.c
  stable/9/contrib/bind9/lib/dns/message.c
  stable/9/contrib/bind9/lib/dns/name.c
  stable/9/contrib/bind9/lib/dns/ncache.c
  stable/9/contrib/bind9/lib/dns/nsec.c
  stable/9/contrib/bind9/lib/dns/nsec3.c
  stable/9/contrib/bind9/lib/dns/openssl_link.c
  stable/9/contrib/bind9/lib/dns/openssldh_link.c
  stable/9/contrib/bind9/lib/dns/openssldsa_link.c
  stable/9/contrib/bind9/lib/dns/opensslgost_link.c
  stable/9/contrib/bind9/lib/dns/opensslrsa_link.c
  stable/9/contrib/bind9/lib/dns/order.c
  stable/9/contrib/bind9/lib/dns/peer.c
  stable/9/contrib/bind9/lib/dns/portlist.c
  stable/9/contrib/bind9/lib/dns/private.c
  stable/9/contrib/bind9/lib/dns/rbt.c
  stable/9/contrib/bind9/lib/dns/rbtdb.c
  stable/9/contrib/bind9/lib/dns/rbtdb.h
  stable/9/contrib/bind9/lib/dns/rbtdb64.c
  stable/9/contrib/bind9/lib/dns/rbtdb64.h
  stable/9/contrib/bind9/lib/dns/rcode.c
  stable/9/contrib/bind9/lib/dns/rdata.c
  stable/9/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c
  stable/9/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h
  stable/9/contrib/bind9/lib/dns/rdata/ch_3/a_1.c
  stable/9/contrib/bind9/lib/dns/rdata/ch_3/a_1.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/cert_37.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/cert_37.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/cname_5.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/cname_5.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/dname_39.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/dname_39.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/ds_43.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/ds_43.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/gpos_27.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/gpos_27.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/hip_55.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/hip_55.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/isdn_20.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/isdn_20.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/key_25.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/key_25.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/keydata_65533.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/loc_29.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/loc_29.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/mb_7.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/mb_7.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/md_3.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/md_3.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/mf_4.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/mf_4.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/mg_8.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/mg_8.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/minfo_14.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/minfo_14.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/mr_9.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/mr_9.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/mx_15.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/mx_15.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/ns_2.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/ns_2.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/nsec_47.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/nsec_47.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/null_10.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/null_10.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/nxt_30.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/nxt_30.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/opt_41.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/opt_41.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/proforma.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/proforma.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/ptr_12.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/ptr_12.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/rp_17.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/rp_17.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/rt_21.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/rt_21.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/sig_24.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/sig_24.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/soa_6.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/soa_6.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/spf_99.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/spf_99.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/tkey_249.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/tkey_249.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/txt_16.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/txt_16.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/unspec_103.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/unspec_103.h
  stable/9/contrib/bind9/lib/dns/rdata/generic/x25_19.c
  stable/9/contrib/bind9/lib/dns/rdata/generic/x25_19.h
  stable/9/contrib/bind9/lib/dns/rdata/hs_4/a_1.c
  stable/9/contrib/bind9/lib/dns/rdata/hs_4/a_1.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/a6_38.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/a6_38.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/a_1.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/a_1.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/apl_42.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/apl_42.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/kx_36.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/kx_36.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/px_26.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/px_26.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/srv_33.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/srv_33.h
  stable/9/contrib/bind9/lib/dns/rdata/in_1/wks_11.c
  stable/9/contrib/bind9/lib/dns/rdata/in_1/wks_11.h
  stable/9/contrib/bind9/lib/dns/rdata/rdatastructpre.h
  stable/9/contrib/bind9/lib/dns/rdata/rdatastructsuf.h
  stable/9/contrib/bind9/lib/dns/rdatalist.c
  stable/9/contrib/bind9/lib/dns/rdatalist_p.h
  stable/9/contrib/bind9/lib/dns/rdataset.c
  stable/9/contrib/bind9/lib/dns/rdatasetiter.c
  stable/9/contrib/bind9/lib/dns/rdataslab.c
  stable/9/contrib/bind9/lib/dns/request.c
  stable/9/contrib/bind9/lib/dns/resolver.c
  stable/9/contrib/bind9/lib/dns/result.c
  stable/9/contrib/bind9/lib/dns/rootns.c
  stable/9/contrib/bind9/lib/dns/rpz.c
  stable/9/contrib/bind9/lib/dns/rriterator.c
  stable/9/contrib/bind9/lib/dns/sdb.c
  stable/9/contrib/bind9/lib/dns/sdlz.c
  stable/9/contrib/bind9/lib/dns/soa.c
  stable/9/contrib/bind9/lib/dns/spnego.asn1
  stable/9/contrib/bind9/lib/dns/spnego.c
  stable/9/contrib/bind9/lib/dns/spnego.h
  stable/9/contrib/bind9/lib/dns/spnego_asn1.c
  stable/9/contrib/bind9/lib/dns/spnego_asn1.pl
  stable/9/contrib/bind9/lib/dns/ssu.c
  stable/9/contrib/bind9/lib/dns/ssu_external.c
  stable/9/contrib/bind9/lib/dns/stats.c
  stable/9/contrib/bind9/lib/dns/tcpmsg.c
  stable/9/contrib/bind9/lib/dns/time.c
  stable/9/contrib/bind9/lib/dns/timer.c
  stable/9/contrib/bind9/lib/dns/tkey.c
  stable/9/contrib/bind9/lib/dns/tsec.c
  stable/9/contrib/bind9/lib/dns/tsig.c
  stable/9/contrib/bind9/lib/dns/ttl.c
  stable/9/contrib/bind9/lib/dns/validator.c
  stable/9/contrib/bind9/lib/dns/version.c
  stable/9/contrib/bind9/lib/dns/view.c
  stable/9/contrib/bind9/lib/dns/xfrin.c
  stable/9/contrib/bind9/lib/dns/zone.c
  stable/9/contrib/bind9/lib/dns/zonekey.c
  stable/9/contrib/bind9/lib/dns/zt.c
  stable/9/contrib/bind9/lib/export/Makefile.in
  stable/9/contrib/bind9/lib/export/dns/Makefile.in
  stable/9/contrib/bind9/lib/export/dns/include/Makefile.in
  stable/9/contrib/bind9/lib/export/dns/include/dns/Makefile.in
  stable/9/contrib/bind9/lib/export/dns/include/dst/Makefile.in
  stable/9/contrib/bind9/lib/export/irs/Makefile.in
  stable/9/contrib/bind9/lib/export/irs/include/Makefile.in
  stable/9/contrib/bind9/lib/export/irs/include/irs/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/include/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/include/isc/bind9.h
  stable/9/contrib/bind9/lib/export/isc/nls/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/nothreads/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/nothreads/include/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/pthreads/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/pthreads/include/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/unix/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/unix/include/Makefile.in
  stable/9/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/export/isccfg/Makefile.in
  stable/9/contrib/bind9/lib/export/isccfg/include/Makefile.in
  stable/9/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in
  stable/9/contrib/bind9/lib/export/samples/Makefile-postinstall.in
  stable/9/contrib/bind9/lib/export/samples/Makefile.in
  stable/9/contrib/bind9/lib/export/samples/nsprobe.c
  stable/9/contrib/bind9/lib/export/samples/sample-async.c
  stable/9/contrib/bind9/lib/export/samples/sample-gai.c
  stable/9/contrib/bind9/lib/export/samples/sample-request.c
  stable/9/contrib/bind9/lib/export/samples/sample-update.c
  stable/9/contrib/bind9/lib/export/samples/sample.c
  stable/9/contrib/bind9/lib/irs/Makefile.in
  stable/9/contrib/bind9/lib/irs/api
  stable/9/contrib/bind9/lib/irs/context.c
  stable/9/contrib/bind9/lib/irs/dnsconf.c
  stable/9/contrib/bind9/lib/irs/gai_strerror.c
  stable/9/contrib/bind9/lib/irs/getaddrinfo.c
  stable/9/contrib/bind9/lib/irs/getnameinfo.c
  stable/9/contrib/bind9/lib/irs/include/Makefile.in
  stable/9/contrib/bind9/lib/irs/include/irs/Makefile.in
  stable/9/contrib/bind9/lib/irs/include/irs/context.h
  stable/9/contrib/bind9/lib/irs/include/irs/dnsconf.h
  stable/9/contrib/bind9/lib/irs/include/irs/netdb.h.in
  stable/9/contrib/bind9/lib/irs/include/irs/platform.h.in
  stable/9/contrib/bind9/lib/irs/include/irs/resconf.h
  stable/9/contrib/bind9/lib/irs/include/irs/types.h
  stable/9/contrib/bind9/lib/irs/include/irs/version.h
  stable/9/contrib/bind9/lib/irs/resconf.c
  stable/9/contrib/bind9/lib/irs/version.c
  stable/9/contrib/bind9/lib/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/alpha/Makefile.in
  stable/9/contrib/bind9/lib/isc/alpha/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isc/api
  stable/9/contrib/bind9/lib/isc/app_api.c
  stable/9/contrib/bind9/lib/isc/assertions.c
  stable/9/contrib/bind9/lib/isc/backtrace-emptytbl.c
  stable/9/contrib/bind9/lib/isc/backtrace.c
  stable/9/contrib/bind9/lib/isc/base32.c
  stable/9/contrib/bind9/lib/isc/base64.c
  stable/9/contrib/bind9/lib/isc/bitstring.c
  stable/9/contrib/bind9/lib/isc/buffer.c
  stable/9/contrib/bind9/lib/isc/bufferlist.c
  stable/9/contrib/bind9/lib/isc/commandline.c
  stable/9/contrib/bind9/lib/isc/entropy.c
  stable/9/contrib/bind9/lib/isc/error.c
  stable/9/contrib/bind9/lib/isc/event.c
  stable/9/contrib/bind9/lib/isc/fsaccess.c
  stable/9/contrib/bind9/lib/isc/hash.c
  stable/9/contrib/bind9/lib/isc/heap.c
  stable/9/contrib/bind9/lib/isc/hex.c
  stable/9/contrib/bind9/lib/isc/hmacmd5.c
  stable/9/contrib/bind9/lib/isc/hmacsha.c
  stable/9/contrib/bind9/lib/isc/httpd.c
  stable/9/contrib/bind9/lib/isc/ia64/Makefile.in
  stable/9/contrib/bind9/lib/isc/ia64/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isc/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/include/isc/app.h
  stable/9/contrib/bind9/lib/isc/include/isc/assertions.h
  stable/9/contrib/bind9/lib/isc/include/isc/backtrace.h
  stable/9/contrib/bind9/lib/isc/include/isc/base32.h
  stable/9/contrib/bind9/lib/isc/include/isc/base64.h
  stable/9/contrib/bind9/lib/isc/include/isc/bind9.h
  stable/9/contrib/bind9/lib/isc/include/isc/bitstring.h
  stable/9/contrib/bind9/lib/isc/include/isc/boolean.h
  stable/9/contrib/bind9/lib/isc/include/isc/buffer.h
  stable/9/contrib/bind9/lib/isc/include/isc/bufferlist.h
  stable/9/contrib/bind9/lib/isc/include/isc/commandline.h
  stable/9/contrib/bind9/lib/isc/include/isc/entropy.h
  stable/9/contrib/bind9/lib/isc/include/isc/error.h
  stable/9/contrib/bind9/lib/isc/include/isc/event.h
  stable/9/contrib/bind9/lib/isc/include/isc/eventclass.h
  stable/9/contrib/bind9/lib/isc/include/isc/file.h
  stable/9/contrib/bind9/lib/isc/include/isc/formatcheck.h
  stable/9/contrib/bind9/lib/isc/include/isc/fsaccess.h
  stable/9/contrib/bind9/lib/isc/include/isc/hash.h
  stable/9/contrib/bind9/lib/isc/include/isc/heap.h
  stable/9/contrib/bind9/lib/isc/include/isc/hex.h
  stable/9/contrib/bind9/lib/isc/include/isc/hmacmd5.h
  stable/9/contrib/bind9/lib/isc/include/isc/hmacsha.h
  stable/9/contrib/bind9/lib/isc/include/isc/httpd.h
  stable/9/contrib/bind9/lib/isc/include/isc/interfaceiter.h
  stable/9/contrib/bind9/lib/isc/include/isc/ipv6.h
  stable/9/contrib/bind9/lib/isc/include/isc/iterated_hash.h
  stable/9/contrib/bind9/lib/isc/include/isc/lang.h
  stable/9/contrib/bind9/lib/isc/include/isc/lex.h
  stable/9/contrib/bind9/lib/isc/include/isc/lfsr.h
  stable/9/contrib/bind9/lib/isc/include/isc/lib.h
  stable/9/contrib/bind9/lib/isc/include/isc/list.h
  stable/9/contrib/bind9/lib/isc/include/isc/log.h
  stable/9/contrib/bind9/lib/isc/include/isc/magic.h
  stable/9/contrib/bind9/lib/isc/include/isc/md5.h
  stable/9/contrib/bind9/lib/isc/include/isc/mem.h
  stable/9/contrib/bind9/lib/isc/include/isc/msgcat.h
  stable/9/contrib/bind9/lib/isc/include/isc/msgs.h
  stable/9/contrib/bind9/lib/isc/include/isc/mutexblock.h
  stable/9/contrib/bind9/lib/isc/include/isc/namespace.h
  stable/9/contrib/bind9/lib/isc/include/isc/netaddr.h
  stable/9/contrib/bind9/lib/isc/include/isc/netscope.h
  stable/9/contrib/bind9/lib/isc/include/isc/ondestroy.h
  stable/9/contrib/bind9/lib/isc/include/isc/os.h
  stable/9/contrib/bind9/lib/isc/include/isc/parseint.h
  stable/9/contrib/bind9/lib/isc/include/isc/platform.h.in
  stable/9/contrib/bind9/lib/isc/include/isc/portset.h
  stable/9/contrib/bind9/lib/isc/include/isc/print.h
  stable/9/contrib/bind9/lib/isc/include/isc/quota.h
  stable/9/contrib/bind9/lib/isc/include/isc/radix.h
  stable/9/contrib/bind9/lib/isc/include/isc/random.h
  stable/9/contrib/bind9/lib/isc/include/isc/ratelimiter.h
  stable/9/contrib/bind9/lib/isc/include/isc/refcount.h
  stable/9/contrib/bind9/lib/isc/include/isc/region.h
  stable/9/contrib/bind9/lib/isc/include/isc/resource.h
  stable/9/contrib/bind9/lib/isc/include/isc/result.h
  stable/9/contrib/bind9/lib/isc/include/isc/resultclass.h
  stable/9/contrib/bind9/lib/isc/include/isc/rwlock.h
  stable/9/contrib/bind9/lib/isc/include/isc/serial.h
  stable/9/contrib/bind9/lib/isc/include/isc/sha1.h
  stable/9/contrib/bind9/lib/isc/include/isc/sha2.h
  stable/9/contrib/bind9/lib/isc/include/isc/sockaddr.h
  stable/9/contrib/bind9/lib/isc/include/isc/socket.h
  stable/9/contrib/bind9/lib/isc/include/isc/stats.h
  stable/9/contrib/bind9/lib/isc/include/isc/stdio.h
  stable/9/contrib/bind9/lib/isc/include/isc/stdlib.h
  stable/9/contrib/bind9/lib/isc/include/isc/string.h
  stable/9/contrib/bind9/lib/isc/include/isc/symtab.h
  stable/9/contrib/bind9/lib/isc/include/isc/task.h
  stable/9/contrib/bind9/lib/isc/include/isc/taskpool.h
  stable/9/contrib/bind9/lib/isc/include/isc/timer.h
  stable/9/contrib/bind9/lib/isc/include/isc/types.h
  stable/9/contrib/bind9/lib/isc/include/isc/util.h
  stable/9/contrib/bind9/lib/isc/include/isc/version.h
  stable/9/contrib/bind9/lib/isc/include/isc/xml.h
  stable/9/contrib/bind9/lib/isc/inet_aton.c
  stable/9/contrib/bind9/lib/isc/inet_ntop.c
  stable/9/contrib/bind9/lib/isc/inet_pton.c
  stable/9/contrib/bind9/lib/isc/iterated_hash.c
  stable/9/contrib/bind9/lib/isc/lex.c
  stable/9/contrib/bind9/lib/isc/lfsr.c
  stable/9/contrib/bind9/lib/isc/lib.c
  stable/9/contrib/bind9/lib/isc/log.c
  stable/9/contrib/bind9/lib/isc/md5.c
  stable/9/contrib/bind9/lib/isc/mem.c
  stable/9/contrib/bind9/lib/isc/mem_api.c
  stable/9/contrib/bind9/lib/isc/mips/Makefile.in
  stable/9/contrib/bind9/lib/isc/mips/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/mips/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/mips/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isc/mutexblock.c
  stable/9/contrib/bind9/lib/isc/netaddr.c
  stable/9/contrib/bind9/lib/isc/netscope.c
  stable/9/contrib/bind9/lib/isc/nls/Makefile.in
  stable/9/contrib/bind9/lib/isc/nls/msgcat.c
  stable/9/contrib/bind9/lib/isc/noatomic/Makefile.in
  stable/9/contrib/bind9/lib/isc/noatomic/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isc/nothreads/Makefile.in
  stable/9/contrib/bind9/lib/isc/nothreads/condition.c
  stable/9/contrib/bind9/lib/isc/nothreads/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/nothreads/include/isc/condition.h
  stable/9/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h
  stable/9/contrib/bind9/lib/isc/nothreads/include/isc/once.h
  stable/9/contrib/bind9/lib/isc/nothreads/include/isc/thread.h
  stable/9/contrib/bind9/lib/isc/nothreads/mutex.c
  stable/9/contrib/bind9/lib/isc/nothreads/thread.c
  stable/9/contrib/bind9/lib/isc/ondestroy.c
  stable/9/contrib/bind9/lib/isc/parseint.c
  stable/9/contrib/bind9/lib/isc/portset.c
  stable/9/contrib/bind9/lib/isc/powerpc/Makefile.in
  stable/9/contrib/bind9/lib/isc/powerpc/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isc/print.c
  stable/9/contrib/bind9/lib/isc/pthreads/Makefile.in
  stable/9/contrib/bind9/lib/isc/pthreads/condition.c
  stable/9/contrib/bind9/lib/isc/pthreads/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/pthreads/include/isc/condition.h
  stable/9/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h
  stable/9/contrib/bind9/lib/isc/pthreads/include/isc/once.h
  stable/9/contrib/bind9/lib/isc/pthreads/include/isc/thread.h
  stable/9/contrib/bind9/lib/isc/pthreads/mutex.c
  stable/9/contrib/bind9/lib/isc/pthreads/thread.c
  stable/9/contrib/bind9/lib/isc/quota.c
  stable/9/contrib/bind9/lib/isc/radix.c
  stable/9/contrib/bind9/lib/isc/random.c
  stable/9/contrib/bind9/lib/isc/ratelimiter.c
  stable/9/contrib/bind9/lib/isc/refcount.c
  stable/9/contrib/bind9/lib/isc/region.c
  stable/9/contrib/bind9/lib/isc/result.c
  stable/9/contrib/bind9/lib/isc/rwlock.c
  stable/9/contrib/bind9/lib/isc/serial.c
  stable/9/contrib/bind9/lib/isc/sha1.c
  stable/9/contrib/bind9/lib/isc/sha2.c
  stable/9/contrib/bind9/lib/isc/sockaddr.c
  stable/9/contrib/bind9/lib/isc/socket_api.c
  stable/9/contrib/bind9/lib/isc/sparc64/Makefile.in
  stable/9/contrib/bind9/lib/isc/sparc64/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isc/stats.c
  stable/9/contrib/bind9/lib/isc/string.c
  stable/9/contrib/bind9/lib/isc/strtoul.c
  stable/9/contrib/bind9/lib/isc/symtab.c
  stable/9/contrib/bind9/lib/isc/task.c
  stable/9/contrib/bind9/lib/isc/task_api.c
  stable/9/contrib/bind9/lib/isc/task_p.h
  stable/9/contrib/bind9/lib/isc/taskpool.c
  stable/9/contrib/bind9/lib/isc/timer.c
  stable/9/contrib/bind9/lib/isc/timer_api.c
  stable/9/contrib/bind9/lib/isc/timer_p.h
  stable/9/contrib/bind9/lib/isc/unix/Makefile.in
  stable/9/contrib/bind9/lib/isc/unix/app.c
  stable/9/contrib/bind9/lib/isc/unix/dir.c
  stable/9/contrib/bind9/lib/isc/unix/entropy.c
  stable/9/contrib/bind9/lib/isc/unix/errno2result.c
  stable/9/contrib/bind9/lib/isc/unix/errno2result.h
  stable/9/contrib/bind9/lib/isc/unix/file.c
  stable/9/contrib/bind9/lib/isc/unix/fsaccess.c
  stable/9/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c
  stable/9/contrib/bind9/lib/isc/unix/ifiter_ioctl.c
  stable/9/contrib/bind9/lib/isc/unix/ifiter_sysctl.c
  stable/9/contrib/bind9/lib/isc/unix/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/unix/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/unix/include/isc/dir.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/int.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/keyboard.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/net.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/netdb.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/offset.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/stat.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/stdtime.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/strerror.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/syslog.h
  stable/9/contrib/bind9/lib/isc/unix/include/isc/time.h
  stable/9/contrib/bind9/lib/isc/unix/interfaceiter.c
  stable/9/contrib/bind9/lib/isc/unix/ipv6.c
  stable/9/contrib/bind9/lib/isc/unix/keyboard.c
  stable/9/contrib/bind9/lib/isc/unix/net.c
  stable/9/contrib/bind9/lib/isc/unix/os.c
  stable/9/contrib/bind9/lib/isc/unix/resource.c
  stable/9/contrib/bind9/lib/isc/unix/socket.c
  stable/9/contrib/bind9/lib/isc/unix/socket_p.h
  stable/9/contrib/bind9/lib/isc/unix/stdio.c
  stable/9/contrib/bind9/lib/isc/unix/stdtime.c
  stable/9/contrib/bind9/lib/isc/unix/strerror.c
  stable/9/contrib/bind9/lib/isc/unix/syslog.c
  stable/9/contrib/bind9/lib/isc/unix/time.c
  stable/9/contrib/bind9/lib/isc/version.c
  stable/9/contrib/bind9/lib/isc/x86_32/Makefile.in
  stable/9/contrib/bind9/lib/isc/x86_32/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isc/x86_64/Makefile.in
  stable/9/contrib/bind9/lib/isc/x86_64/include/Makefile.in
  stable/9/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in
  stable/9/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h
  stable/9/contrib/bind9/lib/isccc/Makefile.in
  stable/9/contrib/bind9/lib/isccc/alist.c
  stable/9/contrib/bind9/lib/isccc/api
  stable/9/contrib/bind9/lib/isccc/base64.c
  stable/9/contrib/bind9/lib/isccc/cc.c
  stable/9/contrib/bind9/lib/isccc/ccmsg.c
  stable/9/contrib/bind9/lib/isccc/include/Makefile.in
  stable/9/contrib/bind9/lib/isccc/include/isccc/Makefile.in
  stable/9/contrib/bind9/lib/isccc/include/isccc/alist.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/base64.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/cc.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/events.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/lib.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/result.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/sexpr.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/symtab.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/symtype.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/types.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/util.h
  stable/9/contrib/bind9/lib/isccc/include/isccc/version.h
  stable/9/contrib/bind9/lib/isccc/lib.c
  stable/9/contrib/bind9/lib/isccc/result.c
  stable/9/contrib/bind9/lib/isccc/sexpr.c
  stable/9/contrib/bind9/lib/isccc/symtab.c
  stable/9/contrib/bind9/lib/isccc/version.c
  stable/9/contrib/bind9/lib/isccfg/Makefile.in
  stable/9/contrib/bind9/lib/isccfg/aclconf.c
  stable/9/contrib/bind9/lib/isccfg/api
  stable/9/contrib/bind9/lib/isccfg/dnsconf.c
  stable/9/contrib/bind9/lib/isccfg/include/Makefile.in
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/cfg.h
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/dnsconf.h
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/grammar.h
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/log.h
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h
  stable/9/contrib/bind9/lib/isccfg/include/isccfg/version.h
  stable/9/contrib/bind9/lib/isccfg/log.c
  stable/9/contrib/bind9/lib/isccfg/namedconf.c
  stable/9/contrib/bind9/lib/isccfg/parser.c
  stable/9/contrib/bind9/lib/isccfg/version.c
  stable/9/contrib/bind9/lib/lwres/Makefile.in
  stable/9/contrib/bind9/lib/lwres/api
  stable/9/contrib/bind9/lib/lwres/assert_p.h
  stable/9/contrib/bind9/lib/lwres/context.c
  stable/9/contrib/bind9/lib/lwres/context_p.h
  stable/9/contrib/bind9/lib/lwres/gai_strerror.c
  stable/9/contrib/bind9/lib/lwres/getaddrinfo.c
  stable/9/contrib/bind9/lib/lwres/gethost.c
  stable/9/contrib/bind9/lib/lwres/getipnode.c
  stable/9/contrib/bind9/lib/lwres/getnameinfo.c
  stable/9/contrib/bind9/lib/lwres/getrrset.c
  stable/9/contrib/bind9/lib/lwres/herror.c
  stable/9/contrib/bind9/lib/lwres/include/Makefile.in
  stable/9/contrib/bind9/lib/lwres/include/lwres/Makefile.in
  stable/9/contrib/bind9/lib/lwres/include/lwres/context.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/int.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/ipv6.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/lang.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/list.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/lwpacket.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/lwres.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/netdb.h.in
  stable/9/contrib/bind9/lib/lwres/include/lwres/platform.h.in
  stable/9/contrib/bind9/lib/lwres/include/lwres/result.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/stdlib.h
  stable/9/contrib/bind9/lib/lwres/include/lwres/version.h
  stable/9/contrib/bind9/lib/lwres/lwbuffer.c
  stable/9/contrib/bind9/lib/lwres/lwconfig.c
  stable/9/contrib/bind9/lib/lwres/lwinetaton.c
  stable/9/contrib/bind9/lib/lwres/lwinetntop.c
  stable/9/contrib/bind9/lib/lwres/lwinetpton.c
  stable/9/contrib/bind9/lib/lwres/lwpacket.c
  stable/9/contrib/bind9/lib/lwres/lwres_gabn.c
  stable/9/contrib/bind9/lib/lwres/lwres_gnba.c
  stable/9/contrib/bind9/lib/lwres/lwres_grbn.c
  stable/9/contrib/bind9/lib/lwres/lwres_noop.c
  stable/9/contrib/bind9/lib/lwres/lwresutil.c
  stable/9/contrib/bind9/lib/lwres/man/Makefile.in
  stable/9/contrib/bind9/lib/lwres/man/lwres.3
  stable/9/contrib/bind9/lib/lwres/man/lwres.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_buffer.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_buffer.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_buffer.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_config.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_config.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_config.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_context.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_context.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_context.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_gabn.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_gabn.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_gabn.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_gnba.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_gnba.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_gnba.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_noop.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_noop.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_noop.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_packet.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_packet.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_packet.html
  stable/9/contrib/bind9/lib/lwres/man/lwres_resutil.3
  stable/9/contrib/bind9/lib/lwres/man/lwres_resutil.docbook
  stable/9/contrib/bind9/lib/lwres/man/lwres_resutil.html
  stable/9/contrib/bind9/lib/lwres/print.c
  stable/9/contrib/bind9/lib/lwres/print_p.h
  stable/9/contrib/bind9/lib/lwres/strtoul.c
  stable/9/contrib/bind9/lib/lwres/unix/Makefile.in
  stable/9/contrib/bind9/lib/lwres/unix/include/Makefile.in
  stable/9/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in
  stable/9/contrib/bind9/lib/lwres/unix/include/lwres/net.h
  stable/9/contrib/bind9/lib/lwres/version.c
  stable/9/contrib/bind9/make/Makefile.in
  stable/9/contrib/bind9/make/includes.in
  stable/9/contrib/bind9/make/mkdep.in
  stable/9/contrib/bind9/make/rules.in
  stable/9/contrib/bind9/mkinstalldirs
  stable/9/contrib/bind9/release-notes.css
  stable/9/contrib/bind9/version
  stable/9/lib/bind/config.h
  stable/9/lib/bind/dns/code.h
  stable/9/lib/bind/dns/dns/enumclass.h
  stable/9/lib/bind/dns/dns/enumtype.h
  stable/9/lib/bind/dns/dns/rdatastruct.h
  stable/9/lib/bind/lwres/lwres/netdb.h
  stable/9/lib/bind/lwres/lwres/platform.h
  stable/9/share/doc/bind9/Makefile
Directory Properties:
  stable/9/contrib/bind9/   (props changed)
  stable/9/lib/bind/   (props changed)
  stable/9/share/doc/bind9/   (props changed)

Modified: stable/9/contrib/bind9/CHANGES
==============================================================================
--- stable/9/contrib/bind9/CHANGES	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/CHANGES	Sun Apr  8 01:43:41 2012	(r234010)
@@ -1,9 +1,309 @@
-	--- 9.8.1-P1 released ---
+	--- 9.8.2 released ---
+
+3298.	[bug]		Named could dereference a NULL pointer in
+			zmgr_start_xfrin_ifquota if the zone was being removed.
+			[RT #28419]
+
+3297.	[bug]		Named could die on a malformed master file. [RT #28467]
+
+3295.	[bug]		Adjust isc_time_secondsastimet range check to be more
+			portable. [RT # 26542]
+
+3294.	[bug]		isccc/cc.c:table_fromwire failed to free alist on
+			error. [RT #28265]
+
+3291.	[port]		Fixed a build error on systems without ENOTSUP.
+			[RT #28200]
+
+3290.	[bug]		<isc/hmacsha.h> was not being installed. [RT #28169]
+
+3288.	[bug]		dlz_destroy() function wasn't correctly registered
+			by the DLZ dlopen driver. [RT #28056]
+
+3287.	[port]		Update ans.pl to work with Net::DNS 0.68. [RT #28028]
+
+3286.	[bug]		Managed key maintenance timer could fail to start
+			after 'rndc reconfig'. [RT #26786]
+
+	--- 9.8.2rc2 released ---
+
+3285.	[bug]		val-frdataset was incorrectly disassociated in
+			proveunsecure after calling startfinddlvsep.
+			[RT #27928]
+
+3284.	[bug]		Address race conditions with the handling of
+			rbtnode.deadlink. [RT #27738]
+
+3283.	[bug]		Raw zones with with more than 512 records in a RRset
+			failed to load. [RT #27863]
+
+3282.	[bug]		Restrict the TTL of NS RRset to no more than that
+			of the old NS RRset when replacing it.
+			[RT #27792] [RT #27884]
+
+3281.	[bug]		SOA refresh queries could be treated as cancelled
+			despite succeeding over the loopback interface.
+			[RT #27782]
+
+3280.	[bug]		Potential double free of a rdataset on out of memory
+			with DNS64. [RT #27762]
+
+3278.	[bug]		Make sure automatic key maintenance is started
+			when "auto-dnssec maintain" is turned on during
+			"rndc reconfig". [RT #26805]
+
+3276.	[bug]		win32: ns_os_openfile failed to return NULL on
+			safe_open failure. [RT #27696]
+
+3274.	[bug]		Log when a zone is not reusable.  Only set loadtime
+			on successful loads.  [RT #27650]
+
+3273.   [bug]           AAAA responses could be returned in the additional
+                        section even when filter-aaaa-on-v4 was in use.
+                        [RT #27292]
+
+3271.	[port]		darwin: mksymtbl is not always stable, loop several
+			times before giving up.  mksymtbl was using non
+			portable perl to covert 64 bit hex strings. [RT #27653]
+
+3268.	[bug]		Convert RRSIG expiry times to 64 timestamps to work
+			out the earliest expiry time. [RT #23311]
+
+3267.	[bug]		Memory allocation failures could be mis-reported as
+			unexpected error.  New ISC_R_UNSET result code.
+			[RT #27336]
+
+3266.	[bug]		The maximum number of NSEC3 iterations for a
+			DNSKEY RRset was not being properly computed.
+			[RT #26543]
+
+3262.	[bug]		Signed responses were handled incorrectly by RPZ.
+			[RT #27316]
+
+	--- 9.8.2rc1 released ---
+
+3260.	[bug]		"rrset-order cyclic" could appear not to rotate
+			for some query patterns.  [RT #27170/27185]
+
+3259.	[bug]		named-compilezone: Suppress "dump zone to <file>"
+			message when writing to stdout. [RT #27109]
+
+3258.	[test]		Add "forcing full sign with unreadable keys" test.
+			[RT #27153]
+
+3257.	[bug]		Do not generate a error message when calling fsync()
+			in a pipe or socket. [RT #27109]
+
+3256.	[bug]		Disable empty zones for lwresd -C. [RT #27139]
+
+3254.	[bug]		Set isc_socket_ipv6only() on the IPv6 control channels.
+			[RT #22249]
+
+3253.	[bug]		Return DNS_R_SYNTAX when the input to a text field is
+			too long. [RT #26956]
+
+3251.	[bug]		Enforce a upper bound (65535 bytes) on the amount of
+			memory dns_sdlz_putrr() can allocate per record to
+			prevent run away memory consumption on ISC_R_NOSPACE.
+			[RT #26956]
+
+3250.	[func]		'configure --enable-developer'; turn on various
+			configure options, normally off by default, that
+			we want developers to build and test with. [RT #27103]
+
+3249.	[bug]		Update log message when saving slave zones files for
+			analysis after load failures. [RT #27087]
+
+3248.	[bug]		Configure options --enable-fixed-rrset and
+			--enable-exportlib were incompatible with each
+			other. [RT #27087]
+
+3247.	[bug]		'raw' format zones failed to preserve load order
+			breaking 'fixed' sort order. [RT #27087]
+
+3243.	[port]		netbsd,bsdi: the thread defaults were not being
+			properly set.
+
+3241.	[bug]		Address race conditions in the resolver code.
+			[RT #26889]
+
+3240.	[bug]		DNSKEY state change events could be missed. [RT #26874]
+
+3239.	[bug]		dns_dnssec_findmatchingkeys needs to use a consistent
+			timestamp. [RT #26883]
+
+3238.	[bug]		keyrdata was not being reinitialized in
+			lib/dns/rbtdb.c:iszonesecure. [RT#26913]
+
+3237.	[bug]		dig -6 didn't work with +trace. [RT #26906]
+
+	--- 9.8.2b1 released ---
+
+3234.	[bug]		'make depend' produced invalid makefiles. [RT #26830]
+
+3231.	[bug]		named could fail to send a uncompressable zone.
+			[RT #26796]
+
+3230.	[bug]		'dig axfr' failed to properly handle a multi-message
+			axfr with a serial of 0. [RT #26796]
+
+3229.	[bug]		Fix local variable to struct var assignment
+			found by CLANG warning.
+
+3228.	[tuning]	Dynamically grow symbol table to improve zone
+			loading performance. [RT #26523]
+
+3227.	[bug]		Interim fix to make WKS's use of getprotobyname()
+			and getservbyname() self thread safe. [RT #26232]
+
+3226.	[bug]		Address minor resource leakages. [RT #26624]
+
+3221.	[bug]		Fixed a potential coredump on shutdown due to
+			referencing fetch context after it's been freed.
+			[RT #26720]
+
+3220.	[bug]		Change #3186 was incomplete; dns_db_rpz_findips()
+			could fail to set the database version correctly,
+			causing an assertion failure. [RT #26180]
 
 3218.	[security]	Cache lookup could return RRSIG data associated with
 			nonexistent records, leading to an assertion
 			failure. [RT #26590]
 
+3217.	[cleanup]	Fix build problem with --disable-static. [RT #26476]
+
+3216.	[bug]		resolver.c:validated() was not thread-safe. [RT #26478]
+
+3213.	[doc]		Clarify ixfr-from-differences behavior. [RT #25188]
+
+3212.	[bug]		rbtdb.c: failed to remove a node from the deadnodes
+			list prior to adding a reference to it leading a
+			possible assertion failure. [RT #23219]
+
+3209.	[func]		Add "dnssec-lookaside 'no'".  [RT #24858]
+
+3208.	[bug]		'dig -y' handle unknown tsig alorithm better.
+			[RT #25522]
+
+3207.	[contrib]	Fixed build error in Berkeley DB DLZ module. [RT #26444]
+
+3206.	[cleanup]	Add ISC information to log at start time. [RT #25484]
+
+3204.	[bug]		When a master server that has been marked as
+			unreachable sends a NOTIFY, mark it reachable
+			again. [RT #25960]
+
+3203.	[bug]		Increase log level to 'info' for validation failures
+			from expired or not-yet-valid RRSIGs. [RT #21796]
+
+3200.	[doc]		Some rndc functions were undocumented or were
+			missing from 'rndc -h' output. [RT #25555]
+
+3198.	[doc]		Clarified that dnssec-settime can alter keyfile
+			permissions. [RT #24866]
+
+3196.	[bug]		nsupdate: return nonzero exit code when target zone
+			doesn't exist. [RT #25783]
+
+3195.	[cleanup]	Silence "file not found" warnings when loading
+			managed-keys zone. [RT #26340]
+
+3194.	[doc]		Updated RFC references in the 'empty-zones-enable'
+			documentation. [RT #25203]
+
+3193.	[cleanup]	Changed MAXZONEKEYS to DNS_MAXZONEKEYS, moved to
+			dnssec.h. [RT #26415]
+
+3192.	[bug]		A query structure could be used after being freed.
+			[RT #22208]
+
+3191.	[bug]		Print NULL records using "unknown" format. [RT #26392]
+
+3190.	[bug]		Underflow in error handling in isc_mutexblock_init.
+			[RT #26397]
+
+3189.	[test]		Added a summary report after system tests. [RT #25517]
+
+3188.	[bug]		zone.c:zone_refreshkeys() could fail to detach
+			references correctly when errors occurred, causing
+			a hang on shutdown. [RT #26372]
+
+3187.	[port]		win32: support for Visual Studio 2008.  [RT #26356]
+
+3186.	[bug]		Version/db mis-match in rpz code. [RT #26180]
+
+3179.	[port]		kfreebsd: build issues. [RT #26273]
+
+3175.	[bug]		Fix how DNSSEC positive wildcard responses from a
+			NSEC3 signed zone are validated.  Stop sending a
+			unnecessary NSEC3 record when generating such
+			responses. [RT #26200]
+
+3174.	[bug]		Always compute to revoked key tag from scratch.
+			[RT #26186]
+
+3173.	[port]		Correctly validate root DS responses. [RT #25726]
+
+3171.	[bug]		Exclusively lock the task when adding a zone using
+			'rndc addzone'.  [RT #25600]
+
+3170.	[func]		RPZ update:
+			- fix precedence among competing rules
+			- improve ARM text including documenting rule precedence
+			- try to rewrite CNAME chains until first hit
+			- new "rpz" logging channel
+			- RDATA for CNAME rules can include wildcards
+			- replace "NO-OP" named.conf policy override with
+			  "PASSTHRU" and add "DISABLED" override ("NO-OP"
+			  is still recognized)
+			[RT #25172]
+
+3169.	[func]		Catch db/version mis-matches when calling dns_db_*().
+			[RT #26017]
+
+3167.	[bug]		Negative answers from forwarders were not being
+			correctly tagged making them appear to not be cached.
+			[RT #25380]
+
+3162.	[test]		start.pl: modified to allow for "named.args" in
+			ns*/ subdirectory to override stock arguments to
+			named. Largely from RT#26044, but no separate ticket.
+
+3161.	[bug]		zone.c:del_sigs failed to always reset rdata leading
+			assertion failures. [RT #25880]
+
+3157.	[tuning]	Reduce the time spent in "rndc reconfig" by parsing
+			the config file before pausing the server. [RT #21373]
+
+3155.	[bug]		Fixed a build failure when using contrib DLZ
+			drivers (e.g., mysql, postgresql, etc). [RT #25710]
+
+3154.	[bug]		Attempting to print an empty rdataset could trigger
+			an assert. [RT #25452]
+
+3152.	[cleanup]	Some versions of gcc and clang failed due to
+			incorrect use of __builtin_expect. [RT #25183]
+
+3151.	[bug]		Queries for type RRSIG or SIG could be handled
+			incorrectly.  [RT #21050]
+
+3148.	[bug]		Processing of normal queries could be stalled when
+			forwarding a UPDATE message. [RT #24711]
+
+3146.	[test]		Fixed gcc4.6.0 errors in ATF. [RT #25598]
+
+3145.	[test]		Capture output of ATF unit tests in "./atf.out" if
+			there were any errors while running them. [RT #25527]
+
+3144.	[bug]		dns_dbiterator_seek() could trigger an assert when
+			used with a nonexistent database node. [RT #25358]
+
+3143.	[bug]		Silence clang compiler warnings. [RT #25174]
+
+3139.	[test]		Added tests from RFC 6234, RFC 2202, and RFC 1321
+			for the hashing algorithms (md5, sha1 - sha512, and
+			their hmac counterparts).  [RT #25067]
+
 	--- 9.8.1 released ---
 
 	--- 9.8.1rc1 released ---
@@ -14,7 +314,7 @@
 3138.	[bug]		Address memory leaks and out-of-order operations when
 			shutting named down. [RT #25210]
 
-3136.	[func]		Add RFC 1918 reverse zones to the list of built-in 
+3136.	[func]		Add RFC 1918 reverse zones to the list of built-in
 			empty zones switched on by the 'empty-zones-enable'
 			option. [RT #24990]
 
@@ -34,9 +334,9 @@
 
 3133.	[bug]		Change #3114 was incomplete. [RT #24577]
 
-3131.   [tuning]        Improve scalability by allocating one zone task
-                        per 100 zones at startup time, rather than using a
-                        fixed-size task table. [RT #24406]
+3131.	[tuning]	Improve scalability by allocating one zone task
+			per 100 zones at startup time, rather than using a
+			fixed-size task table. [RT #24406]
 
 3129.	[bug]		Named could crash on 'rndc reconfig' when
 			allow-new-zones was set to yes and named ACLs
@@ -62,10 +362,10 @@
 
 3122.	[cleanup]	dnssec-settime: corrected usage message. [RT #24664]
 
-3121.   [security]      An authoritative name server sending a negative
-                        response containing a very large RRset could
-                        trigger an off-by-one error in the ncache code
-                        and crash named. [RT #24650]
+3121.	[security]	An authoritative name server sending a negative
+			response containing a very large RRset could
+			trigger an off-by-one error in the ncache code
+			and crash named. [RT #24650]
 
 3120.	[bug]		Named could fail to validate zones listed in a DLV
 			that validated insecure without using DLV and had
@@ -99,9 +399,9 @@
 			"krb5-subdomain", which allow machines to update
 			their own records, to the BIND 9 ARM.
 
-3111.   [bug]           Improved consistency checks for dnssec-enable and
-                        dnssec-validation, added test cases to the
-                        checkconf system test. [RT #24398]
+3111.	[bug]		Improved consistency checks for dnssec-enable and
+			dnssec-validation, added test cases to the
+			checkconf system test. [RT #24398]
 
 3110.	[bug]		dnssec-signzone: Wrong error message could appear
 			when attempting to sign with no KSK. [RT #24369]
@@ -109,10 +409,10 @@
 3107.	[bug]		dnssec-signzone: Report the correct number of ZSKs
 			when using -x. [RT #20852]
 
-3105.   [bug]           GOST support can be suppressed by "configure
-                        --without-gost" [RT #24367]
+3105.	[bug]		GOST support can be suppressed by "configure
+			--without-gost" [RT #24367]
 
-3104.   [bug]           Better support for cross-compiling. [RT #24367]
+3104.	[bug]		Better support for cross-compiling. [RT #24367]
 
 3103.	[bug]		Configuring 'dnssec-validation auto' in a view
 			instead of in the options statement could trigger
@@ -142,7 +442,7 @@
 
 3094.	[doc]		Expand dns64 documentation.
 
-3093.   [bug]           Fix gssapi/kerberos dependencies [RT #23836]
+3093.	[bug]		Fix gssapi/kerberos dependencies [RT #23836]
 
 3092.	[bug]		Signatures for records at the zone apex could go
 			stale due to an incorrect timer setting. [RT #23769]
@@ -151,7 +451,7 @@
 			and then subsequently activated could fail to trigger
 			automatic signing. [RT #22911]
 
-3090.   [func]          Make --with-gssapi default [RT #23738]
+3090.	[func]		Make --with-gssapi default [RT #23738]
 
 3088.	[bug]		Remove bin/tests/system/logfileconfig/ns1/named.conf
 			and add setup.sh in order to resolve changing
@@ -269,9 +569,9 @@
 
 3043.	[test]		Merged in the NetBSD ATF test framework (currently
 			version 0.12) for development of future unit tests.
-                        Use configure --with-atf to build ATF internally
-                        or configure --with-atf=prefix to use an external
-                        copy.  [RT #23209]
+			Use configure --with-atf to build ATF internally
+			or configure --with-atf=prefix to use an external
+			copy.  [RT #23209]
 
 3042.	[bug]		dig +trace could fail attempting to use IPv6
 			addresses on systems with only IPv4 connectivity.
@@ -706,7 +1006,7 @@
 2929.	[bug]		Improved handling of GSS security contexts:
 			 - added LRU expiration for generated TSIGs
 			 - added the ability to use a non-default realm
-                         - added new "realm" keyword in nsupdate
+			 - added new "realm" keyword in nsupdate
 			 - limited lifetime of generated keys to 1 hour
 			   or the lifetime of the context (whichever is
 			   smaller)
@@ -1535,7 +1835,7 @@
 			--with-export-includedir. [RT #20252]
 
 2675.	[bug]		dnssec-signzone could crash if the key directory
-                        did not exist. [RT #20232]
+			did not exist. [RT #20232]
 
 	--- 9.7.0a3 released ---
 
@@ -1626,7 +1926,7 @@
 			64-bit systems. [RT #20076]
 
 2650.	[bug]		Assertion failure in dnssec-signzone when trying
-                        to read keyset-* files. [RT #20075]
+			to read keyset-* files. [RT #20075]
 
 2649.	[bug]		Set the domain for forward only zones. [RT #19944]
 
@@ -1698,7 +1998,7 @@
 2630.	[func]		Improved syntax for DDNS autoconfiguration:  use
 			"update-policy local;" to switch on local DDNS in a
 			zone. (The "ddns-autoconf" option has been removed.)
-                        [RT #19875]
+			[RT #19875]
 
 2629.	[port]		Check for seteuid()/setegid(), use setresuid()/
 			setresgid() if not present. [RT #19932]
@@ -2383,10 +2683,10 @@
 			time. [RT #18277]
 
 2423.	[security]	Randomize server selection on queries, so as to
-                        make forgery a little more difficult.  Instead of
-                        always preferring the server with the lowest RTT,
-                        pick a server with RTT within the same 128
-                        millisecond band.  [RT #18441]
+			make forgery a little more difficult.  Instead of
+			always preferring the server with the lowest RTT,
+			pick a server with RTT within the same 128
+			millisecond band.  [RT #18441]
 
 2422.	[bug]		Handle the special return value of a empty node as
 			if it was a NXRRSET in the validator. [RT #18447]
@@ -2467,7 +2767,7 @@
 
 2399.	[placeholder]
 
-2398.	[bug]           Improve file descriptor management.  New,
+2398.	[bug]		Improve file descriptor management.  New,
 			temporary, named.conf option reserved-sockets,
 			default 512. [RT #18344]
 

Modified: stable/9/contrib/bind9/COPYRIGHT
==============================================================================
--- stable/9/contrib/bind9/COPYRIGHT	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/COPYRIGHT	Sun Apr  8 01:43:41 2012	(r234010)
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-$Id: COPYRIGHT,v 1.17.14.1 2011-02-22 06:34:47 marka Exp $
+$Id: COPYRIGHT,v 1.17.14.2 2012/01/04 23:46:18 tbox Exp $
 
 	Portions of this code release fall under one or more of the
 	following Copyright notices.  Please see individual source

Modified: stable/9/contrib/bind9/FAQ.xml
==============================================================================
--- stable/9/contrib/bind9/FAQ.xml	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/FAQ.xml	Sun Apr  8 01:43:41 2012	(r234010)
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: FAQ.xml,v 1.54 2010-01-19 23:48:55 tbox Exp $ -->
+<!-- $Id: FAQ.xml,v 1.54 2010/01/19 23:48:55 tbox Exp $ -->
 
 <article class="faq">
   <title>Frequently Asked Questions about BIND 9</title>

Modified: stable/9/contrib/bind9/Makefile.in
==============================================================================
--- stable/9/contrib/bind9/Makefile.in	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/Makefile.in	Sun Apr  8 01:43:41 2012	(r234010)
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.58.250.2 2011-02-28 01:19:57 tbox Exp $
+# $Id: Makefile.in,v 1.58.250.4 2011/09/06 04:06:11 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -64,8 +64,10 @@ tags:
 check: test
 
 test:
-	(cd bin/tests && ${MAKE} ${MAKEDEFS} test)
-	(test -f unit/unittest.sh && $(SHELL) unit/unittest.sh)
+	status=0; \
+	(cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \
+	(test -f unit/unittest.sh && $(SHELL) unit/unittest.sh) || status=1; \
+	exit $$status
 
 FAQ: FAQ.xml
 	${XSLTPROC} doc/xsl/isc-docbook-text.xsl FAQ.xml | \

Modified: stable/9/contrib/bind9/README
==============================================================================
--- stable/9/contrib/bind9/README	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/README	Sun Apr  8 01:43:41 2012	(r234010)
@@ -48,6 +48,14 @@ BIND 9
 	For a detailed list of user-visible changes from
 	previous releases, see the CHANGES file.
 
+        For up-to-date release notes and errata, see
+        http://www.isc.org/software/bind9/releasenotes
+
+BIND 9.8.2
+
+	BIND 9.8.2 includes a number of bug fixes and prevents a security
+	problem described in CVE-2011-4313
+
 BIND 9.8.1
 
         BIND 9.8.1 includes a number of bug fixes and enhancements from
@@ -314,6 +322,7 @@ Building
 	libraries.  sh-utils-1.16 provides a "printf" which compiles
 	on SunOS 4.
 
+
 Documentation
 
 	The BIND 9 Administrator Reference Manual is included with the
@@ -336,6 +345,48 @@ Documentation
         in the other README files.
 
 
+Change Log
+
+	A detailed list of all changes to BIND 9 is included in the 
+	file CHANGES, with the most recent changes listed first.
+	Change notes include tags indicating the category of the
+	change that was made; these categories are:
+
+	   [func]	  New feature
+
+	   [bug]	  General bug fix
+
+	   [security]	  Fix for a significant security flaw
+
+	   [experimental] Used for new features when the syntax
+	   		  or other aspects of the design are still
+			  in flux and may change
+
+	   [port]	  Portability enhancement
+
+	   [maint]	  Updates to built-in data such as root
+			  server addresses and keys
+
+	   [tuning]	  Changes to built-in configuration defaults
+	   		  and constants to improve performanceo
+
+	   [protocol]	  Updates to the DNS protocol such as new
+			  RR types
+
+           [test]         Changes to the automatic tests, not
+                          affecting server functionality
+
+           [cleanup]      Minor corrections and refactoring
+
+	   [doc]	  Documentation
+
+	In general, [func] and [experimental] tags will only appear
+	in new-feature releases (i.e., those with version numbers
+	ending in zero).  Some new functionality may be backported to
+	older releases on a case-by-case basis.  All other change
+	types may be applied to all currently-supported releases.
+
+
 Bug Reports and Mailing Lists
 
 	Bugs reports should be sent to

Modified: stable/9/contrib/bind9/acconfig.h
==============================================================================
--- stable/9/contrib/bind9/acconfig.h	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/acconfig.h	Sun Apr  8 01:43:41 2012	(r234010)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acconfig.h,v 1.53 2008-12-01 23:47:44 tbox Exp $ */
+/* $Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp $ */
 
 /*! \file */
 

Modified: stable/9/contrib/bind9/bin/Makefile.in
==============================================================================
--- stable/9/contrib/bind9/bin/Makefile.in	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/Makefile.in	Sun Apr  8 01:43:41 2012	(r234010)
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.29 2009-10-05 12:07:08 fdupont Exp $
+# $Id: Makefile.in,v 1.29 2009/10/05 12:07:08 fdupont Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

Modified: stable/9/contrib/bind9/bin/check/Makefile.in
==============================================================================
--- stable/9/contrib/bind9/bin/check/Makefile.in	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/Makefile.in	Sun Apr  8 01:43:41 2012	(r234010)
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.36 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

Modified: stable/9/contrib/bind9/bin/check/check-tool.c
==============================================================================
--- stable/9/contrib/bind9/bin/check/check-tool.c	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/check-tool.c	Sun Apr  8 01:43:41 2012	(r234010)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check-tool.c,v 1.41 2010-09-07 23:46:59 tbox Exp $ */
+/* $Id: check-tool.c,v 1.41 2010/09/07 23:46:59 tbox Exp $ */
 
 /*! \file */
 

Modified: stable/9/contrib/bind9/bin/check/check-tool.h
==============================================================================
--- stable/9/contrib/bind9/bin/check/check-tool.h	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/check-tool.h	Sun Apr  8 01:43:41 2012	(r234010)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check-tool.h,v 1.16 2010-09-07 23:46:59 tbox Exp $ */
+/* $Id: check-tool.h,v 1.16 2010/09/07 23:46:59 tbox Exp $ */
 
 #ifndef CHECK_TOOL_H
 #define CHECK_TOOL_H

Modified: stable/9/contrib/bind9/bin/check/named-checkconf.8
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkconf.8	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkconf.8	Sun Apr  8 01:43:41 2012	(r234010)
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-checkconf.8,v 1.33 2009-12-29 01:14:03 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l

Modified: stable/9/contrib/bind9/bin/check/named-checkconf.c
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkconf.c	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkconf.c	Sun Apr  8 01:43:41 2012	(r234010)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkconf.c,v 1.54.62.2 2011-03-12 04:59:13 tbox Exp $ */
+/* $Id: named-checkconf.c,v 1.54.62.2 2011/03/12 04:59:13 tbox Exp $ */
 
 /*! \file */
 

Modified: stable/9/contrib/bind9/bin/check/named-checkconf.docbook
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkconf.docbook	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkconf.docbook	Sun Apr  8 01:43:41 2012	(r234010)
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkconf.docbook,v 1.22 2009-12-28 23:21:16 each Exp $ -->
+<!-- $Id: named-checkconf.docbook,v 1.22 2009/12/28 23:21:16 each Exp $ -->
 <refentry id="man.named-checkconf">
   <refentryinfo>
     <date>June 14, 2000</date>

Modified: stable/9/contrib/bind9/bin/check/named-checkconf.html
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkconf.html	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkconf.html	Sun Apr  8 01:43:41 2012	(r234010)
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named-checkconf.html,v 1.33 2009-12-29 01:14:03 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">named-checkconf</code>  [<code class="option">-h</code>] [<code class="option">-v</code>] [<code class="option">-j</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename} [<code class="option">-p</code>] [<code class="option">-z</code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543395"></a><h2>DESCRIPTION</h2>
+<a name="id2543396"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">named-checkconf</strong></span>
       checks the syntax, but not the semantics, of a
       <span><strong class="command">named</strong></span> configuration file.  The file is parsed
@@ -52,7 +52,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543444"></a><h2>OPTIONS</h2>
+<a name="id2543445"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-h</span></dt>
 <dd><p>
@@ -91,21 +91,21 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543568"></a><h2>RETURN VALUES</h2>
+<a name="id2543569"></a><h2>RETURN VALUES</h2>
 <p><span><strong class="command">named-checkconf</strong></span>
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543579"></a><h2>SEE ALSO</h2>
+<a name="id2543580"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">named-checkzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543609"></a><h2>AUTHOR</h2>
+<a name="id2543610"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

Modified: stable/9/contrib/bind9/bin/check/named-checkzone.8
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkzone.8	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkzone.8	Sun Apr  8 01:43:41 2012	(r234010)
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-checkzone.8,v 1.47 2010-01-17 01:14:02 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l

Modified: stable/9/contrib/bind9/bin/check/named-checkzone.c
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkzone.c	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkzone.c	Sun Apr  8 01:43:41 2012	(r234010)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkzone.c,v 1.61 2010-09-07 23:46:59 tbox Exp $ */
+/* $Id: named-checkzone.c,v 1.61.62.2 2011/12/22 23:45:54 tbox Exp $ */
 
 /*! \file */
 
@@ -112,6 +112,7 @@ main(int argc, char **argv) {
 	const char *outputformatstr = NULL;
 	dns_masterformat_t inputformat = dns_masterformat_text;
 	dns_masterformat_t outputformat = dns_masterformat_text;
+	isc_boolean_t logdump = ISC_FALSE;
 	FILE *errout = stdout;
 
 	outputstyle = &dns_master_style_full;
@@ -418,6 +419,7 @@ main(int argc, char **argv) {
 
 	if (progmode == progmode_compile) {
 		dumpzone = 1;	/* always dump */
+		logdump = !quiet;
 		if (output_filename == NULL) {
 			fprintf(stderr,
 				"output file required, but not specified\n");
@@ -436,8 +438,10 @@ main(int argc, char **argv) {
 	    (output_filename == NULL ||
 	     strcmp(output_filename, "-") == 0 ||
 	     strcmp(output_filename, "/dev/fd/1") == 0 ||
-	     strcmp(output_filename, "/dev/stdout") == 0))
+	     strcmp(output_filename, "/dev/stdout") == 0)) {
 		errout = stderr;
+		logdump = ISC_FALSE;
+	}
 
 	if (isc_commandline_index + 2 != argc)
 		usage();
@@ -462,13 +466,13 @@ main(int argc, char **argv) {
 			   &zone);
 
 	if (result == ISC_R_SUCCESS && dumpzone) {
-		if (!quiet && progmode == progmode_compile) {
+		if (logdump) {
 			fprintf(errout, "dump zone to %s...", output_filename);
 			fflush(errout);
 		}
 		result = dump_zone(origin, zone, output_filename,
 				   outputformat, outputstyle);
-		if (!quiet && progmode == progmode_compile)
+		if (logdump)
 			fprintf(errout, "done\n");
 	}
 

Modified: stable/9/contrib/bind9/bin/check/named-checkzone.docbook
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkzone.docbook	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkzone.docbook	Sun Apr  8 01:43:41 2012	(r234010)
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkzone.docbook,v 1.40 2010-01-16 23:48:15 tbox Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.40 2010/01/16 23:48:15 tbox Exp $ -->
 <refentry id="man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>

Modified: stable/9/contrib/bind9/bin/check/named-checkzone.html
==============================================================================
--- stable/9/contrib/bind9/bin/check/named-checkzone.html	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/check/named-checkzone.html	Sun Apr  8 01:43:41 2012	(r234010)
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named-checkzone.html,v 1.47 2010-01-17 01:14:02 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -33,7 +33,7 @@
 <div class="cmdsynopsis"><p><code class="command">named-compilezone</code>  [<code class="option">-d</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-C <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-r <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-s <em class="replaceable"><code>style</co
 de></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {<code class="option">-o <em class="replaceable"><code>filename</code></em></code>} {zonename} {filename}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543694"></a><h2>DESCRIPTION</h2>
+<a name="id2543696"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">named-checkzone</strong></span>
       checks the syntax and integrity of a zone file.  It performs the
       same checks as <span><strong class="command">named</strong></span> does when loading a
@@ -53,7 +53,7 @@
      </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543730"></a><h2>OPTIONS</h2>
+<a name="id2543731"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-d</span></dt>
 <dd><p>
@@ -247,14 +247,14 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544377"></a><h2>RETURN VALUES</h2>
+<a name="id2544446"></a><h2>RETURN VALUES</h2>
 <p><span><strong class="command">named-checkzone</strong></span>
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544389"></a><h2>SEE ALSO</h2>
+<a name="id2544458"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">named-checkconf</span>(8)</span>,
       <em class="citetitle">RFC 1035</em>,
@@ -262,7 +262,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544422"></a><h2>AUTHOR</h2>
+<a name="id2544491"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

Modified: stable/9/contrib/bind9/bin/confgen/Makefile.in
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/Makefile.in	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/Makefile.in	Sun Apr  8 01:43:41 2012	(r234010)
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.8 2009-12-05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.8 2009/12/05 23:31:40 each Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

Modified: stable/9/contrib/bind9/bin/confgen/ddns-confgen.8
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/ddns-confgen.8	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/ddns-confgen.8	Sun Apr  8 01:43:41 2012	(r234010)
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: ddns-confgen.8,v 1.10 2009-09-19 01:14:52 tbox Exp $
+.\" $Id$
 .\"
 .hy 0
 .ad l

Modified: stable/9/contrib/bind9/bin/confgen/ddns-confgen.c
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/ddns-confgen.c	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/ddns-confgen.c	Sun Apr  8 01:43:41 2012	(r234010)
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ddns-confgen.c,v 1.9.308.2 2011-03-12 04:59:13 tbox Exp $ */
+/* $Id: ddns-confgen.c,v 1.9.308.2 2011/03/12 04:59:13 tbox Exp $ */
 
 /*! \file */
 

Modified: stable/9/contrib/bind9/bin/confgen/ddns-confgen.docbook
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/ddns-confgen.docbook	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/ddns-confgen.docbook	Sun Apr  8 01:43:41 2012	(r234010)
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: ddns-confgen.docbook,v 1.6 2009-09-18 22:08:55 fdupont Exp $ -->
+<!-- $Id: ddns-confgen.docbook,v 1.6 2009/09/18 22:08:55 fdupont Exp $ -->
 <refentry id="man.ddns-confgen">
   <refentryinfo>
     <date>Jan 29, 2009</date>

Modified: stable/9/contrib/bind9/bin/confgen/ddns-confgen.html
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/ddns-confgen.html	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/ddns-confgen.html	Sun Apr  8 01:43:41 2012	(r234010)
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: ddns-confgen.html,v 1.10 2009-09-19 01:14:52 tbox Exp $ -->
+<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -31,7 +31,7 @@
 <div class="cmdsynopsis"><p><code class="command">ddns-confgen</code>  [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [ -s <em class="replaceable"><code>name</code></em>  |   -z <em class="replaceable"><code>zone</code></em> ] [<code class="option">-q</code>] [name]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543395"></a><h2>DESCRIPTION</h2>
+<a name="id2543396"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">ddns-confgen</strong></span>
       generates a key for use by <span><strong class="command">nsupdate</strong></span>
       and <span><strong class="command">named</strong></span>.  It simplifies configuration
@@ -58,7 +58,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543454"></a><h2>OPTIONS</h2>
+<a name="id2543456"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd><p>
@@ -125,7 +125,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543642"></a><h2>SEE ALSO</h2>
+<a name="id2543643"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">nsupdate</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -133,7 +133,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543681"></a><h2>AUTHOR</h2>
+<a name="id2543682"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

Modified: stable/9/contrib/bind9/bin/confgen/include/confgen/os.h
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/include/confgen/os.h	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/include/confgen/os.h	Sun Apr  8 01:43:41 2012	(r234010)
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.3 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: os.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 

Modified: stable/9/contrib/bind9/bin/confgen/keygen.c
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/keygen.c	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/keygen.c	Sun Apr  8 01:43:41 2012	(r234010)
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keygen.c,v 1.4 2009-11-12 14:02:38 marka Exp $ */
+/* $Id: keygen.c,v 1.4 2009/11/12 14:02:38 marka Exp $ */
 
 /*! \file */
 

Modified: stable/9/contrib/bind9/bin/confgen/keygen.h
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/keygen.h	Sun Apr  8 00:40:16 2012	(r234009)
+++ stable/9/contrib/bind9/bin/confgen/keygen.h	Sun Apr  8 01:43:41 2012	(r234010)
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keygen.h,v 1.3 2009-06-11 23:47:55 tbox Exp $ */
+/* $Id: keygen.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef RNDC_KEYGEN_H
 #define RNDC_KEYGEN_H 1

Modified: stable/9/contrib/bind9/bin/confgen/rndc-confgen.8
==============================================================================
--- stable/9/contrib/bind9/bin/confgen/rndc-confgen.8	Sun Apr  8 00:40:16 2012	(r234009)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 04:09:55 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A6F6D106564A;
	Sun,  8 Apr 2012 04:09:55 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 926F18FC08;
	Sun,  8 Apr 2012 04:09:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3849tkB092207;
	Sun, 8 Apr 2012 04:09:55 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3849tBm092205;
	Sun, 8 Apr 2012 04:09:55 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201204080409.q3849tBm092205@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 8 Apr 2012 04:09:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234012 - stable/9/libexec/rtld-elf
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 04:09:55 -0000

Author: kib
Date: Sun Apr  8 04:09:55 2012
New Revision: 234012
URL: http://svn.freebsd.org/changeset/base/234012

Log:
  MFC r233927:
  Properly handle absent AT_CANARY aux entry.

Modified:
  stable/9/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/9/libexec/rtld-elf/   (props changed)

Modified: stable/9/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/9/libexec/rtld-elf/rtld.c	Sun Apr  8 03:55:25 2012	(r234011)
+++ stable/9/libexec/rtld-elf/rtld.c	Sun Apr  8 04:09:55 2012	(r234012)
@@ -351,7 +351,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
     main_argc = argc;
     main_argv = argv;
 
-    if (aux_info[AT_CANARY]->a_un.a_ptr != NULL) {
+    if (aux_info[AT_CANARY] != NULL &&
+	aux_info[AT_CANARY]->a_un.a_ptr != NULL) {
 	    i = aux_info[AT_CANARYLEN]->a_un.a_val;
 	    if (i > sizeof(__stack_chk_guard))
 		    i = sizeof(__stack_chk_guard);

From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 05:36:41 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0CA4E1065674;
	Sun,  8 Apr 2012 05:36:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EBE738FC0C;
	Sun,  8 Apr 2012 05:36:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q385aeZb095514;
	Sun, 8 Apr 2012 05:36:40 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q385aer2095511;
	Sun, 8 Apr 2012 05:36:40 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201204080536.q385aer2095511@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sun, 8 Apr 2012 05:36:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234023 - stable/9/contrib/gcc
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 05:36:41 -0000

Author: pfg
Date: Sun Apr  8 05:36:40 2012
New Revision: 234023
URL: http://svn.freebsd.org/changeset/base/234023

Log:
  MFC: r233923
  
  Fix a typo in GCC affecting calculations with -ffast-math.
  
  The fix is similar to the one applied in GCC-4.3 in
  GCCSVN-r117929 under the GPLv2.
  
  Submitted by:	Andrey Simonenko
  Reviewed by:	mm
  Approved by:	jhb (mentor)

Modified:
  stable/9/contrib/gcc/ChangeLog.gcc43
  stable/9/contrib/gcc/builtins.c
Directory Properties:
  stable/9/contrib/gcc/   (props changed)

Modified: stable/9/contrib/gcc/ChangeLog.gcc43
==============================================================================
--- stable/9/contrib/gcc/ChangeLog.gcc43	Sun Apr  8 05:09:40 2012	(r234022)
+++ stable/9/contrib/gcc/ChangeLog.gcc43	Sun Apr  8 05:36:40 2012	(r234023)
@@ -169,3 +169,8 @@
 	* doc/extend.texi: Document SSSE3 built-in functions.
 
 	* doc/invoke.texi: Document -mssse3/-mno-ssse3 switches.
+
+2006-10-21  Richard Guenther  <rguenther@suse.de>
+
+	* builtins.c (fold_builtin_classify): Fix typo.
+

Modified: stable/9/contrib/gcc/builtins.c
==============================================================================
--- stable/9/contrib/gcc/builtins.c	Sun Apr  8 05:09:40 2012	(r234022)
+++ stable/9/contrib/gcc/builtins.c	Sun Apr  8 05:36:40 2012	(r234023)
@@ -8738,7 +8738,7 @@ fold_builtin_classify (tree fndecl, tree
     case BUILT_IN_FINITE:
       if (!HONOR_NANS (TYPE_MODE (TREE_TYPE (arg)))
 	  && !HONOR_INFINITIES (TYPE_MODE (TREE_TYPE (arg))))
-	return omit_one_operand (type, integer_zero_node, arg);
+	return omit_one_operand (type, integer_one_node, arg);
 
       if (TREE_CODE (arg) == REAL_CST)
 	{

From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 09:33:23 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3258D106566B;
	Sun,  8 Apr 2012 09:33:23 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1AA348FC08;
	Sun,  8 Apr 2012 09:33:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q389XNYv004297;
	Sun, 8 Apr 2012 09:33:23 GMT (envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q389XMHC004295;
	Sun, 8 Apr 2012 09:33:22 GMT (envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201204080933.q389XMHC004295@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sun, 8 Apr 2012 09:33:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Sun, 08 Apr 2012 13:47:34 +0000
Cc: 
Subject: svn commit: r234028 - stable/9/sys/contrib/dev/run
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 09:33:23 -0000

Author: bschmidt
Date: Sun Apr  8 09:33:22 2012
New Revision: 234028
URL: http://svn.freebsd.org/changeset/base/234028

Log:
  MFC r233284:
  Update the firmware to version 0.236
  
  Submitted by:	PseudoCylon

Modified:
  stable/9/sys/contrib/dev/run/rt2870.fw.uu
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/contrib/dev/run/rt2870.fw.uu
==============================================================================
--- stable/9/sys/contrib/dev/run/rt2870.fw.uu	Sun Apr  8 08:19:17 2012	(r234027)
+++ stable/9/sys/contrib/dev/run/rt2870.fw.uu	Sun Apr  8 09:33:22 2012	(r234028)
@@ -39,70 +39,77 @@
 # DAMAGE.
 #
 # This file contains two 4KB firmware, first half is RT2870 and last half
-# is RT3071. On each 4KB firmware, 3rd last byte is major version number and
-# 2nd last byte is minor version number.
+# is RT3071. On each 4KB firmware, the last 2 bytes are CRC, 3rd last byte
+# is minor version number and 4th last byte is major version number.
 # This file comes with
-#  RT2870 v. 0.17
-#  RT3071 v. 0.17
+#  RT2870 v. 0.236
+#  RT3071 v. 0.236
 begin 644 rt2870.fw.uu
-M____`A`H`A`R`A!X`A,J`A,K`A-*`A-/$A-+(@(7N0(8\`(42`(3@S`%!B`-
-M`Q(9R"*0`8S@,.,;Y4PPX`1_0(`"?P"0$"_O\)`!C'0(\.20`:?PD`&,X##@
-M')`!@."T`A6CX+0!$)`!A."T@0F0`8QT`?`2#<@BD`04X"#G`P(3*9!P$N#U
-M5I`$!.`2"IT0V3$0O381`E`1.5$10E(10E,10E01@U41TE82,'`26W$2B7(2
-MX',3`8```!,ID'`1X/4\Y)!P$_"0!!1T@/#E5O1P`P(3*0(3(B`"`S`#'7T"
-MKU82"Y&0!!1T@/#DD'`3\.56]'`#`A,I`A,BA59!T@(BD'`0X%1__[\*#9!P
-M$>"T"`9U3@%U3X20<!#@5'__OP(2D'`1X&0(8`3@M"`&=4X#=4\@Y/4G(I!P
-M$>`D_Y)'(I`$!.`EX"1=]5>0<!#@_W1')5?XQN_&D'`1X/]T2"57^,;OQN3]
-MKU82"Y&0!!1T@/#DD'`3\.56]'`#`A,I`A,BY4=D!V`=Y4=D"&`7Y4=D"6`1
-MY4=D"F`+Y4=D"V`%Y4>T#`B0<!'@5`_U.N5'M`D(Y3JT`P/D]4;E1[0*".4Z
-MM`$#Y/5&Y/VO5A(+D=($(I!P$>#T_Y!P$.!?_Y!P$>!5)T^0<!CPD'`1X)!P
-M&?#D_:]6$@N1,!4$TA2`)I!P&.#U)Y`"*>#_D'`9X/[O7I`"*?`P1P2O)X`$
-MY2?T_Y`"*._PY5;T<`,"$RD"$R*0<!#@_I!P$>#][?CF]5?]KU82"Y&0!!1T
-M@/#DD'`3\.56]'`#`A,I`A,BD'`0X/Z0<!'@_>WU@HZ#X/57_:]6$@N1D`04
-M=(#PY)!P$_#E5O1P`P(3*0(3(I`0`.#U5Y`0`N#U6*/@]5GE6+1P'N59M#`9
-MD`4(X$0!\/V0!07@5/OP1`3P[53^D`4(\.3U3O5/=3K_=3S_K5>O5A(+D9`$
-M%'2`\.20<!/PY5;T8$N`0I!P$.`D_Y*3Y/VO5A(+D9`$%'2`\.20<!/PY5;T
-M8"J`(9!P$.`D_Y)*T@6M5Z]6$@N1D`04=(#PY)!P$_#E5O1@!Y!P)>!$`?`B
-M(N53<!HP8`FR33!-!`5&P@3E3T5.8`CE3Q5/<`(53B(BPD+3(C`4,)!P&>!5
-M)_^0<!C@3_4GD`(IX/^0<!G@_N]>D`(I\#!'!*\G@`3E)_3_D`(H[_#"%"+"
-M2\),Y402"IT3I0`4,P04+P@4#Q`3N2`3V6`3ZJ```!0UA4A#A4I"A4Q>Y4=D
-M!F`#`A0U@!OE2,14#_5#Y4K$5`_U0N5,Q%0/]5[E1V0&<&%30P^`7(5)0X5+
-M0H5-7N5'9`9P38`;Y4G$5`_U0^5+Q%0/]4+E3<14#_5>Y4=D!G`PY4-4#T00
-M]4.`)N5'9`1@!>5'M`4&0UX$=4()Y4>T!A#E0U0/1##U0X`&TDN``M),Y/4E
-MY4+$5/#_Y4-4#T_U7])@(M(5Y4<D]6`+),M@!R1`<`;"%2(2%X02%&K"%<*O
-MP@32KR+"KY`$%.!4#F`$TAB`".5.14\D_Y(8TJ^0!!3@HN22&70>\.5?5`_U
-M+>4E<!,P&`7E7R#E"S`9&>5?5##_OS`1Y25P!74E#(`"%272;-)M@`_E7S#F
-M!L)LTFV`!-)LPFWE1V0#<"$P2P;";-)M@!CE)7`#,$P1PDSE)7`%=24'@`(5
-M)=)LTFWE1[0)%.5$(.,+Y3ID`F`%Y3JT`P3";-)MY4>T"A/E.K0!!L)LTFV`
-M".4Z<`32;,)M(&D'Y5X@X`*R:"!K!^5>(.$"LFH@;0?E7B#B`K)L=2Y`(&D$
-MHFB`)C!H!N5&HN*`'>5>(.($?P&``G\`Y494\/Z^\`1^`8`"?@#N;R3_DG.2
-M<B!K!*)J@"8P:@;E1J+B@!WE7B#@!'\!@`)_`.5&5/#^OO`$?@&``GX`[F\D
-M_Y)UDG0@;02B;(`FY4=D"G`B,&P&Y4:BXX`7Y3JT`0;E1J+C@#3E1B#D`S#E
-M`].``<.`)C!L!N5&HN*`'>5>(.$$?P&``G\`Y494\/Z^\`1^`8`"?@#N;R3_
-MDG&2<)`0`."0$"SPD!`#X,.4,$`4HG&2=Z)PDG;E+A,35#_U+L)WTG:0$"_E
-M+O#E1V0&<#F0`BG@5/[PY4/$5`\48`PD_F`,)`-P$\(X@`_2.(`+Y48PX@/3
-M@`'#DC@P1P6O)P(7?N4G]/\"%W[E1V0'8`_E1V0(8`GE1V0)8`,"%OV0`BG@
-M5/SPY3H48"(48"448"TD_&!))/E@%"0.<%#E1A,35#]U\`.$Y?`D_X`ZTCG"
-M.(`^Y48PX@/3@!W#@!KE1C#B#50XPY0P4`9^`'\!@`1^`'\`[D\D_Y(XPCF`
-M$^5&,.(#TX`!PY(YPCB`!,(XPCDP1P2O)X`$Y2?T_P(7?N5'9`Q@!N5'9`MP
-M>I`"*>!4_?#E.A1@(!1@(11@*R3\8$4D^6`2)`YP2N5&$Q-4/W7P`X3E\(`I
-MTCF`.N5&,.(#TX`!PY(Y@"WE1C#B#50XPY0P4`9^`'\!@`1^`'\`[D\D_Y(Y
-M@`_E1C#B`].``<.2.8`"PCDP1P2O)X`$Y2?T_Y`"*._P(N5'M`L0D`(IX%3K
-M\.4G5.M%1?4G(N20`BGP,$<$KT6`!.5%]/^0`BCO\"*/4-)9(H]4TE@BY/5B
-MPJ_E411@2!1@9B0"8`,"&-326755`9`"HN!4?_"CX"#G(Y`$-."T`ARCX+0"
-M%Z/@M`(2?R`2%Z^0$`3@5//P=5$!`AC4Y5!P!G5B`P(8U)`2`.!4`W`2?R`2
-M%Z^0`J+@5+_P=5$"`AC4Y5!P`P(8SY`"H^`PY@,"&,N0!#?@9")@`P(8RY`!
-MBG1^\)`!EO"0$@1T"O#E6+1R%>59M#40Y)`%`/"C=`CPHW0!\'0#\'\!$@TJ
-MD!,HX)!P&O"0$RG@D'`;\)`3*.!4\/"CX%3P\.59M#44Y3ST8`:CX%3S@!20
-M$RK@5/OP@!3E//20$RI@".!4\D4\\(`$X%3Z\)`$`>!4_?!U8@%U50+D]5&`
-M">50<`5U8@/U4>5B8!7"`>3U4<)9K6*O0!(9E.5BM`,"T@/2KR+"KS`!$N20
-M`9;P]5'"6<(!?0*O0!(9E.52%&`,!&`#`AF1=5(!=54#D`0!X$0.\)!P&N"0
-M$RCPD'`;X)`3*?#E//1@".4\1`&C\(`&D!,J=`7PD!($=`/PY5BT<A;E6;0U
-M$9`%`'3B\*-T"/"C=`'P=`/P?P$2#2J0`J+@1,#PD!`$X$0,\.3U4O55,`()
-MP@)]`:]!$AF4,`,"P@/DD`&6\-*O(N_T8"WD_G04+O6"Y#1P]8/@M/\9=!0N
-M]8+D-'#U@^_P=!PN]8+D-'#U@^WP(@Z^!-4B(B*0<"K@,.%-PJ^0<"C@D!`<
-M\)!P*>"0$!WPD'`JX)`0'O"0$!S@]6*0$![@(.'SD!`<X)!P*/"0$!W@D'`I
-M\)`0'N"0<"KP,$H'D'`DX$0!\,(%TJ\B(B(`````````````````````````
+M____`A`H`A`R`A!]`A.[`A.\`A/;`A/@$A/<(@(8V@(:&@(5/`(4=S`%!B`-
+M`Q(:_R*0`8S@,.,@Y5@PX!#E3##@!']`@`)_`)`0+^_PD`&,=`CPY)`!I_"0
+M`8S@,.`<D`&`X+0"%:/@M`$0D`&$X+2!"9`!C'0!\!(-R"*0!!3@(.<#`A.Z
+MD'`2X/56D`0$X!(*G1#A,1#%-A$*4!%!41%*4A%*4Q%*5!&+51':5A(X<!)C
+M<1*1<A,\<Q-=@!.`D```$[J0<!'@]3SDD'`3\)`$%'2`\.56]'`#`A.Z`A.S
+M(`(#,`,=?0*O5A(+D9`$%'2`\.20<!/PY5;T<`,"$[H"$[.%5D'2`B*0<!#@
+M5'__OPH-D'`1X+0(!G5.`75/A)!P$.!4?_^_`A*0<!'@9`A@!."T(`9U3@-U
+M3R#D]2<BD'`1X"3_DD<BD`0$X"7@)%WU5Y!P$.#_=$<E5_C&[\:0<!'@_W1(
+M)5?XQN_&Y/VO5A(+D9`$%'2`\.20<!/PY5;T<`,"$[H"$[/E1V0'8!WE1V0(
+M8!?E1V0)8!'E1V0*8`OE1V0+8`7E1[0,")!P$>!4#_4ZY4>T"0CE.K0#`^3U
+M1N5'M`H(Y3JT`0/D]4;D_:]6$@N1T@0BD'`1X/3_D'`0X%__D'`1X%4G3Y!P
+M&/"0<!'@D'`9\.3]KU82"Y$P%032%(`FD'`8X/4GD`(IX/^0<!G@_N]>D`(I
+M\#!'!*\G@`3E)_3_D`(H[_#E5O1P`P(3N@(3LY!P$.#^D'`1X/WM^.;U5_VO
+M5A(+D9`$%'2`\.20<!/PY5;T<`,"$[H"$[.0<!#@_I!P$>#][?6"CH/@]5?]
+MKU82"Y&0!!1T@/#DD'`3\.56]'`#`A.Z`A.SD!``X/57Y/58]5F0$`/@M"@%
+M=5@!@#R0$`/@M#`%=5@"@#"0$`/@M#,%=5@$@"20$`/@M#4,D!`"X+1R!758
+M"(`1D!`#X+0U"I`0`N"TDP-U6!#E6##A&9`%".!$`?#]D`4%X%3[\$0$\.U4
+M_I`%"/#D]4[U3W4Z_W4\_ZU7KU82"Y'DD'`R\,(6]5SU6O5;D'`P\*/PD`04
+M=(#PY)!P$_#E5O1P`P(3NH!WD'`0X"3_DI/D_:]6$@N1D`04=(#PY)!P$_#E
+M5O1@7X!6D'`0X"3_DDK2!:U7KU82"Y&0!!1T@/#DD'`3\.56]&`\@#.0<!#@
+M)/^2%I!P$>#U7*U7KU82"Y&0!!1T@/"0<##E6O"CY5OPY/5:]5N0<!/PY5;T
+M8`>0<"7@1`'P(B+E4W`:,&`)LDTP300%1L($Y4]%3F`(Y4\53W`"%4XB(L)"
+MTR(P%#"0<!G@52?_D'`8X$_U)Y`"*>#_D'`9X/[O7I`"*?`P1P2O)X`$Y2?T
+M_Y`"*._PPA0P%F#"KY`0!.#U5Y`"*.!4!?57Y5QD`7`AY5>0$`0PX`;@5/OP
+M@`3@1`3PY5<PXC$%6^5;<"L%6H`GY5<PX!OE7)`0!'`&X%3[\(`$X$0$\`5;
+MY5MP"P5:@`>0$`3@1`3PTJ\BPDO"3.5$$@J=%)D`%2<$%2,(%0,0%*T@%,U@
+M%-Z@```5*85(0X5*0H5,7N5'9`9@`P(5*8`;Y4C$5`_U0^5*Q%0/]4+E3,14
+M#_5>Y4=D!G!A4T,/@%R%24.%2T*%35[E1V0&<$V`&^5)Q%0/]4/E2\14#_5"
+MY4W$5`_U7N5'9`9P,.5#5`]$$/5#@";E1V0$8`7E1[0%!D->!'5"">5'M`80
+MY4-4#T0P]4.`!M)+@`+23.3U)>5"Q%3P_^5#5`]/]5_28"+2%>5')/5@"R3+
+M8`<D0'`&PA4B$ABE$A5>PA7"K\($TJ\BPJ^0!!3@5`Y@!-(8@`CE3D5/)/^2
+M&-*OD`04X*+DDAET'O#E7U0/]2WE)7`3,!@%Y5\@Y0LP&1GE7U0P_[\P$>4E
+M<`5U)0R``A4ETFS2;8`/Y5\PY@;";-)M@`32;,)MY4=D`W`A,$L&PFS2;8`8
+MY25P`S!,$<),Y25P!74E!X`"%272;-)MY4>T"13E1"#C"^4Z9`)@!>4ZM`,$
+MPFS2;>5'M`H3Y3JT`0;";-)M@`CE.G`$TFS";2!I!^5>(.`"LF@@:P?E7B#A
+M`K)J(&T'Y5X@X@*R;'4N0"!I!*)H@"8P:`;E1J+B@!WE7B#@!'\!@`)_`.5&
+M5/#^OO`$?@&``GX`[F\D_Y)SDG(@:P2B:H`F,&H&Y4:BXH`=Y5X@X01_`8`"
+M?P#E1E3P_K[P!'X!@`)^`.YO)/^2=9)T(&T$HFR`)N5'9`IP(C!L!N5&HN.`
+M%^4ZM`$&Y4:BXX`TY48@Y`,PY0/3@`'#@"8P;`;E1J+B@!WE7B#B!'\!@`)_
+M`.5&5/#^OO`$?@&``GX`[F\D_Y)QDG"0$`#@D!`L\)`0`^##E#!`%*)QDG>B
+M<))VY2X3$U0_]2["=])VD!`OY2[PY4=D!G!'D`(HX#!'`_^``O3_CR>0`BG@
+M5/[PY4/$5`\48`PD_F`,)`-P$\(X@`_2.(`+Y48PX@/3@`'#DC@P1P6O)P(8
+MG^4G]/\"&)_E1V0'8`_E1V0(8`GE1V0)8`,"&`V0`BC@,$<#_X`"]/^/)Y`"
+M*>!4_/#E.A1@(A1@)11@+23\8$DD^6`4)`YP4.5&$Q-4/W7P`X3E\"3_@#K2
+M.<(X@#[E1C#B`].`'<.`&N5&,.(-5#C#E#!0!GX`?P&`!'X`?P#N3R3_DCC"
+M.8`3Y48PX@/3@`'#DCG".(`$PCC".3!'!*\G@`3E)_3_`AB?Y4=D#&`)Y4=D
+M"V`#`ABDD`(HX#!'`_^``O3_CR>0`BG@5/WPY3H48"`48"$48"LD_&!%)/E@
+M$B0.<$KE1A,35#]U\`.$Y?"`*=(Y@#KE1C#B`].``<.2.8`MY48PX@U4.,.4
+M,%`&?@!_`8`$?@!_`.Y/)/^2.8`/Y48PX@/3@`'#DCF``L(Y,$<$KR>`!.4G
+M]/^0`BCO\"+E1[0+$)`"*>!4Z_#E)U3K147U)R+DD`(I\#!'!*]%@`3E1?3_
+MD`(H[_`BCU#262*/5-)8(N3U8L*OY5$48$@48&8D`F`#`AG^TEEU50&0`J+@
+M5'_PH^`@YR.0!#3@M`(<H^"T`A>CX+0"$G\@$AC0D!`$X%3S\'51`0(9_N50
+M<`9U8@,"&?Z0$@#@5`-P$G\@$AC0D`*BX%2_\'51`@(9_N50<`,"&?F0`J/@
+M,.8#`AGUD`0WX&0B8`,"&?60`8IT?O"0`9;PD!($=`KPY5@PXQ7DD`4`\*-T
+M"/"C=`'P=`/P?P$2#2J0$RC@D'`:\)`3*>"0<!OPD!,KX)!P(O"0$RC@5/#P
+MH^!4\/"0$RO@5,SPY5@PXQ/E//20$RI@!>!4\X`1X%3[\(`4Y3STD!,J8`C@
+M5/)%//"`!.!4^O"0!`'@5/WP=6(!=54"Y/51@`GE4'`%=6(#]5'E8F`5P@'D
+M]5'"6:UBKT`2&LOE8K0#`M(#TJ\BPJ\P`1+DD`&6\/51PEG"`7T"KT`2&LOE
+M4A1@#`1@`P(:R'52`755`Y`$`>!$#O#E6%088!Z0<!K@D!,H\)!P&^"0$RGP
+MHW0%\)!P(N"0$ROP@!&0$RC@1`_PH^!$#_"CX$0%\)`2!'0#\.58,.,6D`4`
+M=.+PHW0(\*-T`?!T`_!_`1(-*I`"HN!$P/"0$`3@1`SPY/52]54P`@G"`GT!
+MKT$2&LLP`P+"`^20`9;PTJ\B[_1@+>3^=!0N]8+D-'#U@^"T_QET%"[U@N0T
+M</6#[_!T'"[U@N0T</6#[?`B#KX$U2(B(I!P*N`PX4W"KY!P*."0$!SPD'`I
+MX)`0'?"0<"K@D!`>\)`0'.#U8I`0'N`@X?.0$!S@D'`H\)`0'>"0<"GPD!`>
+MX)!P*O`P2@>0<"3@1`'PP@72KR(B(@``````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
@@ -128,6 +135,72 @@ M```````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
+M`````````````````````````````````````````````````````````.SQ
+M2O___P(0*`(0,@(0?0(3NP(3O`(3VP(3X!(3W"("&-H"&AH"%3P"%'<P!08@
+M#0,2&O\BD`&,X##C(.58,.`0Y4PPX`1_0(`"?P"0$"_O\)`!C'0(\.20`:?P
+MD`&,X##@')`!@."T`A6CX+0!$)`!A."T@0F0`8QT`?`2#=TBD`04X"#G`P(3
+MNI!P$N#U5I`$!.`2"K80X3$0Q381"E`105$12E(12E,12E01BU41VE82.'`2
+M8W$2D7(3/',378`3@)```!.ZD'`1X/4\Y)!P$_"0!!1T@/#E5O1P`P(3N@(3
+MLR`"`S`#'7T"KU82"ZJ0!!1T@/#DD'`3\.56]'`#`A.Z`A.SA59!T@(BD'`0
+MX%1__[\*#9!P$>"T"`9U3@%U3X20<!#@5'__OP(2D'`1X&0(8`3@M"`&=4X#
+M=4\@Y/4G(I!P$>`D_Y)'(I`$!.`EX"1=]5>0<!#@_W1')5?XQN_&D'`1X/]T
+M2"57^,;OQN3]KU82"ZJ0!!1T@/#DD'`3\.56]'`#`A.Z`A.SY4=D!V`=Y4=D
+M"&`7Y4=D"6`1Y4=D"F`+Y4=D"V`%Y4>T#`B0<!'@5`_U.N5'M`D(Y3JT`P/D
+M]4;E1[0*".4ZM`$#Y/5&Y/VO5A(+JM($(I!P$>#T_Y!P$.!?_Y!P$>!5)T^0
+M<!CPD'`1X)!P&?#D_:]6$@NJ,!4$TA2`)I!P&.#U)Y`"*>#_D'`9X/[O7I`"
+M*?`P1P2O)X`$Y2?T_Y`"*._PY5;T<`,"$[H"$[.0<!#@_I!P$>#][?CF]5?]
+MKU82"ZJ0!!1T@/#DD'`3\.56]'`#`A.Z`A.SD'`0X/Z0<!'@_>WU@HZ#X/57
+M_:]6$@NJD`04=(#PY)!P$_#E5O1P`P(3N@(3LY`0`.#U5^3U6/59D!`#X+0H
+M!758`8`\D!`#X+0P!758`H`PD!`#X+0S!758!(`DD!`#X+0U#)`0`N"T<@5U
+M6`B`$9`0`^"T-0J0$`+@M),#=5@0Y5@PX1F0!0C@1`'P_9`%!>!4^_!$!/#M
+M5/Z0!0CPY/5.]4]U.O]U//^M5Z]6$@NJY)!P,O#"%O5<]5KU6Y!P,/"C\)`$
+M%'2`\.20<!/PY5;T<`,"$[J`=Y!P$.`D_Y*3Y/VO5A(+JI`$%'2`\.20<!/P
+MY5;T8%^`5I!P$.`D_Y)*T@6M5Z]6$@NJD`04=(#PY)!P$_#E5O1@/(`SD'`0
+MX"3_DA:0<!'@]5RM5Z]6$@NJD`04=(#PD'`PY5KPH^5;\.3U6O5;D'`3\.56
+M]&`'D'`EX$0!\"(BY5-P&C!@";)-,$T$!4;"!.5/14Y@".5/%4]P`A5.(B+"
+M0M,B,!0PD'`9X%4G_Y!P&.!/]2>0`BG@_Y!P&>#^[UZ0`BGP,$<$KR>`!.4G
+M]/^0`BCO\,(4,!9@PJ^0$`3@]5>0`BC@5`7U5^5<9`%P(>57D!`$,.`&X%3[
+M\(`$X$0$\.57,.(Q!5OE6W`K!5J`)^57,.`;Y5R0$`1P!N!4^_"`!.!$!/`%
+M6^5;<`L%6H`'D!`$X$0$\-*O(L)+PDSE1!(*MA29`!4G!!4C"!4#$!2M(!3-
+M8!3>H```%2F%2$.%2D*%3%[E1V0&8`,"%2F`&^5(Q%0/]4/E2L14#_5"Y4S$
+M5`_U7N5'9`9P85-##X!<A4E#A4M"A4U>Y4=D!G!-@!OE2<14#_5#Y4O$5`_U
+M0N5-Q%0/]5[E1V0&<##E0U0/1!#U0X`FY4=D!&`%Y4>T!09#7@1U0@GE1[0&
+M$.5#5`]$,/5#@`;22X`"TDSD]27E0L14\/_E0U0/3_5?TF`BTA7E1R3U8`LD
+MRV`')$!P!L(5(A(8I1(57L(5PJ_"!-*O(L*OD`04X%0.8`32&(`(Y4Y%3R3_
+MDAC2KY`$%."BY)(9=![PY5]4#_4MY25P$S`8!>5?(.4+,!D9Y5]4,/^_,!'E
+M)7`%=24,@`(5)=)LTFV`#^5?,.8&PFS2;8`$TFS";>5'9`-P(3!+!L)LTFV`
+M&.4E<`,P3!'"3.4E<`5U)0>``A4ETFS2;>5'M`D4Y40@XPOE.F0"8`7E.K0#
+M!,)LTFWE1[0*$^4ZM`$&PFS2;8`(Y3IP!-)LPFT@:0?E7B#@`K)H(&L'Y5X@
+MX0*R:B!M!^5>(.("LFQU+D`@:02B:(`F,&@&Y4:BXH`=Y5X@X`1_`8`"?P#E
+M1E3P_K[P!'X!@`)^`.YO)/^2<Y)R(&L$HFJ`)C!J!N5&HN*`'>5>(.$$?P&`
+M`G\`Y494\/Z^\`1^`8`"?@#N;R3_DG62="!M!*)L@";E1V0*<"(P;`;E1J+C
+M@!?E.K0!!N5&HN.`-.5&(.0#,.4#TX`!PX`F,&P&Y4:BXH`=Y5X@X@1_`8`"
+M?P#E1E3P_K[P!'X!@`)^`.YO)/^2<9)PD!``X)`0+/"0$`/@PY0P0!2B<9)W
+MHG"2=N4N$Q-4/_4NPG?2=I`0+^4N\.5'9`9P1Y`"*.`P1P/_@`+T_X\GD`(I
+MX%3^\.5#Q%0/%&`,)/Y@#"0#<!/".(`/TCB`"^5&,.(#TX`!PY(X,$<%KR<"
+M&)_E)_3_`AB?Y4=D!V`/Y4=D"&`)Y4=D"6`#`A@-D`(HX#!'`_^``O3_CR>0
+M`BG@5/SPY3H48"(48"448"TD_&!))/E@%"0.<%#E1A,35#]U\`.$Y?`D_X`Z
+MTCG".(`^Y48PX@/3@!W#@!KE1C#B#50XPY0P4`9^`'\!@`1^`'\`[D\D_Y(X
+MPCF`$^5&,.(#TX`!PY(YPCB`!,(XPCDP1P2O)X`$Y2?T_P(8G^5'9`Q@">5'
+M9`M@`P(8I)`"*.`P1P/_@`+T_X\GD`(IX%3]\.4Z%&`@%&`A%&`K)/Q@123Y
+M8!(D#G!*Y483$U0_=?`#A.7P@"G2.8`ZY48PX@/3@`'#DCF`+>5&,.(-5#C#
+ME#!0!GX`?P&`!'X`?P#N3R3_DCF`#^5&,.(#TX`!PY(Y@`+".3!'!*\G@`3E
+M)_3_D`(H[_`BY4>T"Q"0`BG@5.OPY2=4ZT5%]2<BY)`"*?`P1P2O18`$Y47T
+M_Y`"*._P(H]0TEDBCU326"+D]6+"K^51%&!(%&!F)`)@`P(9_M)9=54!D`*B
+MX%1_\*/@(.<CD`0TX+0"'*/@M`(7H^"T`A)_(!(8T)`0!.!4\_!U40$"&?[E
+M4'`&=6(#`AG^D!(`X%0#<!)_(!(8T)`"HN!4O_!U40("&?[E4'`#`AGYD`*C
+MX##F`P(9]9`$-^!D(F`#`AGUD`&*='[PD`&6\)`2!'0*\.58,.,5Y)`%`/"C
+M=`CPHW0!\'0#\'\!$@U(D!,HX)!P&O"0$RG@D'`;\)`3*^"0<"+PD!,HX%3P
+M\*/@5/#PD!,KX%3,\.58,.,3Y3STD!,J8`7@5/.`$>!4^_"`%.4\])`3*F`(
+MX%3R13SP@`3@5/KPD`0!X%3]\'5B`755`N3U48`)Y5!P!75B`_51Y6)@%<(!
+MY/51PEFM8J]`$AK+Y6*T`P+2`]*O(L*O,`$2Y)`!EO#U4<)9P@%]`J]`$AK+
+MY5(48`P$8`,"&LAU4@%U50.0!`'@1`[PY5A4&&`>D'`:X)`3*/"0<!O@D!,I
+M\*-T!?"0<"+@D!,K\(`1D!,HX$0/\*/@1`_PH^!$!?"0$@1T`_#E6##C%I`%
+M`'3B\*-T"/"C=`'P=`/P?P$2#4B0`J+@1,#PD!`$X$0,\.3U4O55,`()P@)]
+M`:]!$AK+,`,"P@/DD`&6\-*O(N_T8"WD_G04+O6"Y#1P]8/@M/\9=!0N]8+D
+M-'#U@^_P=!PN]8+D-'#U@^WP(@Z^!-4B(B*0<"K@,.%-PJ^0<"C@D!`<\)!P
+M*>"0$!WPD'`JX)`0'O"0$!S@]6*0$![@(.'SD!`<X)!P*/"0$!W@D'`I\)`0
+M'N"0<"KP,$H'D'`DX$0!\,(%TJ\B(B(`````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
@@ -135,65 +208,6 @@ M```````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
-M`````````````````````````````````````````````````````````!'"
-M>O___P(0*`(0,@(0>`(3*@(3*P(32@(33Q(32R("%[D"&/`"%$@"$X,P!08@
-M#0,2&<@BD`&,X##C&^5,,.`$?T"``G\`D!`O[_"0`8QT"/#DD`&G\)`!C.`P
-MX!R0`8#@M`(5H^"T`1"0`83@M($)D`&,=`'P$@W=(I`$%.`@YP,"$RF0<!+@
-M]5:0!`3@$@JV$-DQ$+TV$0)0$3E1$4)2$4)3$4)4$8-5$=)6$C!P$EMQ$HER
-M$N!S$P&````3*9!P$>#U/.20<!/PD`04=(#PY5;T<`,"$RD"$R(@`@,P`QU]
-M`J]6$@NJD`04=(#PY)!P$_#E5O1P`P(3*0(3(H560=("(I!P$.!4?_^_"@V0
-M<!'@M`@&=4X!=4^$D'`0X%1__[\"$I!P$>!D"&`$X+0@!G5.`W5/(.3U)R*0
-M<!'@)/^21R*0!`3@)>`D7?57D'`0X/]T1R57^,;OQI!P$>#_=$@E5_C&[\;D
-M_:]6$@NJD`04=(#PY)!P$_#E5O1P`P(3*0(3(N5'9`=@'>5'9`A@%^5'9`E@
-M$>5'9`I@"^5'9`M@!>5'M`P(D'`1X%0/]3KE1[0)".4ZM`,#Y/5&Y4>T"@CE
-M.K0!`^3U1N3]KU82"ZK2!"*0<!'@]/^0<!#@7_^0<!'@52=/D'`8\)!P$>"0
-M<!GPY/VO5A(+JC`5!-(4@":0<!C@]2>0`BG@_Y!P&>#^[UZ0`BGP,$<$KR>`
-M!.4G]/^0`BCO\.56]'`#`A,I`A,BD'`0X/Z0<!'@_>WXYO57_:]6$@NJD`04
-M=(#PY)!P$_#E5O1P`P(3*0(3(I!P$.#^D'`1X/WM]8*.@^#U5_VO5A(+JI`$
-M%'2`\.20<!/PY5;T<`,"$RD"$R*0$`#@]5>0$`+@]5BCX/59Y5BT<![E6;0P
-M&9`%".!$`?#]D`4%X%3[\$0$\.U4_I`%"/#D]4[U3W4Z_W4\_ZU7KU82"ZJ0
-M!!1T@/#DD'`3\.56]&!+@$*0<!#@)/^2D^3]KU82"ZJ0!!1T@/#DD'`3\.56
-M]&`J@"&0<!#@)/^22M(%K5>O5A(+JI`$%'2`\.20<!/PY5;T8`>0<"7@1`'P
-M(B+E4W`:,&`)LDTP300%1L($Y4]%3F`(Y4\53W`"%4XB(L)"TR(P%#"0<!G@
-M52?_D'`8X$_U)Y`"*>#_D'`9X/[O7I`"*?`P1P2O)X`$Y2?T_Y`"*._PPA0B
-MPDO"3.5$$@JV$Z4`%#,$%"\(%`\0$[D@$]E@$^J@```4-85(0X5*0H5,7N5'
-M9`9@`P(4-8`;Y4C$5`_U0^5*Q%0/]4+E3,14#_5>Y4=D!G!A4T,/@%R%24.%
-M2T*%35[E1V0&<$V`&^5)Q%0/]4/E2\14#_5"Y4W$5`_U7N5'9`9P,.5#5`]$
-M$/5#@";E1V0$8`7E1[0%!D->!'5"">5'M`80Y4-4#T0P]4.`!M)+@`+23.3U
-M)>5"Q%3P_^5#5`]/]5_28"+2%>5')/5@"R3+8`<D0'`&PA4B$A>$$A1JPA7"
-MK\($TJ\BPJ^0!!3@5`Y@!-(8@`CE3D5/)/^2&-*OD`04X*+DDAET'O#E7U0/
-M]2WE)7`3,!@%Y5\@Y0LP&1GE7U0P_[\P$>4E<`5U)0R``A4ETFS2;8`/Y5\P
-MY@;";-)M@`32;,)MY4=D`W`A,$L&PFS2;8`8Y25P`S!,$<),Y25P!74E!X`"
-M%272;-)MY4>T"13E1"#C"^4Z9`)@!>4ZM`,$PFS2;>5'M`H3Y3JT`0;";-)M
-M@`CE.G`$TFS";2!I!^5>(.`"LF@@:P?E7B#A`K)J(&T'Y5X@X@*R;'4N0"!I
-M!*)H@"8P:`;E1J+B@!WE7B#B!'\!@`)_`.5&5/#^OO`$?@&``GX`[F\D_Y)S
-MDG(@:P2B:H`F,&H&Y4:BXH`=Y5X@X`1_`8`"?P#E1E3P_K[P!'X!@`)^`.YO
-M)/^2=9)T(&T$HFR`)N5'9`IP(C!L!N5&HN.`%^4ZM`$&Y4:BXX`TY48@Y`,P
-MY0/3@`'#@"8P;`;E1J+B@!WE7B#A!'\!@`)_`.5&5/#^OO`$?@&``GX`[F\D
-M_Y)QDG"0$`#@D!`L\)`0`^##E#!`%*)QDG>B<))VY2X3$U0_]2["=])VD!`O
-MY2[PY4=D!G`YD`(IX%3^\.5#Q%0/%&`,)/Y@#"0#<!/".(`/TCB`"^5&,.(#
-MTX`!PY(X,$<%KR<"%W[E)_3_`A=^Y4=D!V`/Y4=D"&`)Y4=D"6`#`A;]D`(I
-MX%3\\.4Z%&`B%&`E%&`M)/Q@223Y8!0D#G!0Y483$U0_=?`#A.7P)/^`.M(Y
-MPCB`/N5&,.(#TX`=PX`:Y48PX@U4.,.4,%`&?@!_`8`$?@!_`.Y/)/^2.,(Y
-M@!/E1C#B`].``<.2.<(X@`3".,(Y,$<$KR>`!.4G]/\"%W[E1V0,8`;E1V0+
-M<'J0`BG@5/WPY3H48"`48"$48"LD_&!%)/E@$B0.<$KE1A,35#]U\`.$Y?"`
-M*=(Y@#KE1C#B`].``<.2.8`MY48PX@U4.,.4,%`&?@!_`8`$?@!_`.Y/)/^2
-M.8`/Y48PX@/3@`'#DCF``L(Y,$<$KR>`!.4G]/^0`BCO\"+E1[0+$)`"*>!4
-MZ_#E)U3K147U)R+DD`(I\#!'!*]%@`3E1?3_D`(H[_`BCU#262*/5-)8(N3U
-M8L*OY5$48$@48&8D`F`#`AC4TEEU50&0`J+@5'_PH^`@YR.0!#3@M`(<H^"T
-M`A>CX+0"$G\@$A>OD!`$X%3S\'51`0(8U.50<`9U8@,"&-20$@#@5`-P$G\@
-M$A>OD`*BX%2_\'51`@(8U.50<`,"&,^0`J/@,.8#`AC+D`0WX&0B8`,"&,N0
-M`8IT?O"0`9;PD!($=`KPY5BT<A7E6;0U$.20!0#PHW0(\*-T`?!T`_!_`1(-
-M2)`3*."0<!KPD!,IX)!P&_"0$RC@5/#PH^!4\/#E6;0U%.4\]&`&H^!4\X`4
-MD!,JX%3[\(`4Y3STD!,J8`C@5/)%//"`!.!4^O"0!`'@5/WP=6(!=54"Y/51
-M@`GE4'`%=6(#]5'E8F`5P@'D]5'"6:UBKT`2&93E8K0#`M(#TJ\BPJ\P`1+D
-MD`&6\/51PEG"`7T"KT`2&93E4A1@#`1@`P(9D752`755`Y`$`>!$#O"0<!K@
-MD!,H\)!P&^"0$RGPY3ST8`CE/$0!H_"`!I`3*G0%\)`2!'0#\.58M'(6Y5FT
-M-1&0!0!TXO"C=`CPHW0!\'0#\'\!$@U(D`*BX$3`\)`0!.!$#/#D]5+U53`"
-M"<("?0&O01(9E#`#`L(#Y)`!EO#2KR+O]&`MY/YT%"[U@N0T</6#X+3_&704
-M+O6"Y#1P]8/O\'0<+O6"Y#1P]8/M\"(.O@35(B(BD'`JX##A3<*OD'`HX)`0
-M'/"0<"G@D!`=\)!P*N"0$![PD!`<X/5BD!`>X"#A\Y`0'."0<"CPD!`=X)!P
-M*?"0$![@D'`J\#!*!Y!P).!$`?#"!=*O(B(B````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
@@ -212,21 +226,7 @@ M```````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M```````````````````````````````````````````````````````````1
-"=X$`
+M``````````````````````````````````````````````````````````#L
+"*=(`
 `
 end

From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 16:26:27 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 622021065670;
	Sun,  8 Apr 2012 16:26:27 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D6B48FC0C;
	Sun,  8 Apr 2012 16:26:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q38GQR9w019426;
	Sun, 8 Apr 2012 16:26:27 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38GQRJk019424;
	Sun, 8 Apr 2012 16:26:27 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201204081626.q38GQRJk019424@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 8 Apr 2012 16:26:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234037 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 16:26:27 -0000

Author: pho
Date: Sun Apr  8 16:26:26 2012
New Revision: 234037
URL: http://svn.freebsd.org/changeset/base/234037

Log:
  MFC: r232860
  
  Allways call fdrop().

Modified:
  stable/9/sys/kern/sys_capability.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/sys_capability.c
==============================================================================
--- stable/9/sys/kern/sys_capability.c	Sun Apr  8 13:44:55 2012	(r234036)
+++ stable/9/sys/kern/sys_capability.c	Sun Apr  8 16:26:26 2012	(r234037)
@@ -253,16 +253,14 @@ sys_cap_new(struct thread *td, struct ca
 		return (error);
 	AUDIT_ARG_FILE(td->td_proc, fp);
 	error = kern_capwrap(td, fp, rights, &capfd);
-	if (error)
-		return (error);
-
 	/*
 	 * Release our reference to the file (kern_capwrap has held a reference
 	 * for the filedesc array).
 	 */
 	fdrop(fp, td);
-	td->td_retval[0] = capfd;
-	return (0);
+	if (error == 0)
+		td->td_retval[0] = capfd;
+	return (error);
 }
 
 /*

From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 20:40:26 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BB24D1065670;
	Sun,  8 Apr 2012 20:40:26 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B1858FC08;
	Sun,  8 Apr 2012 20:40:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q38KeQWu027305;
	Sun, 8 Apr 2012 20:40:26 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38KeQ0s027301;
	Sun, 8 Apr 2012 20:40:26 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201204082040.q38KeQ0s027301@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Sun, 8 Apr 2012 20:40:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234041 - stable/9/sys/dev/hwpmc
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 20:40:26 -0000

Author: davide
Date: Sun Apr  8 20:40:26 2012
New Revision: 234041
URL: http://svn.freebsd.org/changeset/base/234041

Log:
  MFC: r229469
  
  Add missing MSR programming for some events.
  
  Submitted by:	me
  Approved by:	gnn (mentor)

Modified:
  stable/9/sys/dev/hwpmc/hwpmc_uncore.c
  stable/9/sys/dev/hwpmc/hwpmc_uncore.h
  stable/9/sys/dev/hwpmc/pmc_events.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/hwpmc/hwpmc_uncore.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_uncore.c	Sun Apr  8 19:58:38 2012	(r234040)
+++ stable/9/sys/dev/hwpmc/hwpmc_uncore.c	Sun Apr  8 20:40:26 2012	(r234041)
@@ -545,8 +545,14 @@ static struct ucp_event_descr ucp_events
 
     UCPDESCR(0CH_01H, 0x0C, 0x01, UCP_F_FM | UCP_F_WM),
     UCPDESCR(0CH_02H, 0x0C, 0x02, UCP_F_FM | UCP_F_WM),
-    UCPDESCR(0CH_04H, 0x0C, 0x04, UCP_F_FM | UCP_F_WM),
-    UCPDESCR(0CH_08H, 0x0C, 0x08, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_04H_E, 0x0C, 0x04, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_04H_F, 0x0C, 0x04, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_04H_M, 0x0C, 0x04, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_04H_S, 0x0C, 0x04, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_08H_E, 0x0C, 0x08, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_08H_F, 0x0C, 0x08, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_08H_M, 0x0C, 0x08, UCP_F_FM | UCP_F_WM),
+    UCPDESCR(0CH_08H_S, 0x0C, 0x08, UCP_F_FM | UCP_F_WM),
 
     UCPDESCR(20H_01H, 0x20, 0x01, UCP_F_FM | UCP_F_I7 | UCP_F_WM),
     UCPDESCR(20H_02H, 0x20, 0x02, UCP_F_FM | UCP_F_I7 | UCP_F_WM),
@@ -965,6 +971,36 @@ ucp_start_pmc(int cpu, int ri)
 	PMCDBG(MDP,STA,2, "ucp-start/2 cpu=%d ri=%d evselmsr=0x%x evsel=0x%x",
 	    cpu, ri, UCP_EVSEL0 + ri, evsel);
 
+	/* Event specific configuration. */
+	switch (pm->pm_event) {
+	case PMC_EV_UCP_EVENT_0CH_04H_E:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x2);
+		break;
+	case PMC_EV_UCP_EVENT_0CH_04H_F:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x8);
+		break;
+	case PMC_EV_UCP_EVENT_0CH_04H_M:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x1);
+		break;
+	case PMC_EV_UCP_EVENT_0CH_04H_S:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x4);
+		break;
+	case PMC_EV_UCP_EVENT_0CH_08H_E:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x2);
+		break;
+	case PMC_EV_UCP_EVENT_0CH_08H_F:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x8);
+		break;	
+	case PMC_EV_UCP_EVENT_0CH_08H_M:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x1);
+		break;
+	case PMC_EV_UCP_EVENT_0CH_08H_S:
+		wrmsr(MSR_GQ_SNOOP_MESF,0x4);
+		break;
+	default:	
+		break;
+	}
+
 	wrmsr(UCP_EVSEL0 + ri, evsel);
 
 	do {

Modified: stable/9/sys/dev/hwpmc/hwpmc_uncore.h
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_uncore.h	Sun Apr  8 19:58:38 2012	(r234040)
+++ stable/9/sys/dev/hwpmc/hwpmc_uncore.h	Sun Apr  8 20:40:26 2012	(r234041)
@@ -87,11 +87,18 @@ struct pmc_md_ucp_op_pmcallocate {
 #define	UC_GLOBAL_CTRL				0x391
 #define	UC_GLOBAL_OVF_CTRL			0x393
 
+
 #define	UC_GLOBAL_STATUS_FLAG_CLRCHG		(1ULL << 63)
 #define	UC_GLOBAL_STATUS_FLAG_OVFPMI		(1ULL << 61)
 #define	UC_GLOBAL_CTRL_FLAG_FRZ			(1ULL << 63)
 #define	UC_GLOBAL_CTRL_FLAG_ENPMICORE0		(1ULL << 48)
 
+/*
+ * Model specific registers.
+ */
+
+#define MSR_GQ_SNOOP_MESF			0x301
+
 struct pmc_md_ucf_pmc {
 	uint64_t	pm_ucf_ctrl;
 };

Modified: stable/9/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- stable/9/sys/dev/hwpmc/pmc_events.h	Sun Apr  8 19:58:38 2012	(r234040)
+++ stable/9/sys/dev/hwpmc/pmc_events.h	Sun Apr  8 20:40:26 2012	(r234041)
@@ -2388,8 +2388,14 @@ __PMC_EV(UCP, EVENT_0BH_10H)			\
 __PMC_EV(UCP, EVENT_0BH_1FH)			\
 __PMC_EV(UCP, EVENT_0CH_01H)			\
 __PMC_EV(UCP, EVENT_0CH_02H)			\
-__PMC_EV(UCP, EVENT_0CH_04H)			\
-__PMC_EV(UCP, EVENT_0CH_08H)			\
+__PMC_EV(UCP, EVENT_0CH_04H_E)			\
+__PMC_EV(UCP, EVENT_0CH_04H_F)			\
+__PMC_EV(UCP, EVENT_0CH_04H_M)			\
+__PMC_EV(UCP, EVENT_0CH_04H_S)			\
+__PMC_EV(UCP, EVENT_0CH_08H_E)			\
+__PMC_EV(UCP, EVENT_0CH_08H_F)			\
+__PMC_EV(UCP, EVENT_0CH_08H_M)			\
+__PMC_EV(UCP, EVENT_0CH_08H_S)			\
 __PMC_EV(UCP, EVENT_20H_01H)			\
 __PMC_EV(UCP, EVENT_20H_02H)			\
 __PMC_EV(UCP, EVENT_20H_04H)			\
@@ -2789,8 +2795,14 @@ __PMC_EV_ALIAS("L3_LINES_OUT.F_STATE", U
 __PMC_EV_ALIAS("L3_LINES_OUT.ANY", UCP_EVENT_0BH_1FH)	\
 __PMC_EV_ALIAS("GQ_SNOOP.GOTO_S", UCP_EVENT_0CH_01H)	\
 __PMC_EV_ALIAS("GQ_SNOOP.GOTO_I", UCP_EVENT_0CH_02H)	\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT", UCP_EVENT_0CH_04H)	\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT", UCP_EVENT_0CH_08H)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_E", UCP_EVENT_0CH_04H_E)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_F", UCP_EVENT_0CH_04H_F)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_M", UCP_EVENT_0CH_04H_M)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_S", UCP_EVENT_0CH_04H_S)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_E", UCP_EVENT_0CH_08H_E)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_F", UCP_EVENT_0CH_08H_F)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_M", UCP_EVENT_0CH_08H_M)	\
+__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_S", UCP_EVENT_0CH_08H_S)	\
 __PMC_EV_ALIAS("QHL_REQUESTS.IOH_READS", UCP_EVENT_20H_01H)	\
 __PMC_EV_ALIAS("QHL_REQUESTS.IOH_WRITES", UCP_EVENT_20H_02H)	\
 __PMC_EV_ALIAS("QHL_REQUESTS.REMOTE_READS", UCP_EVENT_20H_04H)	\

From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 20:51:38 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 03C171065673;
	Sun,  8 Apr 2012 20:51:38 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE4548FC15;
	Sun,  8 Apr 2012 20:51:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q38KpbKO027851;
	Sun, 8 Apr 2012 20:51:37 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38Kpbt1027847;
	Sun, 8 Apr 2012 20:51:37 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201204082051.q38Kpbt1027847@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Sun, 8 Apr 2012 20:51:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234044 - in stable/9: lib/libpmc sys/dev/hwpmc
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 20:51:38 -0000

Author: davide
Date: Sun Apr  8 20:51:37 2012
New Revision: 234044
URL: http://svn.freebsd.org/changeset/base/234044

Log:
  MFC: r229470
  
  Update PMC events from October 2011 Intel documentation.
  
  Approved by:	gnn (mentor)

Modified:
  stable/9/lib/libpmc/pmc.corei7.3
  stable/9/sys/dev/hwpmc/hwpmc_core.c
  stable/9/sys/dev/hwpmc/pmc_events.h
Directory Properties:
  stable/9/lib/libpmc/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/lib/libpmc/pmc.corei7.3
==============================================================================
--- stable/9/lib/libpmc/pmc.corei7.3	Sun Apr  8 20:48:39 2012	(r234043)
+++ stable/9/lib/libpmc/pmc.corei7.3	Sun Apr  8 20:51:37 2012	(r234044)
@@ -200,10 +200,6 @@ Number of cache load STLB hits
 .Pq Event 08H , Umask 20H
 Number of DTLB cache load misses where the low part of the linear to
 physical address translation was missed.
-.It Li DTLB_LOAD_MISSES.PDP_MISS
-.Pq Event 08H , Umask 40H
-Number of DTLB cache load misses where the high part of the linear to
-physical address translation was missed.
 .It Li DTLB_LOAD_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 08H , Umask 80H
 Counts number of completed large page walks due to load miss in the STLB.
@@ -646,10 +642,6 @@ Counter 0, 1 only
 Counts all data reads and writes (speculated and retired) from cacheable
 memory, including locked operations.
 Counter 0, 1 only
-.It Li L1D_PEND_MISS.LOAD_BUFFERS_FULL
-.Pq Event 48H , Umask 02H
-Counts cycles of L1 data cache load fill buffers full.
-Counter 0, 1 only
 .It Li DTLB_MISSES.ANY
 .Pq Event 49H , Umask 01H
 Counts the number of misses in the STLB which causes a page walk.
@@ -660,6 +652,12 @@ Counts number of misses in the STLB whic
 .Pq Event 49H , Umask 10H
 Counts the number of DTLB first level misses that hit in the second level
 TLB. This event is only relevant if the core contains multiple DTLB levels.
+.It Li DTLB_MISSES.PDE_MISS
+.Pq Event 49H , Umask 20H
+Number of DTLB misses caused by low part of address, includes references to 2M pages because 2M pages do not use the PDE.
+.It Li DTLB_MISSES.LARGE_WALK_COMPLETED
+.Pq Event 49H , Umask 80H
+Counts number of misses in the STLB which resulted in a completed page walk for large pages.
 .It Li LOAD_HIT_PRE
 .Pq Event 4CH , Umask 01H
 Counts load operations sent to the L1 data cache while a previous SSE
@@ -1205,9 +1203,6 @@ The BPU clear leads to 2 cycle bubble in
 .Pq Event E8H , Umask 02H
 Counts late Branch Prediction Unit clears due to Most Recently Used
 conflicts. The PBU clear leads to a 3 cycle bubble in the Front End.
-.It Li BPU_CLEARS.ANY
-.Pq Event E8H , Umask 03H
-Counts all BPU clears.
 .It Li L2_TRANSACTIONS.LOAD
 .Pq Event F0H , Umask 01H
 Counts L2 load operations due to HW prefetch or demand loads.

Modified: stable/9/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_core.c	Sun Apr  8 20:48:39 2012	(r234043)
+++ stable/9/sys/dev/hwpmc/hwpmc_core.c	Sun Apr  8 20:51:37 2012	(r234044)
@@ -642,7 +642,7 @@ static struct iap_event_descr iap_events
     IAPDESCR(08H_09H, 0x08, 0x09, IAP_F_FM | IAP_F_CA),
     IAPDESCR(08H_10H, 0x08, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
     IAPDESCR(08H_20H, 0x08, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
-    IAPDESCR(08H_40H, 0x08, 0x40, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(08H_40H, 0x08, 0x40, IAP_F_FM | IAP_F_I7O),
     IAPDESCR(08H_80H, 0x08, 0x80, IAP_F_FM | IAP_F_I7),
 
     IAPDESCR(09H_01H, 0x09, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_I7O),
@@ -845,7 +845,7 @@ static struct iap_event_descr iap_events
     IAPDESCR(47H_00H, 0x47, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
 
     IAPDESCR(48H_00H, 0x48, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
-    IAPDESCR(48H_02H, 0x48, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(48H_02H, 0x48, 0x02, IAP_F_FM | IAP_F_I7O),
 
     IAPDESCR(49H_00H, 0x49, 0x00, IAP_F_FM | IAP_F_CC),
     IAPDESCR(49H_01H, 0x49, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
@@ -854,9 +854,9 @@ static struct iap_event_descr iap_events
         IAP_F_I7 | IAP_F_WM),
     IAPDESCR(49H_04H, 0x49, 0x04, IAP_F_FM | IAP_F_WM),
     IAPDESCR(49H_10H, 0x49, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
-    IAPDESCR(49H_20H, 0x49, 0x20, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(49H_20H, 0x49, 0x20, IAP_F_FM | IAP_F_I7),
     IAPDESCR(49H_40H, 0x49, 0x40, IAP_F_FM | IAP_F_I7O),
-    IAPDESCR(49H_80H, 0x49, 0x80, IAP_F_FM | IAP_F_WM | IAP_F_I7O),
+    IAPDESCR(49H_80H, 0x49, 0x80, IAP_F_FM | IAP_F_WM | IAP_F_I7),
 
     IAPDESCR(4BH_00H, 0x4B, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
     IAPDESCR(4BH_01H, 0x4B, 0x01, IAP_F_FM | IAP_F_ALLCPUSCORE2 | IAP_F_I7O),
@@ -1306,7 +1306,7 @@ static struct iap_event_descr iap_events
 
     IAPDESCR(E8H_01H, 0xE8, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
     IAPDESCR(E8H_02H, 0xE8, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
-    IAPDESCR(E8H_03H, 0xE8, 0x03, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(E8H_03H, 0xE8, 0x03, IAP_F_FM | IAP_F_I7O),
 
     IAPDESCR(ECH_01H, 0xEC, 0x01, IAP_F_FM | IAP_F_WM),
 
@@ -1454,7 +1454,6 @@ iap_event_corei7_ok_on_counter(enum pmc_
 	case PMC_EV_IAP_EVENT_42H_08H:
 	case PMC_EV_IAP_EVENT_43H_01H:
 	case PMC_EV_IAP_EVENT_43H_02H:
-	case PMC_EV_IAP_EVENT_48H_02H:
 	case PMC_EV_IAP_EVENT_51H_01H:
 	case PMC_EV_IAP_EVENT_51H_02H:
 	case PMC_EV_IAP_EVENT_51H_04H:

Modified: stable/9/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- stable/9/sys/dev/hwpmc/pmc_events.h	Sun Apr  8 20:48:39 2012	(r234043)
+++ stable/9/sys/dev/hwpmc/pmc_events.h	Sun Apr  8 20:51:37 2012	(r234044)
@@ -1669,7 +1669,7 @@ __PMC_EV_ALIAS("X87_OPS_RETIRED.FXCH",		
 
 /*
  * Core i7 and Xeon 5500 events removed between 253669-031US June 2009
- * and 253669-033US December 2009.
+ * and 253669-040US October 2011.
  */
 #define	__PMC_EV_ALIAS_COREI7_OLD()					\
 __PMC_EV_ALIAS("SB_FORWARD.ANY", IAP_EVENT_02H_01H)			\
@@ -1682,6 +1682,7 @@ __PMC_EV_ALIAS("MISALIGN_MEM_REF.ANY", I
 __PMC_EV_ALIAS("STORE_BLOCKS.NOT_STA", IAP_EVENT_06H_01H)		\
 __PMC_EV_ALIAS("STORE_BLOCKS.STA", IAP_EVENT_06H_02H)			\
 __PMC_EV_ALIAS("STORE_BLOCKS.ANY", IAP_EVENT_06H_0FH)			\
+__PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDP_MISS", IAP_EVENT_08H_40H)		\
 __PMC_EV_ALIAS("MEMORY_DISAMBIGURATION.RESET", IAP_EVENT_09H_01H)	\
 __PMC_EV_ALIAS("MEMORY_DISAMBIGURATION.SUCCESS", IAP_EVENT_09H_02H)	\
 __PMC_EV_ALIAS("MEMORY_DISAMBIGURATION.WATCHDOG", IAP_EVENT_09H_04H)	\
@@ -1693,9 +1694,8 @@ __PMC_EV_ALIAS("L2_WRITE.RFO.E_STATE", I
 __PMC_EV_ALIAS("UOPS_DECODED.DEC0", IAP_EVENT_3DH_01H)			\
 __PMC_EV_ALIAS("L1D_CACHE_ST.I_STATE", IAP_EVENT_41H_01H)		\
 __PMC_EV_ALIAS("L1D_CACHE_ST.MESI", IAP_EVENT_41H_0FH)			\
-__PMC_EV_ALIAS("DTLB_MISSES.PDE_MISS", IAP_EVENT_49H_20H)		\
+__PMC_EV_ALIAS("L1D_PEND_MISS.LOAD_BUFFERS_FULL", IAP_EVENT_48H_02H)	\
 __PMC_EV_ALIAS("DTLB_MISSES.PDP_MISS", IAP_EVENT_49H_40H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.LARGE_WALK_COMPLETED", IAP_EVENT_49H_80H)	\
 __PMC_EV_ALIAS("SSE_MEM_EXEC.NTA", IAP_EVENT_4BH_01H)			\
 __PMC_EV_ALIAS("SSE_MEM_EXEC.STREAMING_STORES", IAP_EVENT_4BH_08H)	\
 __PMC_EV_ALIAS("SFENCE_CYCLES", IAP_EVENT_4DH_01H)			\
@@ -1734,6 +1734,7 @@ __PMC_EV_ALIAS("PIC_ACCESSES.TPR_READS",
 __PMC_EV_ALIAS("PIC_ACCESSES.TPR_WRITES", IAP_EVENT_BAH_02H)		\
 __PMC_EV_ALIAS("MACHINE_CLEARS.FUSION_ASSIST", IAP_EVENT_C3H_10H)	\
 __PMC_EV_ALIAS("BOGUS_BR", IAP_EVENT_E4H_01H)				\
+__PMC_EV_ALIAS("BPU_CLEARS.ANY", IAP_EVENT_E8H_03H)			\
 __PMC_EV_ALIAS("L2_HW_PREFETCH.HIT", IAP_EVENT_F3H_01H)			\
 __PMC_EV_ALIAS("L2_HW_PREFETCH.ALLOC", IAP_EVENT_F3H_02H)		\
 __PMC_EV_ALIAS("L2_HW_PREFETCH.DATA_TRIGGER", IAP_EVENT_F3H_04H)	\
@@ -1759,7 +1760,6 @@ __PMC_EV_ALIAS("DTLB_LOAD_MISSES.ANY", I
 __PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_02H)	\
 __PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_10H)		\
 __PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDE_MISS", IAP_EVENT_08H_20H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDP_MISS", IAP_EVENT_08H_40H)		\
 __PMC_EV_ALIAS("DTLB_LOAD_MISSES.LARGE_WALK_COMPLETED",			\
     IAP_EVENT_08H_80H) 							\
 __PMC_EV_ALIAS("MEM_INST_RETIRED.LOADS", IAP_EVENT_0BH_01H)		\
@@ -1867,10 +1867,11 @@ __PMC_EV_ALIAS("L1D_CACHE_LOCK.E_STATE",
 __PMC_EV_ALIAS("L1D_CACHE_LOCK.M_STATE", IAP_EVENT_42H_08H)		\
 __PMC_EV_ALIAS("L1D_ALL_REF.ANY", IAP_EVENT_43H_01H)			\
 __PMC_EV_ALIAS("L1D_ALL_REF.CACHEABLE", IAP_EVENT_43H_02H)		\
-__PMC_EV_ALIAS("L1D_PEND_MISS.LOAD_BUFFERS_FULL", IAP_EVENT_48H_02H)	\
 __PMC_EV_ALIAS("DTLB_MISSES.ANY", IAP_EVENT_49H_01H)			\
 __PMC_EV_ALIAS("DTLB_MISSES.WALK_COMPLETED", IAP_EVENT_49H_02H)		\
 __PMC_EV_ALIAS("DTLB_MISSES.STLB_HIT", IAP_EVENT_49H_10H)		\
+__PMC_EV_ALIAS("DTLB_MISSES.PDE_MISS", IAP_EVENT_49H_20H)		\
+__PMC_EV_ALIAS("DTLB_MISSES.LARGE_WALK_COMPLETED", IAP_EVENT_49H_80H)	\
 __PMC_EV_ALIAS("LOAD_HIT_PRE", IAP_EVENT_4CH_01H)			\
 __PMC_EV_ALIAS("L1D_PREFETCH.REQUESTS", IAP_EVENT_4EH_01H)		\
 __PMC_EV_ALIAS("L1D_PREFETCH.MISS", IAP_EVENT_4EH_02H)			\
@@ -1996,7 +1997,6 @@ __PMC_EV_ALIAS("BACLEAR.CLEAR", IAP_EVEN
 __PMC_EV_ALIAS("BACLEAR.BAD_TARGET", IAP_EVENT_E6H_02H)			\
 __PMC_EV_ALIAS("BPU_CLEARS.EARLY", IAP_EVENT_E8H_01H)			\
 __PMC_EV_ALIAS("BPU_CLEARS.LATE", IAP_EVENT_E8H_02H)			\
-__PMC_EV_ALIAS("BPU_CLEARS.ANY", IAP_EVENT_E8H_03H)			\
 __PMC_EV_ALIAS("L2_TRANSACTIONS.LOAD", IAP_EVENT_F0H_01H)		\
 __PMC_EV_ALIAS("L2_TRANSACTIONS.RFO", IAP_EVENT_F0H_02H)		\
 __PMC_EV_ALIAS("L2_TRANSACTIONS.IFETCH", IAP_EVENT_F0H_04H)		\

From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 21:29:49 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E7E4106566B;
	Sun,  8 Apr 2012 21:29:49 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A0EB8FC0A;
	Sun,  8 Apr 2012 21:29:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q38LTmcB029162;
	Sun, 8 Apr 2012 21:29:48 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38LTmvH029157;
	Sun, 8 Apr 2012 21:29:48 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201204082129.q38LTmvH029157@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Sun, 8 Apr 2012 21:29:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234046 - in stable/9: lib/libpmc sys/dev/hwpmc sys/sys
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 21:29:49 -0000

Author: davide
Date: Sun Apr  8 21:29:48 2012
New Revision: 234046
URL: http://svn.freebsd.org/changeset/base/234046

Log:
  MFC: r232366
  
  - Add support for the Intel Sandy Bridge microarchitecture (both core and
    uncore counting events)
  - New manpages with event lists.
  - Add MSRs for the Intel Sandy Bridge microarchitecture
  
  Approved by:	gnn (mentor)

Added:
  stable/9/lib/libpmc/pmc.sandybridge.3
     - copied unchanged from r232366, head/lib/libpmc/pmc.sandybridge.3
  stable/9/lib/libpmc/pmc.sandybridgeuc.3
     - copied unchanged from r232366, head/lib/libpmc/pmc.sandybridgeuc.3
Modified:
  stable/9/lib/libpmc/Makefile
  stable/9/lib/libpmc/libpmc.c
  stable/9/sys/dev/hwpmc/hwpmc_core.c
  stable/9/sys/dev/hwpmc/hwpmc_intel.c
  stable/9/sys/dev/hwpmc/hwpmc_uncore.c
  stable/9/sys/dev/hwpmc/hwpmc_uncore.h
  stable/9/sys/dev/hwpmc/pmc_events.h
  stable/9/sys/sys/pmc.h
Directory Properties:
  stable/9/lib/libpmc/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/lib/libpmc/Makefile
==============================================================================
--- stable/9/lib/libpmc/Makefile	Sun Apr  8 20:56:47 2012	(r234045)
+++ stable/9/lib/libpmc/Makefile	Sun Apr  8 21:29:48 2012	(r234046)
@@ -35,6 +35,8 @@ MAN+=	pmc.p5.3
 MAN+=	pmc.p6.3
 MAN+=	pmc.corei7.3
 MAN+=	pmc.corei7uc.3
+MAN+=	pmc.sandybridge.3
+MAN+=	pmc.sandybridgeuc.3	
 MAN+=	pmc.westmere.3
 MAN+=	pmc.westmereuc.3
 MAN+=	pmc.tsc.3

Modified: stable/9/lib/libpmc/libpmc.c
==============================================================================
--- stable/9/lib/libpmc/libpmc.c	Sun Apr  8 20:56:47 2012	(r234045)
+++ stable/9/lib/libpmc/libpmc.c	Sun Apr  8 21:29:48 2012	(r234046)
@@ -179,6 +179,11 @@ static const struct pmc_event_descr core
 	__PMC_EV_ALIAS_COREI7()
 };
 
+static const struct pmc_event_descr sandybridge_event_table[] = 
+{
+	__PMC_EV_ALIAS_SANDYBRIDGE()
+};
+
 static const struct pmc_event_descr westmere_event_table[] =
 {
 	__PMC_EV_ALIAS_WESTMERE()
@@ -189,6 +194,11 @@ static const struct pmc_event_descr core
 	__PMC_EV_ALIAS_COREI7UC()
 };
 
+static const struct pmc_event_descr sandybridgeuc_event_table[] =
+{
+	__PMC_EV_ALIAS_SANDYBRIDGEUC()
+};
+
 static const struct pmc_event_descr westmereuc_event_table[] =
 {
 	__PMC_EV_ALIAS_WESTMEREUC()
@@ -208,6 +218,7 @@ PMC_MDEP_TABLE(atom, IAP, PMC_CLASS_IAF,
 PMC_MDEP_TABLE(core, IAP, PMC_CLASS_TSC);
 PMC_MDEP_TABLE(core2, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC);
 PMC_MDEP_TABLE(corei7, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
+PMC_MDEP_TABLE(sandybridge, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
 PMC_MDEP_TABLE(westmere, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
 PMC_MDEP_TABLE(k7, K7, PMC_CLASS_TSC);
 PMC_MDEP_TABLE(k8, K8, PMC_CLASS_TSC);
@@ -242,9 +253,11 @@ PMC_CLASS_TABLE_DESC(atom, IAP, atom, ia
 PMC_CLASS_TABLE_DESC(core, IAP, core, iap);
 PMC_CLASS_TABLE_DESC(core2, IAP, core2, iap);
 PMC_CLASS_TABLE_DESC(corei7, IAP, corei7, iap);
+PMC_CLASS_TABLE_DESC(sandybridge, IAP, sandybridge, iap);
 PMC_CLASS_TABLE_DESC(westmere, IAP, westmere, iap);
 PMC_CLASS_TABLE_DESC(ucf, UCF, ucf, ucf);
 PMC_CLASS_TABLE_DESC(corei7uc, UCP, corei7uc, ucp);
+PMC_CLASS_TABLE_DESC(sandybridgeuc, UCP, sandybridgeuc, ucp);
 PMC_CLASS_TABLE_DESC(westmereuc, UCP, westmereuc, ucp);
 #endif
 #if	defined(__i386__)
@@ -530,6 +543,8 @@ static struct pmc_event_alias core2_alia
 #define	atom_aliases_without_iaf	core2_aliases_without_iaf
 #define corei7_aliases			core2_aliases
 #define corei7_aliases_without_iaf	core2_aliases_without_iaf
+#define sandybridge_aliases		core2_aliases
+#define sandybridge_aliases_without_iaf	core2_aliases_without_iaf
 #define westmere_aliases		core2_aliases
 #define westmere_aliases_without_iaf	core2_aliases_without_iaf
 
@@ -2562,6 +2577,10 @@ pmc_event_names_of_class(enum pmc_class 
 			ev = corei7_event_table;
 			count = PMC_EVENT_TABLE_SIZE(corei7);
 			break;
+		case PMC_CPU_INTEL_SANDYBRIDGE:
+			ev = sandybridge_event_table;
+			count = PMC_EVENT_TABLE_SIZE(sandybridge);
+			break;
 		case PMC_CPU_INTEL_WESTMERE:
 			ev = westmere_event_table;
 			count = PMC_EVENT_TABLE_SIZE(westmere);
@@ -2583,6 +2602,10 @@ pmc_event_names_of_class(enum pmc_class 
 			ev = corei7uc_event_table;
 			count = PMC_EVENT_TABLE_SIZE(corei7uc);
 			break;
+		case PMC_CPU_INTEL_SANDYBRIDGE:
+			ev = sandybridgeuc_event_table;
+			count = PMC_EVENT_TABLE_SIZE(sandybridgeuc);
+			break;
 		case PMC_CPU_INTEL_WESTMERE:
 			ev = westmereuc_event_table;
 			count = PMC_EVENT_TABLE_SIZE(westmereuc);
@@ -2814,6 +2837,11 @@ pmc_init(void)
 		pmc_class_table[n++] = &corei7uc_class_table_descr;
 		PMC_MDEP_INIT_INTEL_V2(corei7);
 		break;
+	case PMC_CPU_INTEL_SANDYBRIDGE:
+		pmc_class_table[n++] = &ucf_class_table_descr;
+		pmc_class_table[n++] = &sandybridgeuc_class_table_descr;
+		PMC_MDEP_INIT_INTEL_V2(sandybridge);
+		break;
 	case PMC_CPU_INTEL_WESTMERE:
 		pmc_class_table[n++] = &ucf_class_table_descr;
 		pmc_class_table[n++] = &westmereuc_class_table_descr;
@@ -2937,6 +2965,10 @@ _pmc_name_of_event(enum pmc_event pe, en
 			ev = corei7_event_table;
 			evfence = corei7_event_table + PMC_EVENT_TABLE_SIZE(corei7);
 			break;
+		case PMC_CPU_INTEL_SANDYBRIDGE:
+			ev = sandybridge_event_table;
+			evfence = sandybridge_event_table + PMC_EVENT_TABLE_SIZE(sandybridge);
+			break;
 		case PMC_CPU_INTEL_WESTMERE:
 			ev = westmere_event_table;
 			evfence = westmere_event_table + PMC_EVENT_TABLE_SIZE(westmere);
@@ -2953,6 +2985,10 @@ _pmc_name_of_event(enum pmc_event pe, en
 			ev = corei7uc_event_table;
 			evfence = corei7uc_event_table + PMC_EVENT_TABLE_SIZE(corei7uc);
 			break;
+		case PMC_CPU_INTEL_SANDYBRIDGE:
+			ev = sandybridgeuc_event_table;
+			evfence = sandybridgeuc_event_table + PMC_EVENT_TABLE_SIZE(sandybridgeuc);
+			break;
 		case PMC_CPU_INTEL_WESTMERE:
 			ev = westmereuc_event_table;
 			evfence = westmereuc_event_table + PMC_EVENT_TABLE_SIZE(westmereuc);

Copied: stable/9/lib/libpmc/pmc.sandybridge.3 (from r232366, head/lib/libpmc/pmc.sandybridge.3)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/lib/libpmc/pmc.sandybridge.3	Sun Apr  8 21:29:48 2012	(r234046, copy of r232366, head/lib/libpmc/pmc.sandybridge.3)
@@ -0,0 +1,932 @@
+.\" Copyright (c) 2012 Davide Italiano <davide@FreeBSD.org>  
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 12, 2012
+.Dt PMC.SANDYBRIDGE 3 
+.Os 
+.Sh NAME
+.Nm pmc.sandybridge
+.Nd measurement events for 
+.Tn Intel
+.Tn Sandy Bridge
+family CPUs
+.Sh LIBRARY
+.Lb libpmc
+.Sh SYNOPSIS
+.In pmc.h
+.Sh DESCRIPTION
+.Tn Intel
+.Tn "Sandy Bridge"
+CPUs contain PMCs conforming to the version 3 of the
+.Tn Intel
+performance measurement architecture.
+These CPUs may contain up to three classes of PMCs:
+.Bl -tag -width "Li PMC_CLASS_IAP"
+.It Li PMC_CLASS_IAF
+Fixed-function counters that count only one hardware event per counter.
+.It Li PMC_CLASS_IAP
+Programmable counters that may be configured to count one of a defined
+set of hardware events.
+.It Li PMC_CLASS_TSC
+These PMCs are documented in
+.Xr pmc.tsc 3 .
+.El
+.Pp
+The number of PMCs available in each class and their widths need to be
+determined at run time by calling 
+.Xr pmc_cpuinfo 3 .
+.Pp
+Intel Sandy Bridge PMCs are documented in 
+.Rs
+.%B "Intel(R) 64 and IA-32 Architectures Software Developers Manual"
+.%T "Volume 3B: System Programming Guide, Part 2"
+.%N "Order Number: 253669-039US"
+.%D May 2011
+.%Q "Intel Corporation"
+.Re
+.Ss SANDY BRIDGE FIXED FUNCTION PMCS
+These PMCs and their supported events are documented in
+.Xr pmc.iaf 3 .
+.Ss SANDY BRIDGE PROGRAMMABLE PMCS
+The programmable PMCs support the following capabilities:
+.Bl -column "PMC_CAP_INTERRUPT" "Support"
+.It Em Capability Ta Em Support
+.It PMC_CAP_CASCADE Ta \&No
+.It PMC_CAP_EDGE Ta Yes 
+.It PMC_CAP_INTERRUPT Ta Yes
+.It PMC_CAP_INVERT Ta Yes
+.It PMC_CAP_READ Ta Yes
+.It PMC_CAP_PRECISE Ta \&No
+.It PMC_CAP_SYSTEM Ta Yes
+.It PMC_CAP_TAGGING Ta \&No
+.It PMC_CAP_THRESHOLD Ta Yes
+.It PMC_CAP_USER Ta Yes
+.It PMC_CAP_WRITE Ta Yes
+.El
+.Ss Event Qualifiers
+Event specifiers for these PMCs support the following common
+qualifiers:
+.Bl -tag -width indent
+.It Li rsp= Ns Ar value
+Configure the Off-core Response bits.
+.Bl -tag -width indent
+.It Li DMND_DATA_RD
+Counts the number of demand and DCU prefetch data reads of full
+and partial cachelines as well as demand data page table entry
+cacheline reads. 
+Does not count L2 data read prefetches or instruction fetches.
+.It Li DMND_RFO
+Counts the number of demand and DCU prefetch reads for ownership
+(RFO) requests generated by a write to data cacheline. 
+Does not count L2 RFO.
+.It Li DMND_IFETCH
+Counts the number of demand and DCU prefetch instruction cacheline
+reads. 
+Does not count L2 code read prefetches.
+.It Li WB
+Counts the number of writeback (modified to exclusive) transactions.
+.It Li PF_DATA_RD
+Counts the number of data cacheline reads generated by L2 prefetchers.
+.It Li PF_RFO
+Counts the number of RFO requests generated by L2 prefetchers.
+.It Li PF_IFETCH
+Counts the number of code reads generated by L2 prefetchers.
+.It Li OTHER
+Counts one of the following transaction types, including L3 invalidate,
+I/O, full or partial writes, WC or non-temporal stores, CLFLUSH, Fences,
+lock, unlock, split lock.
+.It Li UNCORE_HIT
+L3 Hit: local or remote home requests that hit L3 cache in the uncore
+with no coherency actions required (snooping).
+.It Li OTHER_CORE_HIT_SNP
+L3 Hit: local or remote home requests that hit L3 cache in the uncore
+and was serviced by another core with a cross core snoop where no modified
+copies were found (clean).
+.It Li OTHER_CORE_HITM
+L3 Hit: local or remote home requests that hit L3 cache in the uncore
+and was serviced by another core with a cross core snoop where modified
+copies were found (HITM).
+.It Li REMOTE_CACHE_FWD
+L3 Miss: local homed requests that missed the L3 cache and was serviced
+by forwarded data following a cross package snoop where no modified
+copies found. 
+(Remote home requests are not counted)
+.It Li REMOTE_DRAM
+L3 Miss: remote home requests that missed the L3 cache and were serviced
+by remote DRAM.
+.It Li LOCAL_DRAM
+L3 Miss: local home requests that missed the L3 cache and were serviced
+by local DRAM.
+.It Li NON_DRAM
+Non-DRAM requests that were serviced by IOH.
+.El
+.It Li cmask= Ns Ar value
+Configure the PMC to increment only if the number of configured
+events measured in a cycle is greater than or equal to
+.Ar value .
+.It Li edge
+Configure the PMC to count the number of de-asserted to asserted
+transitions of the conditions expressed by the other qualifiers.
+If specified, the counter will increment only once whenever a
+condition becomes true, irrespective of the number of clocks during
+which the condition remains true.
+.It Li inv
+Invert the sense of comparison when the
+.Dq Li cmask
+qualifier is present, making the counter increment when the number of
+events per cycle is less than the value specified by the
+.Dq Li cmask
+qualifier.
+.It Li os
+Configure the PMC to count events happening at processor privilege
+level 0.
+.It Li usr
+Configure the PMC to count events occurring at privilege levels 1, 2
+or 3.
+.El
+.Pp
+If neither of the
+.Dq Li os
+or
+.Dq Li usr
+qualifiers are specified, the default is to enable both.
+.Ss Event Specifiers (Programmable PMCs)
+Sandy Bridge programmable PMCs support the following events:
+.Bl -tag -width indent
+.It Li LD_BLOCKS.DATA_UNKNOWN
+.Pq EVENT_03H, Umask 01H 
+Blocked loads due to store buffer blocks with unknown data.
+.It Li LD_BLOCKS.STORE_FORWARD
+.Pq Event 03H, Umask 02H 
+Loads blocked by overlapping with store buffer that cannot be forwarded.
+.It Li LD_BLOCKS.NO_SR
+.Pq Event 03H, Umask 08H 
+# of Split loads blocked due to resource not available.
+.It Li LD_BLOCKS.ALL_BLOCK 
+.Pq EVENT_03H, Umask 10H 
+Number of cases where any load is blocked but has no DCU miss.
+.It Li  MISALIGN_MEM_REF.LOADS 
+.Pq Event 05H, Umask  01H 
+Speculative cache-line split load uops dispatched to L1D.
+.It Li MISALIGN_MEM_REF.STORES
+.Pq Event 05H, Umask  02H 
+Speculative cache-line split Store-address uops dispatched to L1D.
+.It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS
+.Pq Event 07H, Umask  01H 
+False dependencies in MOB due to partial compare on address.
+.It Li LD_BLOCKS_PARTIAL.ALL_STA_BLOCK 
+.Pq Event 07H, Umask 08H 
+The number of times that load operations are temporarily blocked because of 
+older stores, with addresses that are not yet known. 
+A load operation may incur more than one block of this type.
+.It LI DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK
+.Pq Event 08H, Umask 01H 
+Misses in all TLB levels that cause a page walk of any page size.
+.It Li DTLB_LOAD_MISSES.WALK_COMPLETED 
+.Pq Event 08H, Umask 02H 
+Misses in all TLB levels that caused page walk completed of any size.
+.It Li DTLB_LOAD_MISSES.WALK_DURATION 
+.Pq Event 08H, Umask 04H 
+Cycle PMH is busy with a walk.
+.It Li DTLB_LOAD_MISSES.STLB_HIT
+.Pq Event 08H, Umask 10H 
+Number of cache load STLB hits. 
+No page walk.
+.It Li INT_MISC.RECOVERY_CYCLES 
+.Pq Event 0DH, Umask 03H 
+Cycles waiting to recover after Machine Clears or JEClear. 
+Set Cmask = 1.
+Set Edge to count occurrences
+.It Li INT_MISC.RAT_STALL_CYCLES 
+.Pq Event 0DH, Umask 40H 
+Cycles RAT external stall is sent to IDQ for this thread.
+.It Li UOPS_ISSUED.ANY
+.Pq Event 0EH, Umask 01H 
+Increments each cycle the # of Uops issued by the RAT to RS. 
+Set Cmask = 1, Inv = 1, Any= 1 to count stalled cycles of this core.
+Set Cmask = 1, Inv = 1 to count stalled cycles
+.It Li FP_COMP_OPS_EXE.X87 
+.Pq Event 10H, Umask 01H 
+Counts number of X87 uops executed.
+.It Li FP_COMP_OPS_EXE.SSE_FP_PACKED_DOUBLE 
+.Pq Event 10H, Umask 10H 
+Counts number of SSE* double precision FP packed uops executed.
+.It Li FP_COMP_OPS_EXE.SSE_FP_SCALAR_SINGLE
+.Pq Event 10H, Umask 20H 
+Counts number of SSE* single precision FP scalar uops executed.
+.It Li FP_COMP_OPS_EXE.SSE_PACKED_SINGLE
+.Pq Event 10H, Umask 40H
+Counts number of SSE* single precision FP packed uops executed.
+.It LiFP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE 
+.Pq Event 10H, Umask 80H
+Counts number of SSE* double precision FP scalar uops executed.
+.It Li SIMD_FP_256.PACKED_SINGLE
+.Pq Event 11H, Umask 01H 
+Counts 256-bit packed single-precision floating-point instructions.
+.It Li SIMD_FP_256.PACKED_DOUBLE
+.Pq Event 11H, Umask 02H
+Counts 256-bit packed double-precision floating-point instructions.
+.It Li ARITH.FPU_DIV_ACTIVE
+.Pq Event 14H, Umask 01H 
+Cycles that the divider is active, includes INT and FP.
+Set 'edge =1, cmask=1' to count the number of divides.
+.It Li INSTS_WRITTEN_TO_IQ.INSTS 
+.Pq Event 17H, Umask 01H 
+Counts the number of instructions written into the IQ every cycle.
+.It Li L2_RQSTS.DEMAND_DATA_RD_HIT 
+.Pq Event 24H, Umask 01H 
+Demand Data Read requests that hit L2 cache.
+.It Li L2_RQSTS.ALL_DEMAND_DATA_RD
+.Pq Event 24H, Umask 03H 
+Counts any demand and L1 HW prefetch data load requests to L2.
+.It Li L2_RQSTS.RFO_HITS
+.Pq Event 24H, Umask 04H
+Counts the number of store RFO requests that hit the L2 cache.
+.It Li L2_RQSTS.RFO_MISS 
+.Pq Event 24H, Umask 08H
+Counts the number of store RFO requests that miss the L2 cache.
+.It Li L2_RQSTS.ALL_RFO 
+.Pq Event 24H, Umask 0CH 
+Counts all L2 store RFO requests.
+.It Li L2_RQSTS.CODE_RD_HIT 
+.Pq Event 24H, Umask 10H
+Number of instruction fetches that hit the L2 cache.
+.It Li L2_RQSTS.CODE_RD_MISS 
+.Pq Event 24H, Umask 20H
+Number of instruction fetches that missed the L2 cache.
+.It Li L2_RQSTS.ALL_CODE_RD 
+.Pq Event 24H, Umask 30H 
+Counts all L2 code requests.
+.It Li L2_RQSTS.PF_HIT 
+.Pq Event 24H, Umask 40H 
+Requests from L2 Hardware prefetcher that hit L2.
+.It Li L2_RQSTS.PF_MISS 
+.Pq Event 24H, Umask 80H
+Requests from L2 Hardware prefetcher that missed L2.
+.It Li L2_RQSTS.ALL_PF 
+.Pq Event 24H, Umask C0H
+Any requests from L2 Hardware prefetchers.
+.It Li L2_STORE_LOCK_RQSTS.MISS 
+.Pq Event 27H, Umask 01H 
+RFOs that miss cache lines.
+.It Li L2_STORE_LOCK_RQSTS.HIT_E 
+.Pq Event 27H, Umask 04H 
+RFOs that hit cache lines in E state.
+.It Li L2_STORE_LOCK_RQSTS.HIT_M
+.Pq EVENT_27H, Umask 08H
+RFOs that hit cache lines in M state.
+.It Li L2_STORE_LOCK_RQSTS.ALL 
+.Pq EVENT_27H, Umask 0FH 
+RFOs that access cache lines in any state.
+.It Li L2_L1D_WB_RQSTS.HIT_E 
+.Pq Event 28H, Umask 04H 
+Not rejected writebacks from L1D to L2 cache lines in E state.
+.It Li L2_L1D_WB_RQSTS.HIT_M 
+.Pq Event 28H, Umask 08H 
+Not rejected writebacks from L1D to L2 cache lines in M state.
+.It Li LONGEST_LAT_CACHE.REFERENCE 
+.Pq Event 2EH, Umask 4FH
+This event counts requests originating from the core that reference a cache 
+line in the last level cache.
+.It Li LONGEST_LAT_CACHE.MISS 
+.Pq Event 2EH, Umask 41H 
+This event counts each cache miss condition for references to the last level 
+cache.
+.It Li CPU_CLK_UNHALTED.THREAD_P 
+.Pq Event 3CH, Umask 00H 
+Counts the number of thread cycles while the thread is not in a halt state. 
+The thread enters the halt state when it is running the HLT instruction. 
+The core frequency may change from time to time due to power or thermal 
+throttling.
+.It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK 
+.Pq Event 3CH, Umask 01H 
+Increments at the frequency of XCLK (100 MHz) when not halted.
+.It Li L1D_PEND_MISS.PENDING 
+.Pq Event 48H, Umask 01H 
+Increments the number of outstanding L1D misses every cycle. 
+Set Cmask = 1 and Edge =1  to count occurrences.
+Counter 2 only; Set Cmask = 1 to count cycles.
+.It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK 
+.Pq Event 49H, Umask 01H Miss in all TLB levels causes an page walk of any 
+page size (4K/2M/4M/1G).
+.It Li DTLB_STORE_MISSES.WALK_COMPLETED 
+.Pq Event 49H, Umask 02H 
+Miss in all TLB levels causes a page walk that completes of any page size 
+(4K/2M/4M/1G).
+.It Li DTLB_STORE_MISSES.WALK_DURATION 
+.Pq Event 49H, Umask 04H 
+Cycles PMH is busy with this walk.
+.It Li DTLB_STORE_MISSES.STLB_HIT 
+.Pq Event 49H, Umask 10H 
+Store operations that miss the first TLB level but hit the second and do not 
+cause page walks.
+.It Li LOAD_HIT_PRE.SW_PF 
+.Pq Event 4CH, Umask 01H 
+Not SW-prefetch load dispatches that hit fill buffer allocated for S/W prefetch.
+.It Li LOAD_HIT_PER.HW_PF 
+.Pq Event 4CH, Umask 02H 
+Not SW-prefetch load dispatches that hit fill buffer allocated for H/W prefetch.
+.It Li HW_PRE_REQ.DL1_MISS 
+.Pq Event 4EH, Umask 02H 
+Hardware Prefetch requests that miss the L1D cache.  
+A request is being counted each time it access the cache & miss it, including 
+if a block is applicable or if hit the Fill Buffer for example.
+This accounts for both L1 streamer and IP-based (IPP) HW prefetchers.
+.It Li L1D.REPLACEMENT 
+.Pq Event 51H, Umask 01H
+Counts the number of lines brought into the L1 data cache.
+.It Li L1D.ALLOCATED_IN_M 
+.Pq Event 51H, Umask 02H 
+Counts the number of allocations of modified L1D cache lines.
+.It Li L1D.EVICTION
+.Pq Event 51H, Umask 04H
+Counts the number of modified lines evicted from the L1 data cache due to 
+replacement.
+.It Li L1D.ALL_M_REPLACEMENT
+.Pq Event 51H, Umask 08H 
+Cache lines in M state evicted out of L1D due to Snoop HitM or dirty line 
+replacement.
+.It Li PARTIAL_RAT_STALLS.FLAGS_MERGE_UOP
+.Pq Event 59H, Umask 20H 
+Increments the number of flags-merge uops in flight each cycle.
+Set Cmask = 1 to count cycles.
+.It Li PARTIAL_RAT_STALLS.SLOW_LEA_WINDOW
+.Pq Event 59H, Umask 40H 
+Cycles with at least one slow LEA uop allocated.
+.It Li PARTIAL_RAT_STALLS.MUL_SINGLE_UOP
+.Pq Event 59H, Umask 80H 
+Number of Multiply packed/scalar single precision uops allocated.
+.It Li RESOURCE_STALLS2.ALL_FL_EMPTY 
+.Pq Event 5BH, Umask 0CH 
+Cycles stalled due to free list empty.
+.It Li RESOURCE_STALLS2.ALL_PRF_CONTROL 
+.Pq Event 5BH, Umask 0FH 
+Cycles stalled due to control structures full for physical registers.
+.It Li RESOURCE_STALLS2.BOB_FULL 
+.Pq Event 5BH, Umask 40H 
+Cycles Allocator is stalled due to Branch Order Buffer.
+.It Li RESOURCE_STALLS2.OOO_RSRC
+.Pq Event 5BH, Umask 4FH 
+Cycles stalled due to out of order resources full.
+.It Li CPL_CYCLES.RING0
+.Pq Event 5CH, Umask 01H 
+Unhalted core cycles when the thread is in ring 0.
+Use Edge to count transition
+.It Li CPL_CYCLES.RING123
+.Pq Event 5CH, Umask 02H
+Unhalted core cycles when the thread is not in ring 0.
+.It Li RS_EVENTS.EMPTY_CYCLES
+.Pq Event 5EH, Umask 01H 
+Cycles the RS is empty for the thread.
+.It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD
+.Pq Event 60H, Umask 01H 
+Offcore outstanding Demand Data Read transactions in SQ to uncore.
+Set Cmask=1 to count cycles.
+.It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO
+.Pq Event 60H, Umask 04H 
+Offcore outstanding RFO store transactions in SQ to uncore.
+Set Cmask=1 to count cycles.
+.It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD
+.Pq Event 60H, Umask 08H 
+Offcore outstanding cacheable data read transactions in SQ to uncore.
+Set Cmask=1 to count cycles.
+.It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION
+.Pq Event 63H, Umask 01H 
+Cycles in which the L1D and L2 are locked, due to a UC lock or split lock.
+.It Li LOCK_CYCLES.CACHE_LOCK_DURATION
+.Pq Event 63H, Umask 02H
+Cycles in which the L1D is locked.
+.It Li IDQ.EMPTY
+.Pq Event 79H, Umask 02H 
+Counts cycles the IDQ is empty.
+.It Li IQD.MITE_UOPS 
+.Pq Event 79H, Umask 04H 
+Increment each cycle # of uops delivered to IDQ from MITE path. 
+Set Cmask = 1 to count cycles.
+Can combine Umask 04H and 20H
+.It Li IDQ.DSB_UOPS
+.Pq Event 79H, Umask 08H 
+Increment each cycle. 
+# of uops delivered to IDQ from DSB path. 
+Set Cmask = 1 to count cycles.
+Can combine Umask 08H and 10H
+.It Li IDQ.MS_DSB_UOPS 
+.Pq Event 79H, Umask 10H 
+Increment each cycle # of uops delivered to IDQ when MS busy by DSB. 
+Set Cmask = 1 to count cycles MS is busy. 
+Set Cmask=1 and Edge=1 to count MS activations.
+Can combine Umask 08H and 10H
+.It Li IDQ.MS_MITE_UOPS
+.Pq Event 79H, Umask 20H 
+Increment each cycle # of uops delivered to IDQ when MS is busy by MITE. 
+Set Cmask = 1 to count cycles.
+Can combine Umask 04H and 20H
+.It Li IDQ.MS_UOPS 
+.Pq Event 79H, Umask 30H 
+Increment each cycle # of uops delivered to IDQ from MS by either DSB or MITE. 
+Set Cmask = 1 to count cycles.
+Can combine Umask 04H, 08H and 30H
+.It Li ICACHE.MISSES
+.Pq Event 80H, Umask 02H
+Number of Instruction Cache, Streaming Buffer and Victim Cache Misses.
+Includes UC accesses.
+.It Li ITLB_MISSES.MISS_CAUSES_A_WALK
+.Pq Event 85H, Umask 01H
+Misses in all ITLB levels that cause page walks.
+.It Li ITLB_MISSES.WALK_COMPLETED
+.Pq Event 85H, Umask 02H 
+Misses in all ITLB levels that cause completed page walks.
+.It Li ITLB_MISSES.WALK_DURATION 
+.Pq Event 85H, Umask 04H 
+Cycle PMH is busy with a walk.
+.It Li ITLB_MISSES.STLB_HIT
+.Pq Event 85H, Umask 10H 
+Number of cache load STLB hits. 
+No page walk.
+.It Li ILD_STALL.LCP
+.Pq Event 87H, Umask 01H 
+Stalls caused by changing prefix length of the instruction.
+.It Li ILD_STALL.IQ_FULL
+.Pq Event 87H, Umask 04H 
+Stall cycles due to IQ is full.
+.It Li BR_INST_EXEC.COND
+.Pq Event 88H, Umask 01H 
+Qualify conditional near branch instructions executed, but not necessarily 
+retired.
+Must combine with umask 40H, 80H
+.It Li BR_INST_EXEC.DIRECT_JMP 
+.Pq Event 88H, Umask 02H 
+Qualify all unconditional near branch instructions excluding calls and indirect 
+branches.
+Must combine with umask 80H
+.It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET
+.Pq Event 88H, Umask 04H 
+Qualify executed indirect near branch instructions that are not calls nor 
+returns.
+Must combine with umask 80H
+.It Li BR_INST_EXEC.RETURN_NEAR
+.Pq Event 88H, Umask 08H 
+Qualify indirect near branches that have a return mnemonic.
+Must combine with umask 80H
+.It Li BR_INST_EXEC.DIRECT_NEAR_CALL
+.Pq Event 88H, Umask 10H
+Qualify unconditional near call branch instructions, excluding non call branch,
+executed.
+Must combine with umask 80H
+.It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
+.Pq Event 88H, Umask 20H 
+Qualify indirect near calls, including both register and memory indirect, 
+executed.
+Must combine with umask 80H
+.It Li BR_INST_EXEC.NONTAKEN
+.Pq Event 88H, Umask 40H 
+Qualify non-taken near branches executed.
+Applicable to umask 01H only
+.It Li BR_INST_EXEC.TAKEN
+.Pq Event 88H, Umask 80H 
+Qualify taken near branches executed.  
+Must combine with 01H,02H, 04H, 08H, 10H, 20H
+.It Li BR_INST_EXE.ALL_BRANCHES
+.Pq Event 88H, Umask FFH 
+Counts all near executed branches (not necessarily retired).
+.It Li BR_MISP_EXEC.COND
+.Pq Event 89H, Umask 01H 
+Qualify conditional near branch instructions mispredicted. 
+Must combine with umask 40H, 80H
+.It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET
+.Pq Event 89H, Umask 04H 
+Qualify mispredicted indirect near branch instructions that are not calls nor 
+returns.
+Must combine with umask 80H
+.It Li BR_MISP_EXEC.RETURN_NEAR 
+.Pq Event 89H, Umask 08H 
+Qualify mispredicted indirect near branches that have a return mnemonic.
+Must combine with umask 80H
+.It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
+.Pq Event 89H, Umask 10H 
+Qualify mispredicted unconditional near call branch instructions, excluding non 
+call branch, executed.
+Must combine with umask 80H
+.It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
+.Pq Event 89H, Umask 20H 
+Qualify mispredicted indirect near calls, including both register and memory 
+indirect, executed.
+Must combine with umask 80H
+.It Li BR_MISP_EXEC.NONTAKEN
+.Pq Event 89H, Umask 40H 
+Qualify mispredicted non-taken near branches executed.
+Applicable to umask 01H only
+.It Li BR_MISP_EXEC.TAKEN 
+.Pq Event 89H, Umask 80H
+Qualify mispredicted taken near branches executed.
+Must combine with 01H,02H, 04H, 08H, 10H, 20H
+.It Li BR_MISP_EXEC.ALL_BRANCHES
+.Pq Event 89H, Umask FFH
+Counts all near executed branches (not necessarily retired).
+.It Li IDQ_UOPS_NOT_DELIVERED.CORE
+.Pq Event 9CH, Umask 01H 
+Count number of non-delivered uops to RAT per thread.
+Use Cmask to qualify uop b/w
+.It Li UOPS_DISPATCHED_PORT.PORT_0
+.Pq Event A1H, Umask 01H
+Cycles which a Uop is dispatched on port 0.
+.It Li UOPS_DISPATCHED_PORT.PORT_1
+.Pq Event A1H, Umask 02H
+Cycles which a Uop is dispatched on port 1.
+.It Li UOPS_DISPATCHED_PORT.PORT_2_LD
+.Pq Event A1H, Umask 04H 
+Cycles which a load uop is dispatched on port 2.
+.It Li UOPS_DISPATCHED_PORT.PORT_2_STA
+.Pq Event A1H, Umask 08H
+Cycles which a store address uop is dispatched on port 2.
+.It Li UOPS_DISPATCHED_PORT.PORT_2
+.Pq Event A1H, Umask 0CH 
+Cycles which a Uop is dispatched on port 2.
+.It Li UOPS_DISPATCHED_PORT.PORT_3_LD
+.Pq Event A1H, Umask 10H 
+Cycles which a load uop is dispatched on port 3.
+.It Li UOPS_DISPATCHED_PORT.PORT_3_STA 
+.Pq Event A1H, Umask 20H 
+Cycles which a store address uop is dispatched on port 3.
+.It Li UOPS_DISPATCHED_PORT.PORT_3 
+.Pq Event A1H, Umask 30H 
+.Pq Cycles which a Uop is dispatched on port 3.
+.It Li UOPS_DISPATCHED_PORT.PORT_4 
+.Pq Event A1H, Umask 40H
+Cycles which a Uop is dispatched on port 4.
+.It Li UOPS_DISPATCHED_PORT.PORT_5
+.Pq Event A1H, Umask 80H 
+Cycles which a Uop is dispatched on port 5.
+.It Li RESOURCE_STALLS.ANY
+.Pq Event A2H, Umask 01H
+Cycles Allocation is stalled due to Resource Related reason.
+.It Li RESOURCE_STALLS.LB
+.Pq Event A2H, Umask 02H
+Counts the cycles of stall due to lack of load buffers.
+.It Li RESOURCE_STALLS.LB
+.Pq Event A2H, Umask 04H 
+Cycles stalled due to no eligible RS entry available.
+.It Li RESOURCE_STALLS.SB
+.Pq Event A2H, Umask 08H 
+Cycles stalled due to no store buffers available. 
+(not including draining form sync)
+.It Li RESOURCE_STALLS.ROB
+.Pq Event A2H, Umask 10H
+Cycles stalled due to re-order buffer full.
+.It Li RESOURCE_STALLS.FCSW
+.Pq Event A2H, Umask 20H 
+Cycles stalled due to writing the FPU control word.
+.It Li RESOURCE_STALLS.MXCSR
+.Pq Event A2H, Umask 40H
+Cycles stalled due to the MXCSR register rename occurring to close to a previous 
+MXCSR rename.
+.It Li RESOURCE_STALLS.OTHER
+.Pq Event A2H, Umask 80H 
+Cycles stalled while execution was stalled due to other resource issues.
+.It Li DSB2MITE_SWITCHES.COUNT
+.Pq Event ABH, Umask 01H
+Number of DSB to MITE switches.
+.It Li DSB2MITE_SWITCHES.PENALTY_CYCLES
+.Pq Event ABH, Umask 02H 
+Cycles DSB to MITE switches caused delay.
+.It Li DSB_FILL.OTHER_CANCEL
+.Pq Event ACH, Umask 02H
+Cases of cancelling valid DSB fill not because of exceeding way limit.
+.It Li DSB_FILL.EXCEED_DSB_LINES
+.Pq Event ACH, Umask 08H
+DSB Fill encountered > 3 DSB lines.
+.It Li DSB_FILL.ALL_CANCEL
+.Pq Event ACH, Umask 0AH 
+Cases of cancelling valid Decode Stream Buffer (DSB) fill not because of exceeding 
+way limit.
+.It Li ITLB.ITLB_FLUSH
+.Pq Event AEH, Umask 01H
+Counts the number of ITLB flushes, includes 4k/2M/4M pages.
+.It Li OFFCORE_REQUESTS.DEMAND_DATA_RD
+.Pq Event B0H, Umask 01H 
+Demand data read requests sent to uncore.
+.It Li OFFCORE_REQUESTS.DEMAND_RFO 
+.Pq Event B0H, Umask 04H 
+Demand RFO read requests sent to uncore, including regular RFOs, locks, ItoM.
+.It Li OFFCORE_REQUESTS.ALL_DATA_RD
+.Pq Event B0H, Umask 08H 
+Data read requests sent to uncore (demand and prefetch).
+.It Li UOPS_DISPATCHED.THREAD
+.Pq Event B1H, Umask 01H 
+Counts total number of uops to be dispatched per-thread each cycle.
+Set Cmask = 1, INV =1 to count stall cycles.
+.It Li UOPS_DISPATCHED.CORE
+.Pq Event B1H, Umask 02H 
+Counts total number of uops to be dispatched per-core each cycle.
+Do not need to set ANY
+.It Li OFFCORE_REQUESTS_BUFFER.SQ_FULL
+.Pq Event B2H, Umask 01H 
+Offcore requests buffer cannot take more entries for this thread core.
+.It Li AGU_BYPASS_CANCEL.COUNT
+.Pq Event B6H, Umask 01H 
+Counts executed load operations with all the following traits: 1. addressing 
+of the format [base + offset], 2. the offset is between 1 and 2047, 3. the 
+address specified in the base register is in one page and the address 
+[base+offset] is in another page.
+.It Li OFF_CORE_RESPONSE_0 
+.Pq Event B7H, Umask 01H
+Off-core Response Performance Monitoring; PMC0 only.
+Requires programming MSR 01A6H
+.It Li OFF_CORE_RESPONSE_1 
+.Pq Event BBH, Umask 01H
+Off-core Response Performance Monitoring. PMC3 only.
+Requires programming MSR 01A7H
+.It Li TLB_FLUSH.DTLB_THREAD
+.Pq Event BDH, Umask 01H
+DTLB flush attempts of the thread-specific entries.
+.It Li TLB_FLUSH.STLB_ANY
+.Pq Event BDH, Umask 20H 
+Count number of STLB flush attempts.
+.It Li L1D_BLOCKS.BANK_CONFLICT_CYCLES
+.Pq Event BFH, Umask 05H 
+Cycles when dispatched loads are cancelled due to L1D bank conflicts with other
+load ports.
+cmask=1
+.It Li INST_RETIRED.ANY_P
+.Pq Event C0H, Umask 00H 
+Number of instructions at retirement.
+.It Li INST_RETIRED.PREC_DIST
+.Pq Event C0H, Umask 01H
+Precise instruction retired event with HW to reduce effect of PEBS shadow in IP 
+distribution PMC1 only; Must quiesce other PMCs.
+.It Li INST_RETIRED.X87
+.Pq Event C0H, Umask 02H 
+X87 instruction retired event.
+.It Li OTHER_ASSISTS.ITLB_MISS_RETIRED
+.Pq Event C1H, Umask 02H 
+Instructions that experienced an ITLB miss.
+.It Li OTHER_ASSISTS.AVX_STORE
+.Pq Event C1H, Umask 08H  
+Number of assists associated with 256-bit AVX store operations.
+.It Li OTHER_ASSISTS.AVX_TO_SSE
+.Pq Event C1H, Umask 10H 
+Number of transitions from AVX256 to legacy SSE when penalty applicable.
+.It Li OTHER_ASSISTS.SSE_TO_AVX
+.Pq Event C1H, Umask 20H 
+Number of transitions from SSE to AVX-256 when penalty applicable.
+.It Li UOPS_RETIRED.ALL
+.Pq Event C2H, Umask 01H 
+Counts the number of micro-ops retired.
+Use cmask=1 and invert to count active cycles or stalled cycles.
+.It Li UOPS_RETIRED.RETIRE_SLOTS
+.Pq Event C2H, Umask 02H 
+Counts the number of retirement slots used each cycle.
+.It Li MACHINE_CLEARS.MEMORY_ORDERING
+.Pq Event C3H, Umask 02H 
+Counts the number of machine clears due to memory order conflicts.
+.It Li MACHINE_CLEARS.SMC 
+.Pq Event C3H, Umask 04H
+Counts the number of times that a program writes to a code section.
+.It Li MACHINE_CLEARS.MASKMOV
+.Pq Event C3H, Umask 20H
+Counts the number of executed AVX masked load operations that refer to an 
+illegal address range with the mask bits set to 0.
+.It Li BR_INST_RETIRED.ALL_BRANCH
+.Pq Event C4H, Umask 00H
+Branch instructions at retirement.
+.It Li BR_INST_RETIRED.CONDITIONAL
+.Pq Event C4H, Umask 01H 
+Counts the number of conditional branch instructions retired.
+.It Li BR_INST_RETIRED.NEAR_CALL
+.Pq Event C4H, Umask 02H 
+Direct and indirect near call instructions retired.
+.It Li BR_INST_RETIRED.ALL_BRANCHES
+.Pq Event C4H, Umask 04H
+Counts the number of branch instructions retired.
+.It Li BR_INST_RETIRED.NEAR_RETURN
+.Pq Event C4H, Umask 08H 
+Counts the number of near return instructions retired.
+.It Li BR_INST_RETIRED.NOT_TAKEN
+.Pq Event C4H, Umask 10H 
+Counts the number of not taken branch instructions retired.
+.It Li BR_INST_RETIRED.NEAR_TAKEN
+.Pq Event C4H, Umask 20H 
+Number of near taken branches retired.
+.It Li BR_INST_RETIRED.FAR_BRANCH
+.Pq Event C4H, Umask 40H 
+Number of far branches retired.
+.It Li BR_MISP_RETIRED.ALL_BRANCHES
+.Pq Event C5H, Umask 00H 
+Mispredicted branch instructions at retirement.
+.It Li BR_MISP_RETIRED.CONDITIONAL
+.Pq Event C5H, Umask 01H 
+Mispredicted conditional branch instructions retired.
+.It Li BR_MISP_RETIRED.NEAR_CALL
+.Pq Event C5H, Umask 02H 
+Direct and indirect mispredicted near call instructions retired.
+.It Li BR_MISP_RETIRED.ALL_BRANCH
+.Pq Event C5H, Umask 04H 
+Mispredicted macro branch instructions retired.
+.It Li BR_MISP_RETIRED.NOT_TAKEN
+.Pq Event C5H, Umask 10H 
+Mispredicted not taken branch instructions retired.
+.It Li BR_MISP_RETIRED.TAKEN
+.Pq Event C5H, Umask 20H 
+Mispredicted taken branch instructions retired.
+.It Li FP_ASSIST.X87_OUTPUT
+.Pq Event CAH, Umask 02H 
+Number of X87 assists due to output value.
+.It Li FP_ASSIST.X87_INPUT
+.Pq Event CAH, Umask 04H
+Number of X87 assists due to input value.
+.It Li FP_ASSIST.SIMD_OUTPUT
+.Pq Event CAH, Umask 08H
+Number of SIMD FP assists due to Output values.
+.It Li FP_ASSIST.SIMD_INPUT
+.Pq Event CAH, Umask 10H 
+Number of SIMD FP assists due to input values.
+.It Li FP_ASSIST.ANY
+.Pq Event CAH, Umask 1EH 
+Cycles with any input/output SSE* or FP assists.
+.It Li ROB_MISC_EVENTS.LBR_INSERTS
+.Pq Event CCH, Umask 20H 
+Count cases of saving new LBR records by hardware.
+.It Li MEM_TRANS_RETIRED.LOAD_LATENCY
+.Pq Event CDH, Umask 01H
+Sample loads with specified latency threshold. 
+PMC3 only. 
+Specify threshold in MSR 0x3F6.
+.It Li MEM_TRANS_RETIRED.PRECISE_STORE
+.Pq Event CDH, Umask 02H 
+Sample stores and collect precise store operation via PEBS record. 
+PMC3 only.
+.It Li MEM_UOP_RETIRED.LOADS
+.Pq Event D0H, Umask 01H
+Qualify retired memory uops that are loads. 
+Combine with umask 10H, 20H, 40H, 80H.
+.It Li MEM_UOP_RETIRED.STORES
+.Pq Event D0H, Umask 02H
+Qualify retired memory uops that are stores. 
+Combine with umask 10H, 20H, 40H, 80H.
+.It Li MEM_UOP_RETIRED.STLB_MISS
+.Pq Event D0H, Umask 10H
+Qualify retired memory uops with STLB miss.
+Must combine with umask 01H, 02H, to produce counts.
+.It Li MEM_UOP_RETIRED.LOCK
+.Pq Event D0H, Umask 20H
+Qualify retired memory uops with lock.
+Must combine with umask 01H, 02H, to produce counts.
+.It Li MEM_UOP_RETIRED.SPLIT
+.Pq Event D0H, Umask 40H
+Qualify retired memory uops with line split.
+Must combine with umask 01H, 02H, to produce counts. 
+.It Li MEM_UOP_RETIRED_ALL
+.Pq Event D0H, Umask 80H 
+Qualify any retired memory uops.
+Must combine with umask 01H, 02H, to produce counts.
+.It Li MEM_LOAD_UOPS_RETIRED.L1_HIT
+.Pq Event D1H, Umask 01H 
+Retired load uops with L1 cache hits as data sources.
+Must combine with umask 01H, 02H, to produce counts.
+.It Li MEM_LOAD_UOPS_RETIRED.L2_HIT
+.Pq Event D1H, Umask 02H 
+Retired load uops with L2 cache hits as data sources.
+.It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT
+.Pq Event D1H, Umask 04H 
+Retired load uops which data sources were data hits in LLC without snoops 
+required.
+.It Li MEM_LOAD_UOPS_RETIRED.HIT_LFB
+.Pq Event D1H, Umask 40H 
+Retired load uops which data sources were load uops missed L1 but hit FB due 
+to preceding miss to the same cache line with data not ready.
+.It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS
+.Pq Event D2H, Umask 01H 
+Retired load uops which data sources were LLC hit and cross-core snoop missed in 
+on-pkg core cache.
+.It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT
+.Pq Event D2H, Umask 02H 
+Retired load uops which data sources were LLC and cross-core snoop hits in 
+on-pkg core cache.
+.It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM
+.Pq Event D2H, Umask 04H 
+Retired load uops which data sources were HitM responses from shared LLC.
+.It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE
+.Pq Event D2H, Umask 08H
+Retired load uops which data sources were hits in LLC without snoops required.
+.It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.LLC_MISS
+.Pq Event D4H, Umask 02H 
+Retired load uops with unknown information as data source in cache serviced the load.
+.It Li L2_TRANS.DEMAND_DATA_RD
+.Pq Event F0H, Umask 01H 
+Demand Data Read requests that access L2 cache.
+.It Li L2_TRANS.RF0
+.Pq Event F0H, Umask 02H 
+RFO requests that access L2 cache.
+.It Li L2_TRANS.CODE_RD
+.Pq Event F0H, Umask 04H 
+L2 cache accesses when fetching instructions.
+.It Li L2_TRANS.ALL_PF
+.Pq Event F0H, Umask 08H 
+L2 or LLC HW prefetches that access L2 cache.
+.It Li L2_TRANS.L1D_WB
+.Pq Event F0H, Umask 10H 
+L1D writebacks that access L2 cache.
+.It Li L2_TRANS.L2_FILL
+.Pq Event F0H, Umask 20H 
+L2 fill requests that access L2 cache.
+.It Li L2_TRANS.L2_WB
+.Pq Event F0H, Umask 40H 
+L2 writebacks that access L2 cache.
+.It Li L2_TRANS.ALL_REQUESTS
+.Pq Event F0H, Umask 80H 
+Transactions accessing L2 pipe.
+.It Li L2_LINES_IN.I
+.Pq Event F1H, Umask 01H
+L2 cache lines in I state filling L2. 
+Counting does not cover rejects.
+.It Li L2_LINES_IN.S
+.Pq Event F1H, Umask 02H 
+L2 cache lines in S state filling L2. 
+Counting does not cover rejects.
+.It Li L2_LINES_IN.E
+.Pq Event F1H, Umask 04H 
+L2 cache lines in E state filling L2. 
+Counting does not cover rejects.
+.It Li L2_LINES-IN.ALL
+.Pq Event F1H, Umask 07H 
+L2 cache lines filling L2. 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-stable-9@FreeBSD.ORG  Mon Apr  9 14:05:02 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4D751106566C;
	Mon,  9 Apr 2012 14:05:02 +0000 (UTC)
	(envelope-from andreast@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2960F8FC12;
	Mon,  9 Apr 2012 14:05:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q39E52Hc063294;
	Mon, 9 Apr 2012 14:05:02 GMT (envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q39E51Si063293;
	Mon, 9 Apr 2012 14:05:01 GMT (envelope-from andreast@svn.freebsd.org)
Message-Id: <201204091405.q39E51Si063293@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Mon, 9 Apr 2012 14:05:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234055 - stable/9/usr.sbin/makefs/cd9660
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2012 14:05:02 -0000

Author: andreast
Date: Mon Apr  9 14:05:01 2012
New Revision: 234055
URL: http://svn.freebsd.org/changeset/base/234055

Log:
  MFC r233783:
  
    - Write the ISO9660 descriptor after the apm partition entries.
    - Fill the needed pmPartStatus flags. At least the OpenBIOS
      implementation relies on these flags.
  
    This commit fixes the panic seen on OS-X when inserting a FreeBSD/ppc disc.
    Additionally OpenBIOS recognizes the partition where the boot code is located.
    This lets us load a FreeBSD/ppc PowerMac kernel inside qemu.
  
  PR:	powerpc/16209

Modified:
  stable/9/usr.sbin/makefs/cd9660/cd9660_eltorito.c

Modified: stable/9/usr.sbin/makefs/cd9660/cd9660_eltorito.c
==============================================================================
--- stable/9/usr.sbin/makefs/cd9660/cd9660_eltorito.c	Mon Apr  9 13:29:24 2012	(r234054)
+++ stable/9/usr.sbin/makefs/cd9660/cd9660_eltorito.c	Mon Apr  9 14:05:01 2012	(r234055)
@@ -538,9 +538,19 @@ cd9660_write_apm_partition_entry(FILE *f
     off_t sector_start, off_t nsectors, off_t sector_size,
     const char *part_name, const char *part_type)
 {
-	uint32_t apm32;
+	uint32_t apm32, part_status;
 	uint16_t apm16;
 
+	/* See Apple Tech Note 1189 for the details about the pmPartStatus
+	 * flags.
+	 * Below the flags which are default:
+	 * - IsValid     0x01
+	 * - IsAllocated 0x02
+	 * - IsReadable  0x10
+	 * - IsWritable  0x20
+	 */
+	part_status = 0x01 | 0x02 | 0x10 | 0x20;
+
 	if (fseeko(fd, (off_t)(idx + 1) * sector_size, SEEK_SET) == -1)
 		err(1, "fseeko");
 
@@ -562,6 +572,17 @@ cd9660_write_apm_partition_entry(FILE *f
 	fwrite(part_name, strlen(part_name) + 1, 1, fd);
 	fseek(fd, 32 - strlen(part_name) - 1, SEEK_CUR);
 	fwrite(part_type, strlen(part_type) + 1, 1, fd);
+	fseek(fd, 32 - strlen(part_type) - 1, SEEK_CUR);
+
+	apm32 = 0;
+	/* pmLgDataStart */
+        fwrite(&apm32, sizeof(apm32), 1, fd);
+	/* pmDataCnt */ 
+	apm32 = htobe32(nsectors);
+        fwrite(&apm32, sizeof(apm32), 1, fd);
+	/* pmPartStatus */
+	apm32 = htobe32(part_status);
+        fwrite(&apm32, sizeof(apm32), 1, fd);
 
 	return 0;
 }
@@ -666,12 +687,6 @@ cd9660_write_boot(FILE *fd)
 		cd9660_write_apm_partition_entry(fd, 0, total_parts, 1,
 		    total_parts, 512, "Apple", "Apple_partition_map");
 
-		/* Write ISO9660 descriptor, enclosing the whole disk */
-		cd9660_write_apm_partition_entry(fd, 1, total_parts, 0,
-		    diskStructure.totalSectors *
-		    (diskStructure.sectorSize / 512), 512, "ISO9660",
-		    "CD_ROM_Mode_1");
-
 		/* Write all partition entries */
 		apm_partitions = 0;
 		TAILQ_FOREACH(t, &diskStructure.boot_images, image_list) {
@@ -679,11 +694,16 @@ cd9660_write_boot(FILE *fd)
 				continue;
 
 			cd9660_write_apm_partition_entry(fd,
-			    2 + apm_partitions++, total_parts,
+			    1 + apm_partitions++, total_parts,
 			    t->sector * (diskStructure.sectorSize / 512),
 			    t->num_sectors * (diskStructure.sectorSize / 512),
 			    512, "CD Boot", "Apple_Bootstrap");
 		}
+		/* Write ISO9660 descriptor, enclosing the whole disk */
+                cd9660_write_apm_partition_entry(fd, 2 + apm_partitions,
+		    total_parts, 0, diskStructure.totalSectors *
+		    (diskStructure.sectorSize / 512), 512, "ISO9660",
+		    "CD_ROM_Mode_1");
 	}
 
 	return 0;

From owner-svn-src-stable-9@FreeBSD.ORG  Mon Apr  9 22:01:44 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3B1A9106566C;
	Mon,  9 Apr 2012 22:01:44 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 258068FC16;
	Mon,  9 Apr 2012 22:01:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q39M1iYM080350;
	Mon, 9 Apr 2012 22:01:44 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q39M1h4L080348;
	Mon, 9 Apr 2012 22:01:43 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201204092201.q39M1h4L080348@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Mon, 9 Apr 2012 22:01:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234073 - stable/9/lib/libthr/thread
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2012 22:01:44 -0000

Author: jilles
Date: Mon Apr  9 22:01:43 2012
New Revision: 234073
URL: http://svn.freebsd.org/changeset/base/234073

Log:
  MFC r233516: libthr: In the atfork handlers for signals, do not skip the
  last signal.
  
  _SIG_MAXSIG works a bit unexpectedly: signals 1 till _SIG_MAXSIG are valid,
  both bounds inclusive.

Modified:
  stable/9/lib/libthr/thread/thr_sig.c
Directory Properties:
  stable/9/lib/libthr/   (props changed)

Modified: stable/9/lib/libthr/thread/thr_sig.c
==============================================================================
--- stable/9/lib/libthr/thread/thr_sig.c	Mon Apr  9 21:58:58 2012	(r234072)
+++ stable/9/lib/libthr/thread/thr_sig.c	Mon Apr  9 22:01:43 2012	(r234073)
@@ -458,7 +458,7 @@ _thr_signal_prefork(void)
 {
 	int i;
 
-	for (i = 1; i < _SIG_MAXSIG; ++i)
+	for (i = 1; i <= _SIG_MAXSIG; ++i)
 		_thr_rwl_rdlock(&_thr_sigact[i-1].lock);
 }
 
@@ -467,7 +467,7 @@ _thr_signal_postfork(void)
 {
 	int i;
 
-	for (i = 1; i < _SIG_MAXSIG; ++i)
+	for (i = 1; i <= _SIG_MAXSIG; ++i)
 		_thr_rwl_unlock(&_thr_sigact[i-1].lock);
 }
 
@@ -476,7 +476,7 @@ _thr_signal_postfork_child(void)
 {
 	int i;
 
-	for (i = 1; i < _SIG_MAXSIG; ++i)
+	for (i = 1; i <= _SIG_MAXSIG; ++i)
 		bzero(&_thr_sigact[i-1].lock, sizeof(struct urwlock));
 }
 

From owner-svn-src-stable-9@FreeBSD.ORG  Mon Apr  9 23:02:01 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6CF4D106564A;
	Mon,  9 Apr 2012 23:02:01 +0000 (UTC)
	(envelope-from gavin.atkinson@ury.york.ac.uk)
Received: from mail-gw14.york.ac.uk (mail-gw14.york.ac.uk [144.32.129.164])
	by mx1.freebsd.org (Postfix) with ESMTP id 2548E8FC14;
	Mon,  9 Apr 2012 23:02:01 +0000 (UTC)
Received: from ury.york.ac.uk ([144.32.108.81]:44773)
	by mail-gw14.york.ac.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <gavin.atkinson@ury.york.ac.uk>)
	id 1SHNax-0003Mo-67; Tue, 10 Apr 2012 00:01:59 +0100
Received: from gavin (helo=localhost)
	by ury.york.ac.uk with local-esmtp (Exim 4.77)
	(envelope-from <gavin.atkinson@ury.york.ac.uk>)
	id 1SHNax-0008Tt-0B; Tue, 10 Apr 2012 00:01:59 +0100
Date: Tue, 10 Apr 2012 00:01:58 +0100 (BST)
From: Gavin Atkinson <gavin@FreeBSD.org>
X-X-Sender: gavin@ury.york.ac.uk
To: Jung-uk Kim <jkim@FreeBSD.org>
In-Reply-To: <201204021813.q32IDTmf009879@svn.freebsd.org>
Message-ID: <alpine.LNX.2.00.1204092152260.9103@ury.york.ac.uk>
References: <201204021813.q32IDTmf009879@svn.freebsd.org>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: <gavin.atkinson@ury.york.ac.uk>
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r233797 - in stable/9/sys: amd64/conf i386/conf
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2012 23:02:01 -0000

On Mon, 2 Apr 2012, Jung-uk Kim wrote:
> Author: jkim
> Date: Mon Apr  2 18:13:29 2012
> New Revision: 233797
> URL: http://svn.freebsd.org/changeset/base/233797
> 
> Log:
>   MFC:	r232416, r232561
>   
>   Add VESA option to GENERIC for amd64 and i386.

This commit breaks resume for me on an IBM ThinkPad X60 running i386 9.0.  
Removing VESA from the kernel again fixes resume.  On resume, I get this 
panic: http://people.freebsd.org/~gavin/IMAG0881.jpg .  I've tested it on 
head, and get the same panic with VESA in the kernel.  From the debugger, 
"show registers" gives:
  cs   0xc000
  ss   0x28
  edx  0x80
  esp  0xc1821fe8
  eip  0xe44f
  efl  0xb0202
with all other registers are zero.

Unfortunately, I don't know what other information I can get from this 
panic.  The backtrace gives no useful information, and the IP is not 
within kernel space.

BTW, this machine used to require hw.acpi.reset_video=1, but no longer 
appears to require this.  However, whether this is set or not appears to 
make no difference to the panic above.

Thanks,

Gavin

From owner-svn-src-stable-9@FreeBSD.ORG  Tue Apr 10 01:20:33 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 598511065672;
	Tue, 10 Apr 2012 01:20:33 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3AF9B8FC21;
	Tue, 10 Apr 2012 01:20:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3A1KXBN089680;
	Tue, 10 Apr 2012 01:20:33 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3A1KXBu089675;
	Tue, 10 Apr 2012 01:20:33 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201204100120.q3A1KXBu089675@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 10 Apr 2012 01:20:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234075 - in stable/9/sys: kern sys
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2012 01:20:33 -0000

Author: eadler
Date: Tue Apr 10 01:20:32 2012
New Revision: 234075
URL: http://svn.freebsd.org/changeset/base/234075

Log:
  MFC 231814 233135:
  	Add a timestamp to the msgbuf output in order to determine when when
  	messages were printed.
  
  	This can be enabled with the kern.msgbuf_show_timestamp sysctl
  
  PR:		kern/161553
  Approved by:	cperciva (implicit)

Modified:
  stable/9/sys/kern/subr_msgbuf.c
  stable/9/sys/sys/msgbuf.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/subr_msgbuf.c
==============================================================================
--- stable/9/sys/kern/subr_msgbuf.c	Mon Apr  9 22:41:19 2012	(r234074)
+++ stable/9/sys/kern/subr_msgbuf.c	Tue Apr 10 01:20:32 2012	(r234075)
@@ -32,8 +32,10 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
+#include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/msgbuf.h>
+#include <sys/sysctl.h>
 
 /*
  * Maximum number conversion buffer length: uintmax_t in base 2, plus <>
@@ -47,6 +49,15 @@
 static u_int msgbuf_cksum(struct msgbuf *mbp);
 
 /*
+ * Timestamps in msgbuf are useful when trying to diagnose when core dumps
+ * or other actions occured.
+ */
+static int msgbuf_show_timestamp = 0;
+SYSCTL_INT(_kern, OID_AUTO, msgbuf_show_timestamp, CTLFLAG_RW | CTLFLAG_TUN,
+    &msgbuf_show_timestamp, 0, "Show timestamp in msgbuf");
+TUNABLE_INT("kern.msgbuf_show_timestamp", &msgbuf_show_timestamp);
+
+/*
  * Initialize a message buffer of the specified size at the specified
  * location. This also zeros the buffer area.
  */
@@ -60,7 +71,7 @@ msgbuf_init(struct msgbuf *mbp, void *pt
 	msgbuf_clear(mbp);
 	mbp->msg_magic = MSG_MAGIC;
 	mbp->msg_lastpri = -1;
-	mbp->msg_needsnl = 0;
+	mbp->msg_flags = 0;
 	bzero(&mbp->msg_lock, sizeof(mbp->msg_lock));
 	mtx_init(&mbp->msg_lock, "msgbuf", NULL, MTX_SPIN);
 }
@@ -95,7 +106,7 @@ msgbuf_reinit(struct msgbuf *mbp, void *
 
 	mbp->msg_lastpri = -1;
 	/* Assume that the old message buffer didn't end in a newline. */
-	mbp->msg_needsnl = 1;
+	mbp->msg_flags |= MSGBUF_NEEDNL;
 	bzero(&mbp->msg_lock, sizeof(mbp->msg_lock));
 	mtx_init(&mbp->msg_lock, "msgbuf", NULL, MTX_SPIN);
 }
@@ -133,19 +144,17 @@ msgbuf_getcount(struct msgbuf *mbp)
  *
  * The caller should hold the message buffer spinlock.
  */
-static inline void
-msgbuf_do_addchar(struct msgbuf *mbp, u_int *seq, int c)
+
+static void
+msgbuf_do_addchar(struct msgbuf * const mbp, u_int * const seq, const int c)
 {
 	u_int pos;
 
 	/* Make sure we properly wrap the sequence number. */
 	pos = MSGBUF_SEQ_TO_POS(mbp, *seq);
-
-	mbp->msg_cksum += (u_int)c -
+	mbp->msg_cksum += (u_int)(u_char)c -
 	    (u_int)(u_char)mbp->msg_ptr[pos];
-
 	mbp->msg_ptr[pos] = c;
-
 	*seq = MSGBUF_SEQNORM(mbp, *seq + 1);
 }
 
@@ -176,7 +185,8 @@ msgbuf_addstr(struct msgbuf *mbp, int pr
 	u_int seq;
 	size_t len, prefix_len;
 	char prefix[MAXPRIBUF];
-	int nl, i;
+	char buf[32];
+	int nl, i, j, needtime;
 
 	len = strlen(str);
 	prefix_len = 0;
@@ -207,25 +217,36 @@ msgbuf_addstr(struct msgbuf *mbp, int pr
 	 * did not end with a newline.  If that is the case, we need to
 	 * insert a newline before this string.
 	 */
-	if (mbp->msg_lastpri != pri && mbp->msg_needsnl != 0) {
+	if (mbp->msg_lastpri != pri && (mbp->msg_flags & MSGBUF_NEEDNL) != 0) {
 
 		msgbuf_do_addchar(mbp, &seq, '\n');
-		mbp->msg_needsnl = 0;
+		mbp->msg_flags &= ~MSGBUF_NEEDNL;
 	}
 
+	needtime = 1;
 	for (i = 0; i < len; i++) {
 		/*
 		 * If we just had a newline, and the priority is not -1
 		 * (and therefore prefix_len != 0), then we need a priority
 		 * prefix for this line.
 		 */
-		if (mbp->msg_needsnl == 0 && prefix_len != 0) {
+		if ((mbp->msg_flags & MSGBUF_NEEDNL) == 0 && prefix_len != 0) {
 			int j;
 
 			for (j = 0; j < prefix_len; j++)
 				msgbuf_do_addchar(mbp, &seq, prefix[j]);
 		}
 
+		if (msgbuf_show_timestamp && needtime == 1 &&
+		    (mbp->msg_flags & MSGBUF_NEEDNL) == 0) {
+
+			snprintf(buf, sizeof(buf), "[%jd] ",
+			    (intmax_t)time_uptime);
+			for (j = 0; buf[j] != '\0'; j++)
+				msgbuf_do_addchar(mbp, &seq, buf[j]);
+			needtime = 0;
+		}
+
 		/*
 		 * Don't copy carriage returns if the caller requested
 		 * filtering.
@@ -242,9 +263,9 @@ msgbuf_addstr(struct msgbuf *mbp, int pr
 		 * we need to insert a new prefix or insert a newline later.
 		 */
 		if (str[i] == '\n')
-			mbp->msg_needsnl = 0;
+			mbp->msg_flags &= ~MSGBUF_NEEDNL;
 		else
-			mbp->msg_needsnl = 1;
+			mbp->msg_flags |= MSGBUF_NEEDNL;
 
 		msgbuf_do_addchar(mbp, &seq, str[i]);
 	}

Modified: stable/9/sys/sys/msgbuf.h
==============================================================================
--- stable/9/sys/sys/msgbuf.h	Mon Apr  9 22:41:19 2012	(r234074)
+++ stable/9/sys/sys/msgbuf.h	Tue Apr 10 01:20:32 2012	(r234075)
@@ -46,7 +46,8 @@ struct msgbuf {
 	u_int	   msg_cksum;		/* checksum of contents */
 	u_int	   msg_seqmod;		/* range for sequence numbers */
 	int	   msg_lastpri;		/* saved priority value */
-	int	   msg_needsnl;		/* set when newline needed */
+	u_int      msg_flags;
+#define MSGBUF_NEEDNL	0x01	/* set when newline needed */
 	struct mtx msg_lock;		/* mutex to protect the buffer */
 };
 

From owner-svn-src-stable-9@FreeBSD.ORG  Tue Apr 10 13:37:43 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 97ACF106564A;
	Tue, 10 Apr 2012 13:37:43 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 818918FC1A;
	Tue, 10 Apr 2012 13:37:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3ADbhMm025823;
	Tue, 10 Apr 2012 13:37:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3ADbhss025821;
	Tue, 10 Apr 2012 13:37:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201204101337.q3ADbhss025821@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 10 Apr 2012 13:37:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234097 - stable/9/lib/libc/powerpc64/gen
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2012 13:37:43 -0000

Author: nwhitehorn
Date: Tue Apr 10 13:37:43 2012
New Revision: 234097
URL: http://svn.freebsd.org/changeset/base/234097

Log:
  MFC r234003:
  
  Properly resolve the _ctx_start function descriptor (the symbol _ctx_start
  is a descriptor, not a code address), which prevents crashes when starting
  a context. This fixes QEMU on powerpc64.

Modified:
  stable/9/lib/libc/powerpc64/gen/makecontext.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/powerpc64/gen/makecontext.c
==============================================================================
--- stable/9/lib/libc/powerpc64/gen/makecontext.c	Tue Apr 10 13:31:38 2012	(r234096)
+++ stable/9/lib/libc/powerpc64/gen/makecontext.c	Tue Apr 10 13:37:43 2012	(r234097)
@@ -111,7 +111,7 @@ __makecontext(ucontext_t *ucp, void (*st
 	 * Use caller-saved regs 14/15 to hold params that _ctx_start
 	 * will use to invoke the user-supplied func
 	 */
-	mc->mc_srr0 = (uintptr_t) _ctx_start;
+	mc->mc_srr0 = *(uintptr_t *)_ctx_start;
 	mc->mc_gpr[1] = (uintptr_t) sp;		/* new stack pointer */
 	mc->mc_gpr[14] = (uintptr_t) start;	/* r14 <- start */
 	mc->mc_gpr[15] = (uintptr_t) ucp;	/* r15 <- ucp */

From owner-svn-src-stable-9@FreeBSD.ORG  Tue Apr 10 17:13:19 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@FreeBSD.org
Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by hub.freebsd.org (Postfix) with ESMTP id ECF101065675;
	Tue, 10 Apr 2012 17:13:18 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
From: Jung-uk Kim <jkim@FreeBSD.org>
To: Gavin Atkinson <gavin@FreeBSD.org>
Date: Tue, 10 Apr 2012 13:13:07 -0400
User-Agent: KMail/1.6.2
References: <201204021813.q32IDTmf009879@svn.freebsd.org>
	<alpine.LNX.2.00.1204092152260.9103@ury.york.ac.uk>
In-Reply-To: <alpine.LNX.2.00.1204092152260.9103@ury.york.ac.uk>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201204101313.09608.jkim@FreeBSD.org>
Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org, svn-src-stable-9@FreeBSD.org
Subject: Re: svn commit: r233797 - in stable/9/sys: amd64/conf i386/conf
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2012 17:13:19 -0000

On Monday 09 April 2012 07:01 pm, Gavin Atkinson wrote:
> On Mon, 2 Apr 2012, Jung-uk Kim wrote:
> > Author: jkim
> > Date: Mon Apr  2 18:13:29 2012
> > New Revision: 233797
> > URL: http://svn.freebsd.org/changeset/base/233797
> >
> > Log:
> >   MFC:	r232416, r232561
> >
> >   Add VESA option to GENERIC for amd64 and i386.
>
> This commit breaks resume for me on an IBM ThinkPad X60 running
> i386 9.0. Removing VESA from the kernel again fixes resume.  On
> resume, I get this panic:
> http://people.freebsd.org/~gavin/IMAG0881.jpg .  I've tested it on
> head, and get the same panic with VESA in the kernel.  From the
> debugger, "show registers" gives:
>   cs   0xc000
>   ss   0x28
>   edx  0x80
>   esp  0xc1821fe8
>   eip  0xe44f
>   efl  0xb0202
> with all other registers are zero.

> Unfortunately, I don't know what other information I can get from
> this panic.  The backtrace gives no useful information, and the IP
> is not within kernel space.

The address is for VM86 call for video BIOS (i.e., 16-bit real mode) 
and it is trying to access 0x1000, which is not in the mapped address 
range.  I have heard that some broken IBM/Lenovo BIOSes may do 
something like this, unfortunately.  Probably we should map the whole 
first page for that to work around it.  I'll write a patch for that 
and let you know privately.

> BTW, this machine used to require hw.acpi.reset_video=1, but no
> longer appears to require this.  However, whether this is set or
> not appears to make no difference to the panic above.

"hw.acpi.reset_video" tunable is dangerous and deprecated.  VESA 
module does it more safely and that's why I added it by default. :-)

Jung-uk Kim

From owner-svn-src-stable-9@FreeBSD.ORG  Tue Apr 10 21:23:28 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9075D106566B;
	Tue, 10 Apr 2012 21:23:28 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A41F8FC18;
	Tue, 10 Apr 2012 21:23:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3ALNSR9041039;
	Tue, 10 Apr 2012 21:23:28 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3ALNSwV041037;
	Tue, 10 Apr 2012 21:23:28 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201204102123.q3ALNSwV041037@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 10 Apr 2012 21:23:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234111 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2012 21:23:28 -0000

Author: adrian
Date: Tue Apr 10 21:23:28 2012
New Revision: 234111
URL: http://svn.freebsd.org/changeset/base/234111

Log:
  MFC r226294 / r226793 from HEAD - Only call fixup_filename() when printing.
  
  This reduces CPU overhead on lock-happy workloads when using WITNESS.

Modified:
  stable/9/sys/kern/subr_witness.c   (contents, props changed)

Modified: stable/9/sys/kern/subr_witness.c
==============================================================================
--- stable/9/sys/kern/subr_witness.c	Tue Apr 10 19:47:44 2012	(r234110)
+++ stable/9/sys/kern/subr_witness.c	Tue Apr 10 21:23:28 2012	(r234111)
@@ -719,6 +719,18 @@ static int witness_cold = 1;
  */
 static int witness_spin_warn = 0;
 
+/* Trim useless garbage from filenames. */
+static const char *
+fixup_filename(const char *file)
+{
+
+	if (file == NULL)
+		return (NULL);
+	while (strncmp(file, "../", 3) == 0)
+		file += 3;
+	return (file);
+}
+
 /*
  * The WITNESS-enabled diagnostic code.  Note that the witness code does
  * assume that the early boot is single-threaded at least until after this
@@ -924,7 +936,7 @@ witness_ddb_display_descendants(int(*prn
  	}
  	w->w_displayed = 1;
 	if (w->w_file != NULL && w->w_line != 0)
-		prnt(" -- last acquired @ %s:%d\n", w->w_file,
+		prnt(" -- last acquired @ %s:%d\n", fixup_filename(w->w_file),
 		    w->w_line);
 	else
 		prnt(" -- never acquired\n");
@@ -990,18 +1002,6 @@ witness_ddb_display(int(*prnt)(const cha
 }
 #endif /* DDB */
 
-/* Trim useless garbage from filenames. */
-static const char *
-fixup_filename(const char *file)
-{
-
-	if (file == NULL)
-		return (NULL);
-	while (strncmp(file, "../", 3) == 0)
-		file += 3;
-	return (file);
-}
-
 int
 witness_defineorder(struct lock_object *lock1, struct lock_object *lock2)
 {
@@ -1053,7 +1053,6 @@ witness_checkorder(struct lock_object *l
 	w = lock->lo_witness;
 	class = LOCK_CLASS(lock);
 	td = curthread;
-	file = fixup_filename(file);
 
 	if (class->lc_flags & LC_SLEEPLOCK) {
 
@@ -1064,7 +1063,8 @@ witness_checkorder(struct lock_object *l
 		 */
 		if (td->td_critnest != 0 && !kdb_active)
 			panic("blockable sleep lock (%s) %s @ %s:%d",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 
 		/*
 		 * If this is the first lock acquired then just return as
@@ -1102,17 +1102,19 @@ witness_checkorder(struct lock_object *l
 		if ((lock1->li_flags & LI_EXCLUSIVE) != 0 &&
 		    (flags & LOP_EXCLUSIVE) == 0) {
 			printf("shared lock of (%s) %s @ %s:%d\n",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 			printf("while exclusively locked from %s:%d\n",
-			    lock1->li_file, lock1->li_line);
+			    fixup_filename(lock1->li_file), lock1->li_line);
 			panic("share->excl");
 		}
 		if ((lock1->li_flags & LI_EXCLUSIVE) == 0 &&
 		    (flags & LOP_EXCLUSIVE) != 0) {
 			printf("exclusive lock of (%s) %s @ %s:%d\n",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 			printf("while share locked from %s:%d\n",
-			    lock1->li_file, lock1->li_line);
+			    fixup_filename(lock1->li_file), lock1->li_line);
 			panic("excl->share");
 		}
 		return;
@@ -1165,11 +1167,12 @@ witness_checkorder(struct lock_object *l
 			    "acquiring duplicate lock of same type: \"%s\"\n", 
 			    w->w_name);
 			printf(" 1st %s @ %s:%d\n", plock->li_lock->lo_name,
-			       plock->li_file, plock->li_line);
-			printf(" 2nd %s @ %s:%d\n", lock->lo_name, file, line);
+			    fixup_filename(plock->li_file), plock->li_line);
+			printf(" 2nd %s @ %s:%d\n", lock->lo_name,
+			    fixup_filename(file), line);
 			witness_debugger(1);
-		    } else
-			    mtx_unlock_spin(&w_mtx);
+		} else
+			mtx_unlock_spin(&w_mtx);
 		return;
 	}
 	mtx_assert(&w_mtx, MA_OWNED);
@@ -1307,19 +1310,24 @@ witness_checkorder(struct lock_object *l
 			if (i < 0) {
 				printf(" 1st %p %s (%s) @ %s:%d\n",
 				    lock1->li_lock, lock1->li_lock->lo_name,
-				    w1->w_name, lock1->li_file, lock1->li_line);
+				    w1->w_name, fixup_filename(lock1->li_file),
+				    lock1->li_line);
 				printf(" 2nd %p %s (%s) @ %s:%d\n", lock,
-				    lock->lo_name, w->w_name, file, line);
+				    lock->lo_name, w->w_name,
+				    fixup_filename(file), line);
 			} else {
 				printf(" 1st %p %s (%s) @ %s:%d\n",
 				    lock2->li_lock, lock2->li_lock->lo_name,
 				    lock2->li_lock->lo_witness->w_name,
-				    lock2->li_file, lock2->li_line);
+				    fixup_filename(lock2->li_file),
+				    lock2->li_line);
 				printf(" 2nd %p %s (%s) @ %s:%d\n",
 				    lock1->li_lock, lock1->li_lock->lo_name,
-				    w1->w_name, lock1->li_file, lock1->li_line);
+				    w1->w_name, fixup_filename(lock1->li_file),
+				    lock1->li_line);
 				printf(" 3rd %p %s (%s) @ %s:%d\n", lock,
-				    lock->lo_name, w->w_name, file, line);
+				    lock->lo_name, w->w_name,
+				    fixup_filename(file), line);
 			}
 			witness_debugger(1);
 			return;
@@ -1356,7 +1364,6 @@ witness_lock(struct lock_object *lock, i
 		return;
 	w = lock->lo_witness;
 	td = curthread;
-	file = fixup_filename(file);
 
 	/* Determine lock list for this lock. */
 	if (LOCK_CLASS(lock)->lc_flags & LC_SLEEPLOCK)
@@ -1413,27 +1420,31 @@ witness_upgrade(struct lock_object *lock
 	if (lock->lo_witness == NULL || witness_watch == -1 || panicstr != NULL)
 		return;
 	class = LOCK_CLASS(lock);
-	file = fixup_filename(file);
 	if (witness_watch) {
 		if ((lock->lo_flags & LO_UPGRADABLE) == 0)
 			panic("upgrade of non-upgradable lock (%s) %s @ %s:%d",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		if ((class->lc_flags & LC_SLEEPLOCK) == 0)
 			panic("upgrade of non-sleep lock (%s) %s @ %s:%d",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 	}
 	instance = find_instance(curthread->td_sleeplocks, lock);
 	if (instance == NULL)
 		panic("upgrade of unlocked lock (%s) %s @ %s:%d",
-		    class->lc_name, lock->lo_name, file, line);
+		    class->lc_name, lock->lo_name,
+		    fixup_filename(file), line);
 	if (witness_watch) {
 		if ((instance->li_flags & LI_EXCLUSIVE) != 0)
 			panic("upgrade of exclusive lock (%s) %s @ %s:%d",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		if ((instance->li_flags & LI_RECURSEMASK) != 0)
 			panic("upgrade of recursed lock (%s) %s r=%d @ %s:%d",
 			    class->lc_name, lock->lo_name,
-			    instance->li_flags & LI_RECURSEMASK, file, line);
+			    instance->li_flags & LI_RECURSEMASK,
+			    fixup_filename(file), line);
 	}
 	instance->li_flags |= LI_EXCLUSIVE;
 }
@@ -1449,27 +1460,31 @@ witness_downgrade(struct lock_object *lo
 	if (lock->lo_witness == NULL || witness_watch == -1 || panicstr != NULL)
 		return;
 	class = LOCK_CLASS(lock);
-	file = fixup_filename(file);
 	if (witness_watch) {
 		if ((lock->lo_flags & LO_UPGRADABLE) == 0)
 		panic("downgrade of non-upgradable lock (%s) %s @ %s:%d",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		if ((class->lc_flags & LC_SLEEPLOCK) == 0)
 			panic("downgrade of non-sleep lock (%s) %s @ %s:%d",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 	}
 	instance = find_instance(curthread->td_sleeplocks, lock);
 	if (instance == NULL)
 		panic("downgrade of unlocked lock (%s) %s @ %s:%d",
-		    class->lc_name, lock->lo_name, file, line);
+		    class->lc_name, lock->lo_name,
+		    fixup_filename(file), line);
 	if (witness_watch) {
 		if ((instance->li_flags & LI_EXCLUSIVE) == 0)
 			panic("downgrade of shared lock (%s) %s @ %s:%d",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		if ((instance->li_flags & LI_RECURSEMASK) != 0)
 			panic("downgrade of recursed lock (%s) %s r=%d @ %s:%d",
 			    class->lc_name, lock->lo_name,
-			    instance->li_flags & LI_RECURSEMASK, file, line);
+			    instance->li_flags & LI_RECURSEMASK,
+			    fixup_filename(file), line);
 	}
 	instance->li_flags &= ~LI_EXCLUSIVE;
 }
@@ -1488,7 +1503,6 @@ witness_unlock(struct lock_object *lock,
 		return;
 	td = curthread;
 	class = LOCK_CLASS(lock);
-	file = fixup_filename(file);
 
 	/* Find lock instance associated with this lock. */
 	if (class->lc_flags & LC_SLEEPLOCK)
@@ -1511,7 +1525,7 @@ witness_unlock(struct lock_object *lock,
 	 */
 	if (witness_watch > 0)
 		panic("lock (%s) %s not locked @ %s:%d", class->lc_name,
-		    lock->lo_name, file, line);
+		    lock->lo_name, fixup_filename(file), line);
 	else
 		return;
 found:
@@ -1520,16 +1534,17 @@ found:
 	if ((instance->li_flags & LI_EXCLUSIVE) != 0 && witness_watch > 0 &&
 	    (flags & LOP_EXCLUSIVE) == 0) {
 		printf("shared unlock of (%s) %s @ %s:%d\n", class->lc_name,
-		    lock->lo_name, file, line);
+		    lock->lo_name, fixup_filename(file), line);
 		printf("while exclusively locked from %s:%d\n",
-		    instance->li_file, instance->li_line);
+		    fixup_filename(instance->li_file), instance->li_line);
 		panic("excl->ushare");
 	}
 	if ((instance->li_flags & LI_EXCLUSIVE) == 0 && witness_watch > 0 &&
 	    (flags & LOP_EXCLUSIVE) != 0) {
 		printf("exclusive unlock of (%s) %s @ %s:%d\n", class->lc_name,
-		    lock->lo_name, file, line);
-		printf("while share locked from %s:%d\n", instance->li_file,
+		    lock->lo_name, fixup_filename(file), line);
+		printf("while share locked from %s:%d\n",
+		    fixup_filename(instance->li_file),
 		    instance->li_line);
 		panic("share->uexcl");
 	}
@@ -1544,7 +1559,7 @@ found:
 	/* The lock is now being dropped, check for NORELEASE flag */
 	if ((instance->li_flags & LI_NORELEASE) != 0 && witness_watch > 0) {
 		printf("forbidden unlock of (%s) %s @ %s:%d\n", class->lc_name,
-		    lock->lo_name, file, line);
+		    lock->lo_name, fixup_filename(file), line);
 		panic("lock marked norelease");
 	}
 
@@ -2074,8 +2089,8 @@ witness_list_lock(struct lock_instance *
 	if (lock->lo_witness->w_name != lock->lo_name)
 		prnt(" (%s)", lock->lo_witness->w_name);
 	prnt(" r = %d (%p) locked @ %s:%d\n",
-	    instance->li_flags & LI_RECURSEMASK, lock, instance->li_file,
-	    instance->li_line);
+	    instance->li_flags & LI_RECURSEMASK, lock,
+	    fixup_filename(instance->li_file), instance->li_line);
 }
 
 #ifdef DDB
@@ -2211,12 +2226,12 @@ witness_assert(struct lock_object *lock,
 		panic("Lock (%s) %s is not sleep or spin!",
 		    class->lc_name, lock->lo_name);
 	}
-	file = fixup_filename(file);
 	switch (flags) {
 	case LA_UNLOCKED:
 		if (instance != NULL)
 			panic("Lock (%s) %s locked @ %s:%d.",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		break;
 	case LA_LOCKED:
 	case LA_LOCKED | LA_RECURSED:
@@ -2229,28 +2244,34 @@ witness_assert(struct lock_object *lock,
 	case LA_XLOCKED | LA_NOTRECURSED:
 		if (instance == NULL) {
 			panic("Lock (%s) %s not locked @ %s:%d.",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 			break;
 		}
 		if ((flags & LA_XLOCKED) != 0 &&
 		    (instance->li_flags & LI_EXCLUSIVE) == 0)
 			panic("Lock (%s) %s not exclusively locked @ %s:%d.",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		if ((flags & LA_SLOCKED) != 0 &&
 		    (instance->li_flags & LI_EXCLUSIVE) != 0)
 			panic("Lock (%s) %s exclusively locked @ %s:%d.",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		if ((flags & LA_RECURSED) != 0 &&
 		    (instance->li_flags & LI_RECURSEMASK) == 0)
 			panic("Lock (%s) %s not recursed @ %s:%d.",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		if ((flags & LA_NOTRECURSED) != 0 &&
 		    (instance->li_flags & LI_RECURSEMASK) != 0)
 			panic("Lock (%s) %s recursed @ %s:%d.",
-			    class->lc_name, lock->lo_name, file, line);
+			    class->lc_name, lock->lo_name,
+			    fixup_filename(file), line);
 		break;
 	default:
-		panic("Invalid lock assertion at %s:%d.", file, line);
+		panic("Invalid lock assertion at %s:%d.",
+		    fixup_filename(file), line);
 
 	}
 #endif	/* INVARIANT_SUPPORT */

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 00:28:45 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5B76A106566B;
	Wed, 11 Apr 2012 00:28:45 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 45FD98FC18;
	Wed, 11 Apr 2012 00:28:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3B0SjJm046938;
	Wed, 11 Apr 2012 00:28:45 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3B0SjVK046936;
	Wed, 11 Apr 2012 00:28:45 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201204110028.q3B0SjVK046936@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 11 Apr 2012 00:28:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234116 - stable/9/sys/powerpc/include
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 00:28:45 -0000

Author: nwhitehorn
Date: Wed Apr 11 00:28:44 2012
New Revision: 234116
URL: http://svn.freebsd.org/changeset/base/234116

Log:
  MFC r233948:
  Give the kernel pmap lock a different name than user pmap locks. It has
  (slightly) different semantics and renaming it prevents a (harmless)
  WITNESS warning during bootup for 32-bit kernels on 64-bit CPUs.

Modified:
  stable/9/sys/powerpc/include/pmap.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/include/pmap.h
==============================================================================
--- stable/9/sys/powerpc/include/pmap.h	Wed Apr 11 00:00:40 2012	(r234115)
+++ stable/9/sys/powerpc/include/pmap.h	Wed Apr 11 00:28:44 2012	(r234116)
@@ -212,8 +212,9 @@ extern	struct pmap kernel_pmap_store;
 #define	PMAP_LOCK_ASSERT(pmap, type) \
 				mtx_assert(&(pmap)->pm_mtx, (type))
 #define	PMAP_LOCK_DESTROY(pmap)	mtx_destroy(&(pmap)->pm_mtx)
-#define	PMAP_LOCK_INIT(pmap)	mtx_init(&(pmap)->pm_mtx, "pmap", \
-				    NULL, MTX_DEF)
+#define	PMAP_LOCK_INIT(pmap)	mtx_init(&(pmap)->pm_mtx, \
+				    (pmap == kernel_pmap) ? "kernelpmap" : \
+				    "pmap", NULL, MTX_DEF)
 #define	PMAP_LOCKED(pmap)	mtx_owned(&(pmap)->pm_mtx)
 #define	PMAP_MTX(pmap)		(&(pmap)->pm_mtx)
 #define	PMAP_TRYLOCK(pmap)	mtx_trylock(&(pmap)->pm_mtx)

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 04:57:12 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 255211065672;
	Wed, 11 Apr 2012 04:57:12 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E4468FC12;
	Wed, 11 Apr 2012 04:57:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3B4vBsr055417;
	Wed, 11 Apr 2012 04:57:11 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3B4vB7D055415;
	Wed, 11 Apr 2012 04:57:11 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201204110457.q3B4vB7D055415@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 11 Apr 2012 04:57:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234119 - stable/9/sys/ufs/ffs
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 04:57:12 -0000

Author: kib
Date: Wed Apr 11 04:57:11 2012
New Revision: 234119
URL: http://svn.freebsd.org/changeset/base/234119

Log:
  MFC r233609, r233610:
  Restore the writes of atimes, quotas and superblock from syncer vnode.

Modified:
  stable/9/sys/ufs/ffs/ffs_vfsops.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_vfsops.c	Wed Apr 11 02:42:01 2012	(r234118)
+++ stable/9/sys/ufs/ffs/ffs_vfsops.c	Wed Apr 11 04:57:11 2012	(r234119)
@@ -80,6 +80,8 @@ static int	ffs_mountfs(struct vnode *, s
 static void	ffs_oldfscompat_read(struct fs *, struct ufsmount *,
 		    ufs2_daddr_t);
 static void	ffs_ifree(struct ufsmount *ump, struct inode *ip);
+static int	ffs_sync_lazy(struct mount *mp);
+
 static vfs_init_t ffs_init;
 static vfs_uninit_t ffs_uninit;
 static vfs_extattrctl_t ffs_extattrctl;
@@ -1411,11 +1413,77 @@ ffs_statfs(mp, sbp)
 }
 
 /*
+ * For a lazy sync, we only care about access times, quotas and the
+ * superblock.  Other filesystem changes are already converted to
+ * cylinder group blocks or inode blocks updates and are written to
+ * disk by syncer.
+ */
+static int
+ffs_sync_lazy(mp)
+     struct mount *mp;
+{
+	struct vnode *mvp, *vp;
+	struct inode *ip;
+	struct thread *td;
+	int allerror, error;
+
+	allerror = 0;
+	td = curthread;
+	if ((mp->mnt_flag & MNT_NOATIME) != 0)
+		goto qupdate;
+	MNT_ILOCK(mp);
+	MNT_VNODE_FOREACH(vp, mp, mvp) {
+		VI_LOCK(vp);
+		if (vp->v_iflag & VI_DOOMED || vp->v_type == VNON) {
+			VI_UNLOCK(vp);
+			continue;
+		}
+		ip = VTOI(vp);
+
+		/*
+		 * The IN_ACCESS flag is converted to IN_MODIFIED by
+		 * ufs_close() and ufs_getattr() by the calls to
+		 * ufs_itimes_locked(), without subsequent UFS_UPDATE().
+		 * Test also all the other timestamp flags too, to pick up
+		 * any other cases that could be missed.
+		 */
+		if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED |
+		    IN_UPDATE)) == 0) {
+			VI_UNLOCK(vp);
+			continue;
+		}
+		MNT_IUNLOCK(mp);
+		if ((error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK,
+		    td)) != 0) {
+			MNT_ILOCK(mp);
+			continue;
+		}
+		error = ffs_update(vp, 0);
+		if (error != 0)
+			allerror = error;
+		vput(vp);
+		MNT_ILOCK(mp);
+	}
+	MNT_IUNLOCK(mp);
+
+qupdate:
+#ifdef QUOTA
+	qsync(mp);
+#endif
+
+	if (VFSTOUFS(mp)->um_fs->fs_fmod != 0 &&
+	    (error = ffs_sbupdate(VFSTOUFS(mp), MNT_LAZY, 0)) != 0)
+		allerror = error;
+	return (allerror);
+}
+
+/*
  * Go through the disk queues to initiate sandbagged IO;
  * go through the inodes to write those that have been modified;
  * initiate the writing of the super block if it has been modified.
  *
- * Note: we are always called with the filesystem marked `MPBUSY'.
+ * Note: we are always called with the filesystem marked busy using
+ * vfs_busy().
  */
 static int
 ffs_sync(mp, waitfor)
@@ -1444,15 +1512,9 @@ ffs_sync(mp, waitfor)
 	if (fs->fs_fmod != 0 && fs->fs_ronly != 0 && ump->um_fsckpid == 0)
 		panic("%s: ffs_sync: modification on read-only filesystem",
 		    fs->fs_fsmnt);
-	/*
-	 * For a lazy sync, we just care about the filesystem metadata.
-	 */
-	if (waitfor == MNT_LAZY) {
-		secondary_accwrites = 0;
-		secondary_writes = 0;
-		lockreq = 0;
-		goto metasync;
-	}
+	if (waitfor == MNT_LAZY)
+		return (ffs_sync_lazy(mp));
+
 	/*
 	 * Write back each (modified) inode.
 	 */
@@ -1527,7 +1589,6 @@ loop:
 	qsync(mp);
 #endif
 
-metasync:
 	devvp = ump->um_devvp;
 	bo = &devvp->v_bufobj;
 	BO_LOCK(bo);

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 07:08:42 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7196C106566C;
	Wed, 11 Apr 2012 07:08:42 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 512F68FC19;
	Wed, 11 Apr 2012 07:08:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3B78gxO059784;
	Wed, 11 Apr 2012 07:08:42 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3B78gAj059780;
	Wed, 11 Apr 2012 07:08:42 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201204110708.q3B78gAj059780@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Wed, 11 Apr 2012 07:08:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234123 - in stable/9/sys: dev/fxp i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 07:08:42 -0000

Author: yongari
Date: Wed Apr 11 07:08:41 2012
New Revision: 234123
URL: http://svn.freebsd.org/changeset/base/234123

Log:
  MFC r233585-233587:
  r233585:
    Partially revert r223608 and selectively allow microcode loading
    for 82550C.  For 82550 controllers this change restores CPUSaver
    microcode loading.  Due to silicon bug on 82550 and 82550C with
    server extension, these controllers seem to require CPUSaver
    microcode to receive fragmented UDP datagrams.  However the
    microcode shouldn't be used on client featured 82550C as it locks
    up the controller.  In addition, client featured 82550C does not
    have the silicon bug.  Also clear temporary memory used for
    microcode loading since the same memory area is used for other
    commands.
    While I'm here use 82550C in probe message instead of generic
    82550.
  
    Reported by:	Andreas Longwitz <longwitz <> incore de>
    Tested by:	Andreas Longwitz <longwitz <> incore de>
  
  r233586:
    Load entire EEPROM contents in device attach time and verify
    whether the checksum of EEPROM is valid or not.  Because driver
    heavily relies on EEPROM information when it selectively enables
    features/workarounds, it would be helpful to know whether driver
    sees valid EEPROM.
    While I'm here remove all other EEPROM accesses since the entire
    EEPROM is loaded at device attach time.
  
  r233587:
    Remove unnecessary #if as the software workaround for PCI protocol
    violation should be activated unless the system is cold-booted
    after updating EEPROM.
    The PCI protocol violation happens only when established link is
    10Mbps so the workaround should be updated whenever link state
    change is detected.  Previously the workaround was activated only
    when user checks current media status with ifconfig(8).

Modified:
  stable/9/sys/dev/fxp/if_fxp.c
  stable/9/sys/dev/fxp/if_fxpreg.h
  stable/9/sys/dev/fxp/if_fxpvar.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/dev/fxp/if_fxp.c
==============================================================================
--- stable/9/sys/dev/fxp/if_fxp.c	Wed Apr 11 06:35:13 2012	(r234122)
+++ stable/9/sys/dev/fxp/if_fxp.c	Wed Apr 11 07:08:41 2012	(r234123)
@@ -194,7 +194,7 @@ static const struct fxp_ident const fxp_
     { 0x1229,	0x08,	0, "Intel 82559 Pro/100 Ethernet" },
     { 0x1229,	0x09,	0, "Intel 82559ER Pro/100 Ethernet" },
     { 0x1229,	0x0c,	0, "Intel 82550 Pro/100 Ethernet" },
-    { 0x1229,	0x0d,	0, "Intel 82550 Pro/100 Ethernet" },
+    { 0x1229,	0x0d,	0, "Intel 82550C Pro/100 Ethernet" },
     { 0x1229,	0x0e,	0, "Intel 82550 Pro/100 Ethernet" },
     { 0x1229,	0x0f,	0, "Intel 82551 Pro/100 Ethernet" },
     { 0x1229,	0x10,	0, "Intel 82551 Pro/100 Ethernet" },
@@ -248,6 +248,7 @@ static uint16_t		fxp_eeprom_getword(stru
 static void 		fxp_eeprom_putword(struct fxp_softc *sc, int offset,
 			    uint16_t data);
 static void		fxp_autosize_eeprom(struct fxp_softc *sc);
+static void		fxp_load_eeprom(struct fxp_softc *sc);
 static void		fxp_read_eeprom(struct fxp_softc *sc, u_short *data,
 			    int offset, int words);
 static void		fxp_write_eeprom(struct fxp_softc *sc, u_short *data,
@@ -426,7 +427,7 @@ fxp_attach(device_t dev)
 	struct fxp_rx *rxp;
 	struct ifnet *ifp;
 	uint32_t val;
-	uint16_t data, myea[ETHER_ADDR_LEN / 2];
+	uint16_t data;
 	u_char eaddr[ETHER_ADDR_LEN];
 	int error, flags, i, pmc, prefer_iomap;
 
@@ -498,6 +499,7 @@ fxp_attach(device_t dev)
 	 * Find out how large of an SEEPROM we have.
 	 */
 	fxp_autosize_eeprom(sc);
+	fxp_load_eeprom(sc);
 
 	/*
 	 * Find out the chip revision; lump all 82557 revs together.
@@ -507,7 +509,7 @@ fxp_attach(device_t dev)
 		/* Assume ICH controllers are 82559. */
 		sc->revision = FXP_REV_82559_A0;
 	} else {
-		fxp_read_eeprom(sc, &data, 5, 1);
+		data = sc->eeprom[FXP_EEPROM_MAP_CNTR];
 		if ((data >> 8) == 1)
 			sc->revision = FXP_REV_82557;
 		else
@@ -519,15 +521,27 @@ fxp_attach(device_t dev)
 	 */
 	if (sc->revision >= FXP_REV_82558_A4 &&
 	    sc->revision != FXP_REV_82559S_A) {
-		fxp_read_eeprom(sc, &data, 10, 1);
+		data = sc->eeprom[FXP_EEPROM_MAP_ID];
 		if ((data & 0x20) != 0 &&
 		    pci_find_cap(sc->dev, PCIY_PMG, &pmc) == 0)
 			sc->flags |= FXP_FLAG_WOLCAP;
 	}
 
+	if (sc->revision == FXP_REV_82550_C) {
+		/*
+		 * 82550C with server extension requires microcode to
+		 * receive fragmented UDP datagrams.  However if the
+		 * microcode is used for client-only featured 82550C
+		 * it locks up controller.
+		 */
+		data = sc->eeprom[FXP_EEPROM_MAP_COMPAT];
+		if ((data & 0x0400) == 0)
+			sc->flags |= FXP_FLAG_NO_UCODE;
+	}
+
 	/* Receiver lock-up workaround detection. */
 	if (sc->revision < FXP_REV_82558_A4) {
-		fxp_read_eeprom(sc, &data, 3, 1);
+		data = sc->eeprom[FXP_EEPROM_MAP_COMPAT];
 		if ((data & 0x03) != 0x03) {
 			sc->flags |= FXP_FLAG_RXBUG;
 			device_printf(dev, "Enabling Rx lock-up workaround\n");
@@ -537,7 +551,7 @@ fxp_attach(device_t dev)
 	/*
 	 * Determine whether we must use the 503 serial interface.
 	 */
-	fxp_read_eeprom(sc, &data, 6, 1);
+	data = sc->eeprom[FXP_EEPROM_MAP_PRI_PHY];
 	if (sc->revision == FXP_REV_82557 && (data & FXP_PHY_DEVICE_MASK) != 0
 	    && (data & FXP_PHY_SERIAL_ONLY))
 		sc->flags |= FXP_FLAG_SERIAL_MEDIA;
@@ -557,7 +571,7 @@ fxp_attach(device_t dev)
 	 */
 	if ((sc->ident->ich >= 2 && sc->ident->ich <= 3) ||
 	    (sc->ident->ich == 0 && sc->revision >= FXP_REV_82559_A0)) {
-		fxp_read_eeprom(sc, &data, 10, 1);
+		data = sc->eeprom[FXP_EEPROM_MAP_ID];
 		if (data & 0x02) {			/* STB enable */
 			uint16_t cksum;
 			int i;
@@ -565,27 +579,24 @@ fxp_attach(device_t dev)
 			device_printf(dev,
 			    "Disabling dynamic standby mode in EEPROM\n");
 			data &= ~0x02;
-			fxp_write_eeprom(sc, &data, 10, 1);
+			sc->eeprom[FXP_EEPROM_MAP_ID] = data;
+			fxp_write_eeprom(sc, &data, FXP_EEPROM_MAP_ID, 1);
 			device_printf(dev, "New EEPROM ID: 0x%x\n", data);
 			cksum = 0;
-			for (i = 0; i < (1 << sc->eeprom_size) - 1; i++) {
-				fxp_read_eeprom(sc, &data, i, 1);
-				cksum += data;
-			}
+			for (i = 0; i < (1 << sc->eeprom_size) - 1; i++)
+				cksum += sc->eeprom[i];
 			i = (1 << sc->eeprom_size) - 1;
 			cksum = 0xBABA - cksum;
-			fxp_read_eeprom(sc, &data, i, 1);
 			fxp_write_eeprom(sc, &cksum, i, 1);
 			device_printf(dev,
 			    "EEPROM checksum @ 0x%x: 0x%x -> 0x%x\n",
-			    i, data, cksum);
-#if 1
+			    i, sc->eeprom[i], cksum);
+			sc->eeprom[i] = cksum;
 			/*
 			 * If the user elects to continue, try the software
 			 * workaround, as it is better than nothing.
 			 */
 			sc->flags |= FXP_FLAG_CU_RESUME_BUG;
-#endif
 		}
 	}
 
@@ -779,21 +790,20 @@ fxp_attach(device_t dev)
 	/*
 	 * Read MAC address.
 	 */
-	fxp_read_eeprom(sc, myea, 0, 3);
-	eaddr[0] = myea[0] & 0xff;
-	eaddr[1] = myea[0] >> 8;
-	eaddr[2] = myea[1] & 0xff;
-	eaddr[3] = myea[1] >> 8;
-	eaddr[4] = myea[2] & 0xff;
-	eaddr[5] = myea[2] >> 8;
+	eaddr[0] = sc->eeprom[FXP_EEPROM_MAP_IA0] & 0xff;
+	eaddr[1] = sc->eeprom[FXP_EEPROM_MAP_IA0] >> 8;
+	eaddr[2] = sc->eeprom[FXP_EEPROM_MAP_IA1] & 0xff;
+	eaddr[3] = sc->eeprom[FXP_EEPROM_MAP_IA1] >> 8;
+	eaddr[4] = sc->eeprom[FXP_EEPROM_MAP_IA2] & 0xff;
+	eaddr[5] = sc->eeprom[FXP_EEPROM_MAP_IA2] >> 8;
 	if (bootverbose) {
 		device_printf(dev, "PCI IDs: %04x %04x %04x %04x %04x\n",
 		    pci_get_vendor(dev), pci_get_device(dev),
 		    pci_get_subvendor(dev), pci_get_subdevice(dev),
 		    pci_get_revid(dev));
-		fxp_read_eeprom(sc, &data, 10, 1);
 		device_printf(dev, "Dynamic Standby mode is %s\n",
-		    data & 0x02 ? "enabled" : "disabled");
+		    sc->eeprom[FXP_EEPROM_MAP_ID] & 0x02 ? "enabled" :
+		    "disabled");
 	}
 
 	/*
@@ -1289,6 +1299,23 @@ fxp_write_eeprom(struct fxp_softc *sc, u
 		fxp_eeprom_putword(sc, offset + i, data[i]);
 }
 
+static void
+fxp_load_eeprom(struct fxp_softc *sc)
+{
+	int i;
+	uint16_t cksum;
+
+	fxp_read_eeprom(sc, sc->eeprom, 0, 1 << sc->eeprom_size);
+	cksum = 0;
+	for (i = 0; i < (1 << sc->eeprom_size) - 1; i++)
+		cksum += sc->eeprom[i];
+	cksum = 0xBABA - cksum;
+	if (cksum != sc->eeprom[(1 << sc->eeprom_size) - 1])
+		device_printf(sc->dev,
+		    "EEPROM checksum mismatch! (0x%04x -> 0x%04x)\n",
+		    cksum, sc->eeprom[(1 << sc->eeprom_size) - 1]);
+}
+
 /*
  * Grab the softc lock and call the real fxp_start_body() routine
  */
@@ -2582,12 +2609,6 @@ fxp_ifmedia_sts(struct ifnet *ifp, struc
 	mii_pollstat(mii);
 	ifmr->ifm_active = mii->mii_media_active;
 	ifmr->ifm_status = mii->mii_media_status;
-
-	if (IFM_SUBTYPE(ifmr->ifm_active) == IFM_10_T &&
-	    sc->flags & FXP_FLAG_CU_RESUME_BUG)
-		sc->cu_resume_bug = 1;
-	else
-		sc->cu_resume_bug = 0;
 	FXP_UNLOCK(sc);
 }
 
@@ -2780,6 +2801,11 @@ fxp_miibus_statchg(device_t dev)
 	    (IFM_AVALID | IFM_ACTIVE))
 		return;
 
+	if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T &&
+	    sc->flags & FXP_FLAG_CU_RESUME_BUG)
+		sc->cu_resume_bug = 1;
+	else
+		sc->cu_resume_bug = 0;
 	/*
 	 * Call fxp_init_body in order to adjust the flow control settings.
 	 * Note that the 82557 doesn't support hardware flow control.
@@ -3014,10 +3040,8 @@ static uint32_t fxp_ucode_d101a[] = D101
 static uint32_t fxp_ucode_d101b0[] = D101_B0_RCVBUNDLE_UCODE;
 static uint32_t fxp_ucode_d101ma[] = D101M_B_RCVBUNDLE_UCODE;
 static uint32_t fxp_ucode_d101s[] = D101S_RCVBUNDLE_UCODE;
-#ifdef notyet
 static uint32_t fxp_ucode_d102[] = D102_B_RCVBUNDLE_UCODE;
 static uint32_t fxp_ucode_d102c[] = D102_C_RCVBUNDLE_UCODE;
-#endif
 static uint32_t fxp_ucode_d102e[] = D102_E_RCVBUNDLE_UCODE;
 
 #define UCODE(x)	x, sizeof(x)/sizeof(uint32_t)
@@ -3035,12 +3059,10 @@ static const struct ucode {
 	    D101M_CPUSAVER_DWORD, D101M_CPUSAVER_BUNDLE_MAX_DWORD },
 	{ FXP_REV_82559S_A, UCODE(fxp_ucode_d101s),
 	    D101S_CPUSAVER_DWORD, D101S_CPUSAVER_BUNDLE_MAX_DWORD },
-#ifdef notyet
 	{ FXP_REV_82550, UCODE(fxp_ucode_d102),
 	    D102_B_CPUSAVER_DWORD, D102_B_CPUSAVER_BUNDLE_MAX_DWORD },
 	{ FXP_REV_82550_C, UCODE(fxp_ucode_d102c),
 	    D102_C_CPUSAVER_DWORD, D102_C_CPUSAVER_BUNDLE_MAX_DWORD },
-#endif
 	{ FXP_REV_82551_F, UCODE(fxp_ucode_d102e),
 	    D102_E_CPUSAVER_DWORD, D102_E_CPUSAVER_BUNDLE_MAX_DWORD },
 	{ FXP_REV_82551_10, UCODE(fxp_ucode_d102e),
@@ -3055,6 +3077,9 @@ fxp_load_ucode(struct fxp_softc *sc)
 	struct fxp_cb_ucode *cbp;
 	int i;
 
+	if (sc->flags & FXP_FLAG_NO_UCODE)
+		return;
+
 	for (uc = ucode_table; uc->ucode != NULL; uc++)
 		if (sc->revision == uc->revision)
 			break;
@@ -3087,6 +3112,7 @@ fxp_load_ucode(struct fxp_softc *sc)
 	    sc->tunable_int_delay,
 	    uc->bundle_max_offset == 0 ? 0 : sc->tunable_bundle_max);
 	sc->flags |= FXP_FLAG_UCODE;
+	bzero(cbp, FXP_TXCB_SZ);
 }
 
 #define FXP_SYSCTL_STAT_ADD(c, h, n, p, d)	\

Modified: stable/9/sys/dev/fxp/if_fxpreg.h
==============================================================================
--- stable/9/sys/dev/fxp/if_fxpreg.h	Wed Apr 11 06:35:13 2012	(r234122)
+++ stable/9/sys/dev/fxp/if_fxpreg.h	Wed Apr 11 07:08:41 2012	(r234123)
@@ -448,6 +448,24 @@ struct fxp_stats {
 #define FXP_EEPROM_OPC_READ	0x6
 
 /*
+ * EEPROM map
+ */
+#define	FXP_EEPROM_MAP_IA0	0x00		/* Station address */
+#define	FXP_EEPROM_MAP_IA1	0x01
+#define	FXP_EEPROM_MAP_IA2	0x02
+#define	FXP_EEPROM_MAP_COMPAT	0x03		/* Compatibility */
+#define	FXP_EEPROM_MAP_CNTR	0x05		/* Controller/connector type */
+#define	FXP_EEPROM_MAP_PRI_PHY	0x06		/* Primary PHY record */
+#define	FXP_EEPROM_MAP_SEC_PHY	0x07		/* Secondary PHY record */
+#define	FXP_EEPROM_MAP_PWA0	0x08		/* Printed wire assembly num. */
+#define	FXP_EEPROM_MAP_PWA1	0x09		/* Printed wire assembly num. */
+#define	FXP_EEPROM_MAP_ID	0x0A		/* EEPROM ID */
+#define	FXP_EEPROM_MAP_SUBSYS	0x0B		/* Subsystem ID */
+#define	FXP_EEPROM_MAP_SUBVEN	0x0C		/* Subsystem vendor ID */
+#define	FXP_EEPROM_MAP_CKSUM64	0x3F		/* 64-word EEPROM checksum */
+#define	FXP_EEPROM_MAP_CKSUM256	0xFF		/* 256-word EEPROM checksum */
+
+/*
  * Management Data Interface opcodes
  */
 #define FXP_MDI_WRITE		0x1

Modified: stable/9/sys/dev/fxp/if_fxpvar.h
==============================================================================
--- stable/9/sys/dev/fxp/if_fxpvar.h	Wed Apr 11 06:35:13 2012	(r234122)
+++ stable/9/sys/dev/fxp/if_fxpvar.h	Wed Apr 11 07:08:41 2012	(r234123)
@@ -219,6 +219,7 @@ struct fxp_softc {
 	int if_flags;
 	uint8_t rfa_size;
 	uint32_t tx_cmd;
+	uint16_t eeprom[256];
 };
 
 #define FXP_FLAG_MWI_ENABLE	0x0001	/* MWI enable */
@@ -236,6 +237,7 @@ struct fxp_softc {
 #define FXP_FLAG_WOLCAP		0x2000	/* WOL capability */
 #define FXP_FLAG_WOL		0x4000	/* WOL active */
 #define FXP_FLAG_RXBUG		0x8000	/* Rx lock-up bug */
+#define FXP_FLAG_NO_UCODE	0x10000	/* ucode is not applicable */
 
 /* Macros to ease CSR access. */
 #define	CSR_READ_1(sc, reg)		bus_read_1(sc->fxp_res[0], reg)

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 07:18:41 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D39BE106566C;
	Wed, 11 Apr 2012 07:18:41 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BD3BA8FC08;
	Wed, 11 Apr 2012 07:18:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3B7IfMC060290;
	Wed, 11 Apr 2012 07:18:41 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3B7IfCw060287;
	Wed, 11 Apr 2012 07:18:41 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201204110718.q3B7IfCw060287@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Wed, 11 Apr 2012 07:18:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234126 - in stable/9/sys: dev/ale i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 07:18:41 -0000

Author: yongari
Date: Wed Apr 11 07:18:41 2012
New Revision: 234126
URL: http://svn.freebsd.org/changeset/base/234126

Log:
  MFC r233688-233689:
  r233688:
    Remove task queue based link state change handler. Driver no longer
    needs to defer link state handling.
    While I'm here, mark IFF_DRV_RUNNING before changing media.  If
    link is established without any delay, that link state change
    handling could be lost.
  
  r233689:
    Do not report current link status if driver is not running.
    This change also workarounds dhclient's link state handling bug by
    not giving current link status.
  
    Unlike other controllers, ale(4)'s PHY hibernation perfectly works
    such that driver does not see a valid link if the controller is not
    brought up.  If dhclient(8) runs on ale(4) it will blindly waits
    until link UP and then gives up after 10 seconds.  Because
    dhclient(8) still thinks interface got a valid link when IFM_AVALID
    is not set for selected media,  this change makes dhclient initiate
    DHCP without waiting for link UP.

Modified:
  stable/9/sys/dev/ale/if_ale.c
  stable/9/sys/dev/ale/if_alevar.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/dev/ale/if_ale.c
==============================================================================
--- stable/9/sys/dev/ale/if_ale.c	Wed Apr 11 07:12:20 2012	(r234125)
+++ stable/9/sys/dev/ale/if_ale.c	Wed Apr 11 07:18:41 2012	(r234126)
@@ -115,7 +115,6 @@ static void	ale_init_tx_ring(struct ale_
 static void	ale_int_task(void *, int);
 static int	ale_intr(void *);
 static int	ale_ioctl(struct ifnet *, u_long, caddr_t);
-static void	ale_link_task(void *, int);
 static void	ale_mac_config(struct ale_softc *);
 static int	ale_miibus_readreg(device_t, int, int);
 static void	ale_miibus_statchg(device_t);
@@ -253,10 +252,45 @@ static void
 ale_miibus_statchg(device_t dev)
 {
 	struct ale_softc *sc;
+	struct mii_data *mii;
+	struct ifnet *ifp;
+	uint32_t reg;
 
 	sc = device_get_softc(dev);
+	mii = device_get_softc(sc->ale_miibus);
+	ifp = sc->ale_ifp;
+	if (mii == NULL || ifp == NULL ||
+	    (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+		return;
+
+	sc->ale_flags &= ~ALE_FLAG_LINK;
+	if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
+	    (IFM_ACTIVE | IFM_AVALID)) {
+		switch (IFM_SUBTYPE(mii->mii_media_active)) {
+		case IFM_10_T:
+		case IFM_100_TX:
+			sc->ale_flags |= ALE_FLAG_LINK;
+			break;
+		case IFM_1000_T:
+			if ((sc->ale_flags & ALE_FLAG_FASTETHER) == 0)
+				sc->ale_flags |= ALE_FLAG_LINK;
+			break;
+		default:
+			break;
+		}
+	}
 
-	taskqueue_enqueue(taskqueue_swi, &sc->ale_link_task);
+	/* Stop Rx/Tx MACs. */
+	ale_stop_mac(sc);
+
+	/* Program MACs with resolved speed/duplex/flow-control. */
+	if ((sc->ale_flags & ALE_FLAG_LINK) != 0) {
+		ale_mac_config(sc);
+		/* Reenable Tx/Rx MACs. */
+		reg = CSR_READ_4(sc, ALE_MAC_CFG);
+		reg |= MAC_CFG_TX_ENB | MAC_CFG_RX_ENB;
+		CSR_WRITE_4(sc, ALE_MAC_CFG, reg);
+	}
 }
 
 static void
@@ -267,6 +301,10 @@ ale_mediastatus(struct ifnet *ifp, struc
 
 	sc = ifp->if_softc;
 	ALE_LOCK(sc);
+	if ((ifp->if_flags & IFF_UP) == 0) {
+		ALE_UNLOCK(sc);
+		return;
+	}
 	mii = device_get_softc(sc->ale_miibus);
 
 	mii_pollstat(mii);
@@ -425,7 +463,6 @@ ale_attach(device_t dev)
 	    MTX_DEF);
 	callout_init_mtx(&sc->ale_tick_ch, &sc->ale_mtx, 0);
 	TASK_INIT(&sc->ale_int_task, 0, ale_int_task, sc);
-	TASK_INIT(&sc->ale_link_task, 0, ale_link_task, sc);
 
 	/* Map the device. */
 	pci_enable_busmaster(dev);
@@ -679,7 +716,6 @@ ale_detach(device_t dev)
 		ALE_UNLOCK(sc);
 		callout_drain(&sc->ale_tick_ch);
 		taskqueue_drain(sc->ale_tq, &sc->ale_int_task);
-		taskqueue_drain(taskqueue_swi, &sc->ale_link_task);
 	}
 
 	if (sc->ale_tq != NULL) {
@@ -2076,57 +2112,6 @@ ale_mac_config(struct ale_softc *sc)
 }
 
 static void
-ale_link_task(void *arg, int pending)
-{
-	struct ale_softc *sc;
-	struct mii_data *mii;
-	struct ifnet *ifp;
-	uint32_t reg;
-
-	sc = (struct ale_softc *)arg;
-
-	ALE_LOCK(sc);
-	mii = device_get_softc(sc->ale_miibus);
-	ifp = sc->ale_ifp;
-	if (mii == NULL || ifp == NULL ||
-	    (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
-		ALE_UNLOCK(sc);
-		return;
-	}
-
-	sc->ale_flags &= ~ALE_FLAG_LINK;
-	if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
-	    (IFM_ACTIVE | IFM_AVALID)) {
-		switch (IFM_SUBTYPE(mii->mii_media_active)) {
-		case IFM_10_T:
-		case IFM_100_TX:
-			sc->ale_flags |= ALE_FLAG_LINK;
-			break;
-		case IFM_1000_T:
-			if ((sc->ale_flags & ALE_FLAG_FASTETHER) == 0)
-				sc->ale_flags |= ALE_FLAG_LINK;
-			break;
-		default:
-			break;
-		}
-	}
-
-	/* Stop Rx/Tx MACs. */
-	ale_stop_mac(sc);
-
-	/* Program MACs with resolved speed/duplex/flow-control. */
-	if ((sc->ale_flags & ALE_FLAG_LINK) != 0) {
-		ale_mac_config(sc);
-		/* Reenable Tx/Rx MACs. */
-		reg = CSR_READ_4(sc, ALE_MAC_CFG);
-		reg |= MAC_CFG_TX_ENB | MAC_CFG_RX_ENB;
-		CSR_WRITE_4(sc, ALE_MAC_CFG, reg);
-	}
-
-	ALE_UNLOCK(sc);
-}
-
-static void
 ale_stats_clear(struct ale_softc *sc)
 {
 	struct smb sb;
@@ -2876,14 +2861,14 @@ ale_init_locked(struct ale_softc *sc)
 	CSR_WRITE_4(sc, ALE_INTR_STATUS, 0xFFFFFFFF);
 	CSR_WRITE_4(sc, ALE_INTR_STATUS, 0);
 
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+
 	sc->ale_flags &= ~ALE_FLAG_LINK;
 	/* Switch to the current media. */
 	mii_mediachg(mii);
 
 	callout_reset(&sc->ale_tick_ch, hz, ale_tick, sc);
-
-	ifp->if_drv_flags |= IFF_DRV_RUNNING;
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 }
 
 static void

Modified: stable/9/sys/dev/ale/if_alevar.h
==============================================================================
--- stable/9/sys/dev/ale/if_alevar.h	Wed Apr 11 07:12:20 2012	(r234125)
+++ stable/9/sys/dev/ale/if_alevar.h	Wed Apr 11 07:18:41 2012	(r234126)
@@ -221,7 +221,6 @@ struct ale_softc {
 	int			ale_pagesize;
 
 	struct task		ale_int_task;
-	struct task		ale_link_task;
 	struct taskqueue	*ale_tq;
 	struct mtx		ale_mtx;
 };

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 19:37:09 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6B9F71065670;
	Wed, 11 Apr 2012 19:37:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 561C38FC12;
	Wed, 11 Apr 2012 19:37:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3BJb91r092258;
	Wed, 11 Apr 2012 19:37:09 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3BJb95Z092255;
	Wed, 11 Apr 2012 19:37:09 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204111937.q3BJb95Z092255@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 11 Apr 2012 19:37:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234141 - in stable/9/sys: i386/acpica i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 19:37:09 -0000

Author: jhb
Date: Wed Apr 11 19:37:08 2012
New Revision: 234141
URL: http://svn.freebsd.org/changeset/base/234141

Log:
  MFC 232742:
  MFamd64:
  - Return failure for a suspend attempt if we have no wake address.
  - Use intr_disable()/intr_restore() instead of ACPI_DISABLE_IRQS().
  - Invoke intr_suspend() earlier and call intr_resume() if suspend
    fails.
  - Use pause in the loop waiting for CPU to suspend.
  - Restore PAT MSR, switchtime, switchticks, and MTRRs on resume.

Modified:
  stable/9/sys/i386/acpica/acpi_wakeup.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/i386/acpica/acpi_wakeup.c
==============================================================================
--- stable/9/sys/i386/acpica/acpi_wakeup.c	Wed Apr 11 16:11:08 2012	(r234140)
+++ stable/9/sys/i386/acpica/acpi_wakeup.c	Wed Apr 11 19:37:08 2012	(r234141)
@@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
@@ -200,13 +202,14 @@ acpi_sleep_machdep(struct acpi_softc *sc
 	uint32_t		cr3;
 	u_long			ef;
 
-	ret = 0;
+	ret = -1;
 	if (sc->acpi_wakeaddr == 0)
-		return (0);
+		return (ret);
 
 	AcpiSetFirmwareWakingVector(sc->acpi_wakephys);
 
-	ef = read_eflags();
+	ef = intr_disable();
+	intr_suspend();
 
 	/*
 	 * Temporarily switch to the kernel pmap because it provides an
@@ -222,10 +225,8 @@ acpi_sleep_machdep(struct acpi_softc *sc
 #endif
 
 	ret_addr = 0;
-	ACPI_DISABLE_IRQS();
 	if (acpi_savecpu()) {
 		/* Execute Sleep */
-		intr_suspend();
 
 		p_gdt = (struct region_descriptor *)
 				(sc->acpi_wakeaddr + physical_gdt);
@@ -267,25 +268,31 @@ acpi_sleep_machdep(struct acpi_softc *sc
 			device_printf(sc->acpi_dev,
 				"AcpiEnterSleepState failed - %s\n",
 				AcpiFormatException(status));
-			ret = -1;
 			goto out;
 		}
 
-		for (;;) ;
+		for (;;)
+			ia32_pause();
 	} else {
-		/* Execute Wakeup */
-		mca_resume();
-		intr_resume();
-
+		pmap_init_pat();
+		PCPU_SET(switchtime, 0);
+		PCPU_SET(switchticks, ticks);
 		if (bootverbose) {
 			acpi_savecpu();
 			acpi_printcpu();
 		}
+		ret = 0;
 	}
 
 out:
 	load_cr3(cr3);
-	write_eflags(ef);
+	mca_resume();
+	intr_resume();
+	intr_restore(ef);
+
+	if (ret == 0 && mem_range_softc.mr_op != NULL &&
+	    mem_range_softc.mr_op->reinit != NULL)
+		mem_range_softc.mr_op->reinit(&mem_range_softc);
 
 	/* If we beeped, turn it off after a delay. */
 	if (acpi_resume_beep)

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 20:04:32 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5105F106564A;
	Wed, 11 Apr 2012 20:04:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3815E8FC15;
	Wed, 11 Apr 2012 20:04:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3BK4W7Y093278;
	Wed, 11 Apr 2012 20:04:32 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3BK4VR2093267;
	Wed, 11 Apr 2012 20:04:31 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204112004.q3BK4VR2093267@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 11 Apr 2012 20:04:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234144 - in stable/9/sys: amd64/amd64 conf i386/conf
	i386/i386 i386/include kern pc98/pc98 x86/isa x86/x86
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 20:04:32 -0000

Author: jhb
Date: Wed Apr 11 20:04:31 2012
New Revision: 234144
URL: http://svn.freebsd.org/changeset/base/234144

Log:
  MFC 232744,232747,233031:
  - Allow a native i386 kernel to be built with 'nodevice atpic'.  Just as on
    amd64, if 'device isa' is present quiesce the 8259A's during boot and
    resume from suspend.
  - Move i386's intr_machdep.c to the x86 tree and share it with amd64.
  - Merge r232744 changes to pc98.
    (Allow a kernel to be built with 'nodevice atpic'.)
  - Move ICU related defines from x86/isa/atpic.c to x86/isa/icu.h and
    use them in x86/x86/intr_machdep.c.
  
  Note, I normally would have merged 232747 separately, but 233031 assumed
  232747 was already merged and 232744 needs to be merged with 233031.

Added:
  stable/9/sys/x86/x86/intr_machdep.c
     - copied, changed from r232747, head/sys/x86/x86/intr_machdep.c
Deleted:
  stable/9/sys/amd64/amd64/intr_machdep.c
  stable/9/sys/i386/i386/intr_machdep.c
Modified:
  stable/9/sys/conf/files.amd64
  stable/9/sys/conf/files.i386
  stable/9/sys/conf/files.pc98
  stable/9/sys/i386/i386/exception.s
  stable/9/sys/i386/i386/machdep.c
  stable/9/sys/i386/include/intr_machdep.h
  stable/9/sys/pc98/pc98/machdep.c
  stable/9/sys/x86/isa/atpic.c
  stable/9/sys/x86/isa/icu.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/conf/files.amd64
==============================================================================
--- stable/9/sys/conf/files.amd64	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/conf/files.amd64	Wed Apr 11 20:04:31 2012	(r234144)
@@ -112,7 +112,6 @@ amd64/amd64/gdb_machdep.c	optional	gdb
 amd64/amd64/identcpu.c		standard
 amd64/amd64/in_cksum.c		optional	inet | inet6
 amd64/amd64/initcpu.c		standard
-amd64/amd64/intr_machdep.c	standard
 amd64/amd64/io.c		optional	io
 amd64/amd64/legacy.c		standard
 amd64/amd64/locore.S		standard	no-obj
@@ -465,7 +464,7 @@ x86/cpufreq/p4tcc.c		optional	cpufreq
 x86/isa/atpic.c			optional	atpic isa
 x86/isa/atrtc.c			standard
 x86/isa/clock.c			standard
-x86/isa/elcr.c			standard
+x86/isa/elcr.c			optional	atpic isa | mptable
 x86/isa/isa.c			standard
 x86/isa/isa_dma.c		standard
 x86/isa/nmi.c			standard
@@ -474,6 +473,7 @@ x86/pci/pci_bus.c		optional	pci
 x86/pci/qpi.c			optional	pci
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
+x86/x86/intr_machdep.c		standard
 x86/x86/io_apic.c		standard
 x86/x86/local_apic.c		standard
 x86/x86/mca.c			standard

Modified: stable/9/sys/conf/files.i386
==============================================================================
--- stable/9/sys/conf/files.i386	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/conf/files.i386	Wed Apr 11 20:04:31 2012	(r234144)
@@ -404,7 +404,6 @@ i386/i386/i686_mem.c		optional mem
 i386/i386/identcpu.c		standard
 i386/i386/in_cksum.c		optional inet | inet6
 i386/i386/initcpu.c		standard
-i386/i386/intr_machdep.c	standard
 i386/i386/io.c			optional io
 i386/i386/k6_mem.c		optional mem
 i386/i386/legacy.c		optional native
@@ -515,9 +514,9 @@ x86/cpufreq/p4tcc.c		optional cpufreq
 x86/cpufreq/powernow.c		optional cpufreq
 x86/cpufreq/smist.c		optional cpufreq
 x86/isa/atpic.c			optional atpic	
-x86/isa/atrtc.c			optional atpic
+x86/isa/atrtc.c			optional native
 x86/isa/clock.c			optional native
-x86/isa/elcr.c			standard
+x86/isa/elcr.c			optional atpic | apic native
 x86/isa/isa.c			optional isa
 x86/isa/isa_dma.c		optional isa
 x86/isa/nmi.c			standard
@@ -526,6 +525,7 @@ x86/pci/pci_bus.c		optional pci
 x86/pci/qpi.c			optional pci
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
+x86/x86/intr_machdep.c		standard
 x86/x86/io_apic.c		optional apic
 x86/x86/local_apic.c		optional apic
 x86/x86/mca.c			standard

Modified: stable/9/sys/conf/files.pc98
==============================================================================
--- stable/9/sys/conf/files.pc98	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/conf/files.pc98	Wed Apr 11 20:04:31 2012	(r234144)
@@ -144,7 +144,6 @@ i386/i386/i686_mem.c		optional mem
 i386/i386/identcpu.c		standard
 i386/i386/in_cksum.c		optional inet | inet6
 i386/i386/initcpu.c		standard
-i386/i386/intr_machdep.c	standard
 i386/i386/io.c			optional io
 i386/i386/k6_mem.c		optional mem
 i386/i386/legacy.c		standard
@@ -227,7 +226,7 @@ pc98/cbus/gdc.c			optional gdc
 pc98/cbus/nmi.c			standard
 pc98/cbus/olpt.c		optional olpt
 pc98/cbus/pckbd.c		optional pckbd
-pc98/cbus/pcrtc.c		optional atpic
+pc98/cbus/pcrtc.c		standard
 pc98/cbus/pmc.c			optional pmc
 pc98/cbus/scgdcrndr.c		optional sc gdc
 pc98/cbus/scterm-sck.c		optional sc
@@ -251,6 +250,7 @@ x86/isa/isa.c			optional isa
 x86/pci/pci_bus.c		optional pci
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
+x86/x86/intr_machdep.c		standard
 x86/x86/io_apic.c		optional apic
 x86/x86/local_apic.c		optional apic
 x86/x86/mca.c			standard

Modified: stable/9/sys/i386/i386/exception.s
==============================================================================
--- stable/9/sys/i386/i386/exception.s	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/i386/i386/exception.s	Wed Apr 11 20:04:31 2012	(r234144)
@@ -35,6 +35,7 @@
  */
 
 #include "opt_apic.h"
+#include "opt_atpic.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
 #include "opt_npx.h"
@@ -299,14 +300,18 @@ ENTRY(fork_trampoline)
 	SUPERALIGN_TEXT
 MCOUNT_LABEL(bintr)
 
+#ifdef DEV_ATPIC
 #include <i386/i386/atpic_vector.s>
+#endif
 
-#ifdef DEV_APIC
+#if defined(DEV_APIC) && defined(DEV_ATPIC)
 	.data
 	.p2align 4
 	.text
 	SUPERALIGN_TEXT
+#endif
 
+#ifdef DEV_APIC
 #include <i386/i386/apic_vector.s>
 #endif
 

Modified: stable/9/sys/i386/i386/machdep.c
==============================================================================
--- stable/9/sys/i386/i386/machdep.c	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/i386/i386/machdep.c	Wed Apr 11 20:04:31 2012	(r234144)
@@ -40,7 +40,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_apic.h"
 #include "opt_atalk.h"
+#include "opt_atpic.h"
 #include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
@@ -135,6 +137,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #endif
 
+#ifdef DEV_APIC
+#include <machine/apicvar.h>
+#endif
+
 #ifdef DEV_ISA
 #include <x86/isa/icu.h>
 #endif
@@ -2683,8 +2689,22 @@ init386(first)
 		printf("WARNING: loader(8) metadata is missing!\n");
 
 #ifdef DEV_ISA
+#ifdef DEV_ATPIC
 	elcr_probe();
 	atpic_startup();
+#else
+	/* Reset and mask the atpics and leave them shut down. */
+	atpic_reset();
+
+	/*
+	 * Point the ICU spurious interrupt vectors at the APIC spurious
+	 * interrupt handler.
+	 */
+	setidt(IDT_IO_INTS + 7, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+	    GSEL(GCODE_SEL, SEL_KPL));
+	setidt(IDT_IO_INTS + 15, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+	    GSEL(GCODE_SEL, SEL_KPL));
+#endif
 #endif
 
 #ifdef DDB
@@ -2942,8 +2962,22 @@ init386(first)
 		printf("WARNING: loader(8) metadata is missing!\n");
 
 #ifdef DEV_ISA
+#ifdef DEV_ATPIC
 	elcr_probe();
 	atpic_startup();
+#else
+	/* Reset and mask the atpics and leave them shut down. */
+	atpic_reset();
+
+	/*
+	 * Point the ICU spurious interrupt vectors at the APIC spurious
+	 * interrupt handler.
+	 */
+	setidt(IDT_IO_INTS + 7, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+	    GSEL(GCODE_SEL, SEL_KPL));
+	setidt(IDT_IO_INTS + 15, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+	    GSEL(GCODE_SEL, SEL_KPL));
+#endif
 #endif
 
 #ifdef DDB

Modified: stable/9/sys/i386/include/intr_machdep.h
==============================================================================
--- stable/9/sys/i386/include/intr_machdep.h	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/i386/include/intr_machdep.h	Wed Apr 11 20:04:31 2012	(r234144)
@@ -123,6 +123,9 @@ struct trapframe;
 extern struct mtx icu_lock;
 extern int elcr_found;
 
+#ifndef DEV_ATPIC
+void	atpic_reset(void);
+#endif
 /* XXX: The elcr_* prototypes probably belong somewhere else. */
 int	elcr_probe(void);
 enum intr_trigger elcr_read_trigger(u_int irq);

Modified: stable/9/sys/pc98/pc98/machdep.c
==============================================================================
--- stable/9/sys/pc98/pc98/machdep.c	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/pc98/pc98/machdep.c	Wed Apr 11 20:04:31 2012	(r234144)
@@ -40,7 +40,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_apic.h"
 #include "opt_atalk.h"
+#include "opt_atpic.h"
 #include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
@@ -132,6 +134,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #endif
 
+#ifdef DEV_APIC
+#include <machine/apicvar.h>
+#endif
+
 #ifdef DEV_ISA
 #include <x86/isa/icu.h>
 #endif
@@ -2269,7 +2275,21 @@ init386(first)
 		printf("WARNING: loader(8) metadata is missing!\n");
 
 #ifdef DEV_ISA
+#ifdef DEV_ATPIC
 	atpic_startup();
+#else
+	/* Reset and mask the atpics and leave them shut down. */
+	atpic_reset();
+
+	/*
+	 * Point the ICU spurious interrupt vectors at the APIC spurious
+	 * interrupt handler.
+	 */
+	setidt(IDT_IO_INTS + 7, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+	    GSEL(GCODE_SEL, SEL_KPL));
+	setidt(IDT_IO_INTS + 15, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+	    GSEL(GCODE_SEL, SEL_KPL));
+#endif
 #endif
 
 #ifdef DDB

Modified: stable/9/sys/x86/isa/atpic.c
==============================================================================
--- stable/9/sys/x86/isa/atpic.c	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/x86/isa/atpic.c	Wed Apr 11 20:04:31 2012	(r234144)
@@ -72,48 +72,6 @@ __FBSDID("$FreeBSD$");
 #define	MASTER	0
 #define	SLAVE	1
 
-/*
- * PC-98 machines wire the slave 8259A to pin 7 on the master PIC, and
- * PC-AT machines wire the slave PIC to pin 2 on the master PIC.
- */
-#ifdef PC98
-#define	ICU_SLAVEID	7
-#else
-#define	ICU_SLAVEID	2
-#endif
-
-/*
- * Determine the base master and slave modes not including auto EOI support.
- * All machines that FreeBSD supports use 8086 mode.
- */
-#ifdef PC98
-/*
- * PC-98 machines do not support auto EOI on the second PIC.  Also, it
- * seems that PC-98 machine PICs use buffered mode, and the master PIC
- * uses special fully nested mode.
- */
-#define	BASE_MASTER_MODE	(ICW4_SFNM | ICW4_BUF | ICW4_MS | ICW4_8086)
-#define	BASE_SLAVE_MODE		(ICW4_BUF | ICW4_8086)
-#else
-#define	BASE_MASTER_MODE	ICW4_8086
-#define	BASE_SLAVE_MODE		ICW4_8086
-#endif
-
-/* Enable automatic EOI if requested. */
-#ifdef AUTO_EOI_1
-#define	MASTER_MODE		(BASE_MASTER_MODE | ICW4_AEOI)
-#else
-#define	MASTER_MODE		BASE_MASTER_MODE
-#endif
-#ifdef AUTO_EOI_2
-#define	SLAVE_MODE		(BASE_SLAVE_MODE | ICW4_AEOI)
-#else
-#define	SLAVE_MODE		BASE_SLAVE_MODE
-#endif
-
-#define	IRQ_MASK(irq)		(1 << (irq))
-#define	IMEN_MASK(ai)		(IRQ_MASK((ai)->at_irq))
-
 #define	NUM_ISA_IRQS		16
 
 static void	atpic_init(void *dummy);

Modified: stable/9/sys/x86/isa/icu.h
==============================================================================
--- stable/9/sys/x86/isa/icu.h	Wed Apr 11 19:58:29 2012	(r234143)
+++ stable/9/sys/x86/isa/icu.h	Wed Apr 11 20:04:31 2012	(r234144)
@@ -47,6 +47,48 @@
 #define	ICU_IMR_OFFSET	1
 #endif
 
+/*
+ * PC-98 machines wire the slave 8259A to pin 7 on the master PIC, and
+ * PC-AT machines wire the slave PIC to pin 2 on the master PIC.
+ */
+#ifdef PC98
+#define	ICU_SLAVEID	7
+#else
+#define	ICU_SLAVEID	2
+#endif
+
+/*
+ * Determine the base master and slave modes not including auto EOI support.
+ * All machines that FreeBSD supports use 8086 mode.
+ */
+#ifdef PC98
+/*
+ * PC-98 machines do not support auto EOI on the second PIC.  Also, it
+ * seems that PC-98 machine PICs use buffered mode, and the master PIC
+ * uses special fully nested mode.
+ */
+#define	BASE_MASTER_MODE	(ICW4_SFNM | ICW4_BUF | ICW4_MS | ICW4_8086)
+#define	BASE_SLAVE_MODE		(ICW4_BUF | ICW4_8086)
+#else
+#define	BASE_MASTER_MODE	ICW4_8086
+#define	BASE_SLAVE_MODE		ICW4_8086
+#endif
+
+/* Enable automatic EOI if requested. */
+#ifdef AUTO_EOI_1
+#define	MASTER_MODE		(BASE_MASTER_MODE | ICW4_AEOI)
+#else
+#define	MASTER_MODE		BASE_MASTER_MODE
+#endif
+#ifdef AUTO_EOI_2
+#define	SLAVE_MODE		(BASE_SLAVE_MODE | ICW4_AEOI)
+#else
+#define	SLAVE_MODE		BASE_SLAVE_MODE
+#endif
+
+#define	IRQ_MASK(irq)		(1 << (irq))
+#define	IMEN_MASK(ai)		(IRQ_MASK((ai)->at_irq))
+
 void	atpic_handle_intr(u_int vector, struct trapframe *frame);
 void	atpic_startup(void);
 

Copied and modified: stable/9/sys/x86/x86/intr_machdep.c (from r232747, head/sys/x86/x86/intr_machdep.c)
==============================================================================
--- head/sys/x86/x86/intr_machdep.c	Fri Mar  9 20:43:29 2012	(r232747, copy source)
+++ stable/9/sys/x86/x86/intr_machdep.c	Wed Apr 11 20:04:31 2012	(r234144)
@@ -63,8 +63,12 @@
 #include <machine/frame.h>
 #include <dev/ic/i8259.h>
 #include <x86/isa/icu.h>
+#ifdef PC98
+#include <pc98/cbus/cbus.h>
+#else
 #include <x86/isa/isa.h>
 #endif
+#endif
 
 #define	MAX_STRAY_LOG	5
 
@@ -391,15 +395,15 @@ atpic_reset(void)
 
 	outb(IO_ICU1, ICW1_RESET | ICW1_IC4);
 	outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS);
-	outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2);
-	outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086);
+	outb(IO_ICU1 + ICU_IMR_OFFSET, IRQ_MASK(ICU_SLAVEID));
+	outb(IO_ICU1 + ICU_IMR_OFFSET, MASTER_MODE);
 	outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff);
 	outb(IO_ICU1, OCW3_SEL | OCW3_RR);
 
 	outb(IO_ICU2, ICW1_RESET | ICW1_IC4);
 	outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8);
-	outb(IO_ICU2 + ICU_IMR_OFFSET, 2);
-	outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086);
+	outb(IO_ICU2 + ICU_IMR_OFFSET, ICU_SLAVEID);
+	outb(IO_ICU2 + ICU_IMR_OFFSET, SLAVE_MODE);
 	outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff);
 	outb(IO_ICU2, OCW3_SEL | OCW3_RR);
 }

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 20:19:08 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8DB2E1065672;
	Wed, 11 Apr 2012 20:19:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E1338FC08;
	Wed, 11 Apr 2012 20:19:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3BKJ8BT093836;
	Wed, 11 Apr 2012 20:19:08 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3BKJ8cv093833;
	Wed, 11 Apr 2012 20:19:08 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204112019.q3BKJ8cv093833@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 11 Apr 2012 20:19:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234145 - in stable/9/sys: amd64/include i386/conf
	i386/include kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 20:19:08 -0000

Author: jhb
Date: Wed Apr 11 20:19:07 2012
New Revision: 234145
URL: http://svn.freebsd.org/changeset/base/234145

Log:
  MFC 232228,233613:
  Move the DTrace return IDT vector back up from 0x20 to 0x92.  The 0x20
  vector is currently dedicated to servicing IRQ 0 from the 8259A's, so
  it shouldn't be overloaded for DTrace.

Modified:
  stable/9/sys/amd64/include/segments.h
  stable/9/sys/i386/include/segments.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/amd64/include/segments.h
==============================================================================
--- stable/9/sys/amd64/include/segments.h	Wed Apr 11 20:04:31 2012	(r234144)
+++ stable/9/sys/amd64/include/segments.h	Wed Apr 11 20:19:07 2012	(r234145)
@@ -214,7 +214,7 @@ struct region_descriptor {
 #define	IDT_XF		19	/* #XF: SIMD Floating-Point Exception */
 #define	IDT_IO_INTS	NRSVIDT	/* Base of IDT entries for I/O interrupts. */
 #define	IDT_SYSCALL	0x80	/* System Call Interrupt Vector */
-#define	IDT_DTRACE_RET	0x20	/* DTrace pid provider Interrupt Vector */
+#define	IDT_DTRACE_RET	0x92	/* DTrace pid provider Interrupt Vector */
 
 /*
  * Entries in the Global Descriptor Table (GDT)

Modified: stable/9/sys/i386/include/segments.h
==============================================================================
--- stable/9/sys/i386/include/segments.h	Wed Apr 11 20:04:31 2012	(r234144)
+++ stable/9/sys/i386/include/segments.h	Wed Apr 11 20:19:07 2012	(r234145)
@@ -207,7 +207,7 @@ struct region_descriptor {
 #define	IDT_XF		19	/* #XF: SIMD Floating-Point Exception */
 #define	IDT_IO_INTS	NRSVIDT	/* Base of IDT entries for I/O interrupts. */
 #define	IDT_SYSCALL	0x80	/* System Call Interrupt Vector */
-#define	IDT_DTRACE_RET	0x20	/* DTrace pid provider Interrupt Vector */
+#define	IDT_DTRACE_RET	0x92	/* DTrace pid provider Interrupt Vector */
 
 /*
  * Entries in the Global Descriptor Table (GDT)

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 20:25:01 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CD0091065670;
	Wed, 11 Apr 2012 20:25:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A4558FC1B;
	Wed, 11 Apr 2012 20:25:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3BKP1c6094191;
	Wed, 11 Apr 2012 20:25:01 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3BKP19o094189;
	Wed, 11 Apr 2012 20:25:01 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204112025.q3BKP19o094189@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 11 Apr 2012 20:25:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234147 - in stable/9/sys: i386/conf kern x86/acpica
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 20:25:01 -0000

Author: jhb
Date: Wed Apr 11 20:25:01 2012
New Revision: 234147
URL: http://svn.freebsd.org/changeset/base/234147

Log:
  MFC 233305,233623:
  - Mark the 'lapics' and 'ioapics' arrays here static since they are
    private to this file.  The 'lapics' array was actually shadowing a
    completely different 'lapics' array that is private to local_apic.c.
  - Allocate the ioapics[] array dynamically since it is only needed for the
    duration of madt_setup_io().  This avoids having the array take up
    permanent space in the BSS.

Modified:
  stable/9/sys/x86/acpica/madt.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/x86/acpica/madt.c
==============================================================================
--- stable/9/sys/x86/acpica/madt.c	Wed Apr 11 20:19:29 2012	(r234146)
+++ stable/9/sys/x86/acpica/madt.c	Wed Apr 11 20:25:01 2012	(r234147)
@@ -50,12 +50,12 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 
 /* These two arrays are indexed by APIC IDs. */
-struct ioapic_info {
+static struct {
 	void *io_apic;
 	UINT32 io_vector;
-} ioapics[MAX_APIC_ID + 1];
+} *ioapics;
 
-struct lapic_info {
+static struct lapic_info {
 	u_int la_enabled:1;
 	u_int la_acpi_id:8;
 } lapics[MAX_APIC_ID + 1];
@@ -162,7 +162,10 @@ madt_setup_io(void)
 		printf("Try disabling either ACPI or apic support.\n");
 		panic("Using MADT but ACPI doesn't work");
 	}
-		    
+
+	ioapics = malloc(sizeof(*ioapics) * (MAX_APIC_ID + 1), M_MADT,
+	    M_WAITOK | M_ZERO);
+
 	/* First, we run through adding I/O APIC's. */
 	madt_walk_table(madt_parse_apics, NULL);
 
@@ -194,6 +197,9 @@ madt_setup_io(void)
 	/* Finally, we throw the switch to enable the I/O APIC's. */
 	acpi_SetDefaultIntrModel(ACPI_INTR_APIC);
 
+	free(ioapics, M_MADT);
+	ioapics = NULL;
+
 	return (0);
 }
 

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 20:26:51 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 89AF2106564A;
	Wed, 11 Apr 2012 20:26:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 743348FC15;
	Wed, 11 Apr 2012 20:26:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3BKQp9W094290;
	Wed, 11 Apr 2012 20:26:51 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3BKQpgP094288;
	Wed, 11 Apr 2012 20:26:51 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204112026.q3BKQpgP094288@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 11 Apr 2012 20:26:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234148 - in stable/9/sys: conf i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 20:26:51 -0000

Author: jhb
Date: Wed Apr 11 20:26:50 2012
New Revision: 234148
URL: http://svn.freebsd.org/changeset/base/234148

Log:
  MFC 233893:
  Disable INET6 support in modules when building the LINT-NOINET6 kernel.

Modified:
  stable/9/sys/conf/makeLINT.mk
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/conf/makeLINT.mk
==============================================================================
--- stable/9/sys/conf/makeLINT.mk	Wed Apr 11 20:25:01 2012	(r234147)
+++ stable/9/sys/conf/makeLINT.mk	Wed Apr 11 20:26:50 2012	(r234148)
@@ -23,6 +23,7 @@ LINT: ${NOTES} ../../conf/makeLINT.sed
 	echo "nodevice gre"		>> ${.TARGET}-NOINET
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET6
 	echo "ident ${.TARGET}-NOINET6"	>> ${.TARGET}-NOINET6
+	echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOINET6
 	echo "nooptions INET6"		>> ${.TARGET}-NOINET6
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOIP
 	echo "ident ${.TARGET}-NOIP"	>> ${.TARGET}-NOIP

From owner-svn-src-stable-9@FreeBSD.ORG  Wed Apr 11 20:50:18 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67568106564A;
	Wed, 11 Apr 2012 20:50:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 47A008FC16;
	Wed, 11 Apr 2012 20:50:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3BKoIfo095122;
	Wed, 11 Apr 2012 20:50:18 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3BKoHPq095113;
	Wed, 11 Apr 2012 20:50:17 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204112050.q3BKoHPq095113@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 11 Apr 2012 20:50:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234150 - in stable/9/sys: amd64/amd64 amd64/include
	dev/acpica dev/pci i386/conf i386/i386 i386/include kern
	x86/pci x86/x86
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 20:50:18 -0000

Author: jhb
Date: Wed Apr 11 20:50:17 2012
New Revision: 234150
URL: http://svn.freebsd.org/changeset/base/234150

Log:
  MFC 233676:
  Use a more proper fix for enabling HT MSI mapping windows on Host-PCI
  bridges.  Rather than blindly enabling the windows on all of them, only
  enable the window when an MSI interrupt is enabled for a device behind
  the bridge, similar to what already happens for HT PCI-PCI bridges.

Modified:
  stable/9/sys/amd64/amd64/legacy.c
  stable/9/sys/amd64/include/legacyvar.h
  stable/9/sys/dev/acpica/acpi_pcib_acpi.c
  stable/9/sys/dev/pci/pci.c
  stable/9/sys/i386/i386/legacy.c
  stable/9/sys/i386/include/legacyvar.h
  stable/9/sys/x86/pci/pci_bus.c
  stable/9/sys/x86/x86/mptable_pci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/amd64/amd64/legacy.c
==============================================================================
--- stable/9/sys/amd64/amd64/legacy.c	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/amd64/amd64/legacy.c	Wed Apr 11 20:50:17 2012	(r234150)
@@ -53,7 +53,9 @@ __FBSDID("$FreeBSD$");
 
 static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device");
 struct legacy_device {
-	int			lg_pcibus;
+	int	lg_pcibus;
+	int	lg_pcislot;
+	int	lg_pcifunc;
 };
 
 #define DEVTOAT(dev)	((struct legacy_device *)device_get_ivars(dev))
@@ -161,6 +163,8 @@ legacy_add_child(device_t bus, u_int ord
 	if (atdev == NULL)
 		return(NULL);
 	atdev->lg_pcibus = -1;
+	atdev->lg_pcislot = -1;
+	atdev->lg_pcifunc = -1;
 
 	child = device_add_child_ordered(bus, order, name, unit);
 	if (child == NULL)
@@ -184,6 +188,12 @@ legacy_read_ivar(device_t dev, device_t 
 	case LEGACY_IVAR_PCIBUS:
 		*result = atdev->lg_pcibus;
 		break;
+	case LEGACY_IVAR_PCISLOT:
+		*result = atdev->lg_pcislot;
+		break;
+	case LEGACY_IVAR_PCIFUNC:
+		*result = atdev->lg_pcifunc;
+		break;
 	default:
 		return ENOENT;
 	}
@@ -202,6 +212,12 @@ legacy_write_ivar(device_t dev, device_t
 	case LEGACY_IVAR_PCIBUS:
 		atdev->lg_pcibus = value;
 		break;
+	case LEGACY_IVAR_PCISLOT:
+		atdev->lg_pcislot = value;
+		break;
+	case LEGACY_IVAR_PCIFUNC:
+		atdev->lg_pcifunc = value;
+		break;
 	default:
 		return ENOENT;
 	}

Modified: stable/9/sys/amd64/include/legacyvar.h
==============================================================================
--- stable/9/sys/amd64/include/legacyvar.h	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/amd64/include/legacyvar.h	Wed Apr 11 20:50:17 2012	(r234150)
@@ -31,7 +31,9 @@
 
 enum legacy_device_ivars {
 	LEGACY_IVAR_PCIDOMAIN,
-	LEGACY_IVAR_PCIBUS
+	LEGACY_IVAR_PCIBUS,
+	LEGACY_IVAR_PCISLOT,
+	LEGACY_IVAR_PCIFUNC
 };
 
 #define LEGACY_ACCESSOR(var, ivar, type)				\
@@ -39,6 +41,8 @@ enum legacy_device_ivars {
 
 LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
 LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
+LEGACY_ACCESSOR(pcislot,		PCISLOT,	int)
+LEGACY_ACCESSOR(pcifunc,		PCIFUNC,	int)
 
 #undef LEGACY_ACCESSOR
 
@@ -53,5 +57,7 @@ int	legacy_pcib_write_ivar(device_t dev,
     uintptr_t value);
 struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child,
     int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
+int	legacy_pcib_map_msi(device_t pcib, device_t dev, int irq,
+    uint64_t *addr, uint32_t *data);
 
 #endif /* !_MACHINE_LEGACYVAR_H_ */

Modified: stable/9/sys/dev/acpica/acpi_pcib_acpi.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_pcib_acpi.c	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/dev/acpica/acpi_pcib_acpi.c	Wed Apr 11 20:50:17 2012	(r234150)
@@ -59,8 +59,9 @@ struct acpi_hpcib_softc {
     ACPI_HANDLE		ap_handle;
     int			ap_flags;
 
-    int			ap_segment;	/* analagous to Alpha 'hose' */
+    int			ap_segment;	/* PCI domain */
     int			ap_bus;		/* bios-assigned bus number */
+    int			ap_addr;	/* device/func of PCI-Host bridge */
 
     ACPI_BUFFER		ap_prt;		/* interrupt routing table */
 #ifdef NEW_PCIB
@@ -276,7 +277,7 @@ acpi_pcib_acpi_attach(device_t dev)
     struct acpi_hpcib_softc	*sc;
     ACPI_STATUS			status;
     static int bus0_seen = 0;
-    u_int addr, slot, func, busok;
+    u_int slot, func, busok;
     uint8_t busno;
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -286,7 +287,7 @@ acpi_pcib_acpi_attach(device_t dev)
     sc->ap_handle = acpi_get_handle(dev);
 
     /*
-     * Get our segment number by evaluating _SEG
+     * Get our segment number by evaluating _SEG.
      * It's OK for this to not exist.
      */
     status = acpi_GetInteger(sc->ap_handle, "_SEG", &sc->ap_segment);
@@ -300,6 +301,18 @@ acpi_pcib_acpi_attach(device_t dev)
 	sc->ap_segment = 0;
     }
 
+    /*
+     * Get the address (device and function) of the associated
+     * PCI-Host bridge device from _ADR.  Assume we don't have one if
+     * it doesn't exist.
+     */
+    status = acpi_GetInteger(sc->ap_handle, "_ADR", &sc->ap_addr);
+    if (ACPI_FAILURE(status)) {
+	device_printf(dev, "could not evaluate _ADR - %s\n",
+	    AcpiFormatException(status));
+	sc->ap_addr = -1;
+    }
+
 #ifdef NEW_PCIB
     /*
      * Determine which address ranges this bridge decodes and setup
@@ -354,18 +367,10 @@ acpi_pcib_acpi_attach(device_t dev)
     busok = 1;
     if (sc->ap_segment == 0 && sc->ap_bus == 0 && bus0_seen) {
 	busok = 0;
-	status = acpi_GetInteger(sc->ap_handle, "_ADR", &addr);
-	if (ACPI_FAILURE(status)) {
-	    if (status != AE_NOT_FOUND) {
-		device_printf(dev, "could not evaluate _ADR - %s\n",
-		    AcpiFormatException(status));
-		return_VALUE (ENXIO);
-	    } else
-		device_printf(dev, "couldn't find _ADR\n");
-	} else {
+	if (sc->ap_addr != -1) {
 	    /* XXX: We assume bus 0. */
-	    slot = ACPI_ADR_PCI_SLOT(addr);
-	    func = ACPI_ADR_PCI_FUNC(addr);
+	    slot = ACPI_ADR_PCI_SLOT(sc->ap_addr);
+	    func = ACPI_ADR_PCI_FUNC(sc->ap_addr);
 	    if (bootverbose)
 		device_printf(dev, "reading config registers from 0:%d:%d\n",
 		    slot, func);
@@ -488,10 +493,24 @@ static int
 acpi_pcib_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr,
     uint32_t *data)
 {
-	device_t bus;
+	struct acpi_hpcib_softc *sc;
+	device_t bus, hostb;
+	int error;
 
 	bus = device_get_parent(pcib);
-	return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data));
+	error = PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data);
+	if (error)
+		return (error);
+
+	sc = device_get_softc(dev);
+	if (sc->ap_addr == -1)
+		return (0);
+	/* XXX: Assumes all bridges are on bus 0. */
+	hostb = pci_find_dbsf(sc->ap_segment, 0, ACPI_ADR_PCI_SLOT(sc->ap_addr),
+	    ACPI_ADR_PCI_FUNC(sc->ap_addr));
+	if (hostb != NULL)
+		pci_ht_map_msi(hostb, *addr);
+	return (0);
 }
 
 struct resource *

Modified: stable/9/sys/dev/pci/pci.c
==============================================================================
--- stable/9/sys/dev/pci/pci.c	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/dev/pci/pci.c	Wed Apr 11 20:50:17 2012	(r234150)
@@ -756,7 +756,7 @@ pci_read_cap(device_t pcib, pcicfgregs *
 		}
 	}
 
-#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
+#if defined(__powerpc__)
 	/*
 	 * Enable the MSI mapping window for all HyperTransport
 	 * slaves.  PCI-PCI bridges have their windows enabled via

Modified: stable/9/sys/i386/i386/legacy.c
==============================================================================
--- stable/9/sys/i386/i386/legacy.c	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/i386/i386/legacy.c	Wed Apr 11 20:50:17 2012	(r234150)
@@ -58,7 +58,9 @@ __FBSDID("$FreeBSD$");
 
 static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device");
 struct legacy_device {
-	int			lg_pcibus;
+	int	lg_pcibus;
+	int	lg_pcislot;
+	int	lg_pcifunc;
 };
 
 #define DEVTOAT(dev)	((struct legacy_device *)device_get_ivars(dev))
@@ -182,6 +184,8 @@ legacy_add_child(device_t bus, u_int ord
 	if (atdev == NULL)
 		return(NULL);
 	atdev->lg_pcibus = -1;
+	atdev->lg_pcislot = -1;
+	atdev->lg_pcifunc = -1;
 
 	child = device_add_child_ordered(bus, order, name, unit);
 	if (child == NULL)
@@ -205,6 +209,12 @@ legacy_read_ivar(device_t dev, device_t 
 	case LEGACY_IVAR_PCIBUS:
 		*result = atdev->lg_pcibus;
 		break;
+	case LEGACY_IVAR_PCISLOT:
+		*result = atdev->lg_pcislot;
+		break;
+	case LEGACY_IVAR_PCIFUNC:
+		*result = atdev->lg_pcifunc;
+		break;
 	default:
 		return ENOENT;
 	}
@@ -223,6 +233,12 @@ legacy_write_ivar(device_t dev, device_t
 	case LEGACY_IVAR_PCIBUS:
 		atdev->lg_pcibus = value;
 		break;
+	case LEGACY_IVAR_PCISLOT:
+		atdev->lg_pcislot = value;
+		break;
+	case LEGACY_IVAR_PCIFUNC:
+		atdev->lg_pcifunc = value;
+		break;
 	default:
 		return ENOENT;
 	}

Modified: stable/9/sys/i386/include/legacyvar.h
==============================================================================
--- stable/9/sys/i386/include/legacyvar.h	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/i386/include/legacyvar.h	Wed Apr 11 20:50:17 2012	(r234150)
@@ -31,7 +31,9 @@
 
 enum legacy_device_ivars {
 	LEGACY_IVAR_PCIDOMAIN,
-	LEGACY_IVAR_PCIBUS
+	LEGACY_IVAR_PCIBUS,
+	LEGACY_IVAR_PCISLOT,
+	LEGACY_IVAR_PCIFUNC
 };
 
 #define LEGACY_ACCESSOR(var, ivar, type)				\
@@ -39,6 +41,8 @@ enum legacy_device_ivars {
 
 LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
 LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
+LEGACY_ACCESSOR(pcislot,		PCISLOT,	int)
+LEGACY_ACCESSOR(pcifunc,		PCIFUNC,	int)
 
 #undef LEGACY_ACCESSOR
 
@@ -53,5 +57,7 @@ int	legacy_pcib_write_ivar(device_t dev,
     uintptr_t value);
 struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child,
     int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
+int	legacy_pcib_map_msi(device_t pcib, device_t dev, int irq,
+    uint64_t *addr, uint32_t *data);
 
 #endif /* !_MACHINE_LEGACYVAR_H_ */

Modified: stable/9/sys/x86/pci/pci_bus.c
==============================================================================
--- stable/9/sys/x86/pci/pci_bus.c	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/x86/pci/pci_bus.c	Wed Apr 11 20:50:17 2012	(r234150)
@@ -112,14 +112,28 @@ legacy_pcib_alloc_msix(device_t pcib, de
 	return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, irq));
 }
 
-static int
+int
 legacy_pcib_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr,
     uint32_t *data)
 {
-	device_t bus;
+	device_t bus, hostb;
+	int error, func, slot;
 
 	bus = device_get_parent(pcib);
-	return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data));
+	error = PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data);
+	if (error)
+		return (error);
+
+	slot = legacy_get_pcislot(pcib);
+	func = legacy_get_pcifunc(pcib);
+	if (slot == -1 || func == -1)
+		return (0);
+	hostb = pci_find_bsf(0, slot, func);
+	KASSERT(hostb != NULL, ("%s: missing hostb for 0:%d:%d", __func__,
+	    slot, func));
+	pci_ht_map_msi(hostb, *addr);
+	return (0);
+	
 }
 
 static const char *
@@ -453,6 +467,8 @@ legacy_pcib_identify(driver_t *driver, d
 					      "pcib", busnum);
 			device_set_desc(child, s);
 			legacy_set_pcibus(child, busnum);
+			legacy_set_pcislot(child, slot);
+			legacy_set_pcifunc(child, func);
 
 			found = 1;
 			if (id == 0x12258086)

Modified: stable/9/sys/x86/x86/mptable_pci.c
==============================================================================
--- stable/9/sys/x86/x86/mptable_pci.c	Wed Apr 11 20:28:05 2012	(r234149)
+++ stable/9/sys/x86/x86/mptable_pci.c	Wed Apr 11 20:50:17 2012	(r234150)
@@ -97,16 +97,6 @@ mptable_hostb_alloc_msix(device_t pcib, 
 	return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, irq));
 }
 
-static int
-mptable_hostb_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr,
-    uint32_t *data)
-{
-	device_t bus;
-
-	bus = device_get_parent(pcib);
-	return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data));
-}
-
 #ifdef NEW_PCIB
 static int
 mptable_is_isa_range(u_long start, u_long end)
@@ -214,7 +204,7 @@ static device_method_t mptable_hostb_met
 	DEVMETHOD(pcib_release_msi,	pcib_release_msi),
 	DEVMETHOD(pcib_alloc_msix,	mptable_hostb_alloc_msix),
 	DEVMETHOD(pcib_release_msix,	pcib_release_msix),
-	DEVMETHOD(pcib_map_msi,		mptable_hostb_map_msi),
+	DEVMETHOD(pcib_map_msi,		legacy_pcib_map_msi),
 
 	DEVMETHOD_END
 };

From owner-svn-src-stable-9@FreeBSD.ORG  Thu Apr 12 00:38:34 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DB7751065672;
	Thu, 12 Apr 2012 00:38:34 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C426E8FC0A;
	Thu, 12 Apr 2012 00:38:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3C0cYvi002778;
	Thu, 12 Apr 2012 00:38:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3C0cYxx002770;
	Thu, 12 Apr 2012 00:38:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201204120038.q3C0cYxx002770@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 12 Apr 2012 00:38:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234160 - in stable/9/sys: dev/ofw dev/pcf powerpc/ofw
	sparc64/pci
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 00:38:35 -0000

Author: nwhitehorn
Date: Thu Apr 12 00:38:34 2012
New Revision: 234160
URL: http://svn.freebsd.org/changeset/base/234160

Log:
  MFC r233018:
  Make ofw_bus_get_node() consistently return -1 when there is no associated
  OF node, instead of a random mixture of 0 and -1. Update all checks for 0
  to check for -1 instead.

Modified:
  stable/9/sys/dev/ofw/ofw_bus_if.m
  stable/9/sys/dev/ofw/ofw_bus_subr.c
  stable/9/sys/dev/ofw/ofw_iicbus.c
  stable/9/sys/dev/pcf/pcf_ebus.c
  stable/9/sys/powerpc/ofw/ofw_pcib_pci.c
  stable/9/sys/powerpc/ofw/ofw_pcibus.c
  stable/9/sys/sparc64/pci/ofw_pcibus.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/ofw/ofw_bus_if.m
==============================================================================
--- stable/9/sys/dev/ofw/ofw_bus_if.m	Thu Apr 12 00:12:17 2012	(r234159)
+++ stable/9/sys/dev/ofw/ofw_bus_if.m	Thu Apr 12 00:38:34 2012	(r234160)
@@ -89,7 +89,7 @@ CODE {
 	ofw_bus_default_get_node(device_t bus, device_t dev)
 	{
 
-		return (0);
+		return (-1);
 	}
 
 	static const char *

Modified: stable/9/sys/dev/ofw/ofw_bus_subr.c
==============================================================================
--- stable/9/sys/dev/ofw/ofw_bus_subr.c	Thu Apr 12 00:12:17 2012	(r234159)
+++ stable/9/sys/dev/ofw/ofw_bus_subr.c	Thu Apr 12 00:38:34 2012	(r234160)
@@ -157,7 +157,7 @@ ofw_bus_is_compatible(device_t dev, cons
 	if ((compat = ofw_bus_get_compat(dev)) == NULL)
 		return (0);
 
-	if ((node = ofw_bus_get_node(dev)) == 0)
+	if ((node = ofw_bus_get_node(dev)) == -1)
 		return (0);
 
 	/* Get total 'compatible' prop len */

Modified: stable/9/sys/dev/ofw/ofw_iicbus.c
==============================================================================
--- stable/9/sys/dev/ofw/ofw_iicbus.c	Thu Apr 12 00:12:17 2012	(r234159)
+++ stable/9/sys/dev/ofw/ofw_iicbus.c	Thu Apr 12 00:38:34 2012	(r234160)
@@ -88,7 +88,7 @@ static int
 ofw_iicbus_probe(device_t dev)
 {
 
-	if (ofw_bus_get_node(dev) == 0)
+	if (ofw_bus_get_node(dev) == -1)
 		return (ENXIO);
 	device_set_desc(dev, "OFW I2C bus");
 

Modified: stable/9/sys/dev/pcf/pcf_ebus.c
==============================================================================
--- stable/9/sys/dev/pcf/pcf_ebus.c	Thu Apr 12 00:12:17 2012	(r234159)
+++ stable/9/sys/dev/pcf/pcf_ebus.c	Thu Apr 12 00:38:34 2012	(r234160)
@@ -147,7 +147,7 @@ pcf_ebus_attach(device_t dev)
 	mtx_init(&sc->pcf_lock, device_get_nameunit(dev), "pcf", MTX_DEF);
 
 	/* get OFW node of the pcf */
-	if ((node = ofw_bus_get_node(dev)) <= 0) {
+	if ((node = ofw_bus_get_node(dev)) == -1) {
 		device_printf(dev, "cannot get OFW node\n");
 		goto error;
 	}

Modified: stable/9/sys/powerpc/ofw/ofw_pcib_pci.c
==============================================================================
--- stable/9/sys/powerpc/ofw/ofw_pcib_pci.c	Thu Apr 12 00:12:17 2012	(r234159)
+++ stable/9/sys/powerpc/ofw/ofw_pcib_pci.c	Thu Apr 12 00:38:34 2012	(r234160)
@@ -93,7 +93,7 @@ ofw_pcib_pci_probe(device_t dev)
 		return (ENXIO);
 	}
 
-	if (ofw_bus_get_node(dev) == 0)
+	if (ofw_bus_get_node(dev) == -1)
 		return (ENXIO);
 
 	device_set_desc(dev, "OFW PCI-PCI bridge");

Modified: stable/9/sys/powerpc/ofw/ofw_pcibus.c
==============================================================================
--- stable/9/sys/powerpc/ofw/ofw_pcibus.c	Thu Apr 12 00:12:17 2012	(r234159)
+++ stable/9/sys/powerpc/ofw/ofw_pcibus.c	Thu Apr 12 00:38:34 2012	(r234160)
@@ -105,7 +105,7 @@ static int
 ofw_pcibus_probe(device_t dev)
 {
 
-	if (ofw_bus_get_node(dev) == 0)
+	if (ofw_bus_get_node(dev) == -1)
 		return (ENXIO);
 	device_set_desc(dev, "OFW PCI bus");
 

Modified: stable/9/sys/sparc64/pci/ofw_pcibus.c
==============================================================================
--- stable/9/sys/sparc64/pci/ofw_pcibus.c	Thu Apr 12 00:12:17 2012	(r234159)
+++ stable/9/sys/sparc64/pci/ofw_pcibus.c	Thu Apr 12 00:38:34 2012	(r234160)
@@ -111,7 +111,7 @@ static int
 ofw_pcibus_probe(device_t dev)
 {
 
-	if (ofw_bus_get_node(dev) == 0)
+	if (ofw_bus_get_node(dev) == -1)
 		return (ENXIO);
 	device_set_desc(dev, "OFW PCI bus");
 

From owner-svn-src-stable-9@FreeBSD.ORG  Thu Apr 12 06:24:48 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6BF9F1065670;
	Thu, 12 Apr 2012 06:24:48 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 559B88FC0C;
	Thu, 12 Apr 2012 06:24:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3C6OmHc013917;
	Thu, 12 Apr 2012 06:24:48 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3C6OmiT013915;
	Thu, 12 Apr 2012 06:24:48 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201204120624.q3C6OmiT013915@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 12 Apr 2012 06:24:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234166 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 06:24:48 -0000

Author: mav
Date: Thu Apr 12 06:24:47 2012
New Revision: 234166
URL: http://svn.freebsd.org/changeset/base/234166

Log:
  MFC r232917:
  Rewrite thread CPU usage percentage math to not depend on periodic calls
  with HZ rate through the sched_tick() calls from hardclock().
  
  Potentially it can be used to improve precision, but now it is just minus
  one more reason to call hardclock() for every HZ tick on every active CPU.
  SCHED_4BSD never used sched_tick(), but keep it in place for now, as at
  least SCHED_FBFS existing in patches out of the tree depends on it.

Modified:
  stable/9/sys/kern/sched_ule.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/sched_ule.c
==============================================================================
--- stable/9/sys/kern/sched_ule.c	Thu Apr 12 01:53:33 2012	(r234165)
+++ stable/9/sys/kern/sched_ule.c	Thu Apr 12 06:24:47 2012	(r234166)
@@ -99,7 +99,6 @@ struct td_sched {	
 	u_int		ts_slptime;	/* Number of ticks we vol. slept */
 	u_int		ts_runtime;	/* Number of ticks we were running */
 	int		ts_ltick;	/* Last tick that we were running on */
-	int		ts_incrtick;	/* Last tick that we incremented on */
 	int		ts_ftick;	/* First tick that we were running on */
 	int		ts_ticks;	/* Tick count */
 #ifdef KTR
@@ -291,7 +290,7 @@ static void sched_thread_priority(struct
 static int sched_interact_score(struct thread *);
 static void sched_interact_update(struct thread *);
 static void sched_interact_fork(struct thread *);
-static void sched_pctcpu_update(struct td_sched *);
+static void sched_pctcpu_update(struct td_sched *, int);
 
 /* Operations on per processor queues */
 static struct thread *tdq_choose(struct tdq *);
@@ -671,7 +670,7 @@ cpu_search(const struct cpu_group *cg, s
 			}
 		}
 		if (match & CPU_SEARCH_HIGHEST)
-			if (hgroup.cs_load != -1 &&
+			if (hgroup.cs_load >= 0 &&
 			    (load > hload ||
 			     (load == hload && hgroup.cs_load > high->cs_load))) {
 				hload = load;
@@ -1588,24 +1587,21 @@ sched_rr_interval(void)
  * mechanism since it happens with less regular and frequent events.
  */
 static void
-sched_pctcpu_update(struct td_sched *ts)
+sched_pctcpu_update(struct td_sched *ts, int run)
 {
+	int t = ticks;
 
-	if (ts->ts_ticks == 0)
-		return;
-	if (ticks - (hz / 10) < ts->ts_ltick &&
-	    SCHED_TICK_TOTAL(ts) < SCHED_TICK_MAX)
-		return;
-	/*
-	 * Adjust counters and watermark for pctcpu calc.
-	 */
-	if (ts->ts_ltick > ticks - SCHED_TICK_TARG)
-		ts->ts_ticks = (ts->ts_ticks / (ticks - ts->ts_ftick)) *
-			    SCHED_TICK_TARG;
-	else
+	if (t - ts->ts_ltick >= SCHED_TICK_TARG) {
 		ts->ts_ticks = 0;
-	ts->ts_ltick = ticks;
-	ts->ts_ftick = ts->ts_ltick - SCHED_TICK_TARG;
+		ts->ts_ftick = t - SCHED_TICK_TARG;
+	} else if (t - ts->ts_ftick >= SCHED_TICK_MAX) {
+		ts->ts_ticks = (ts->ts_ticks / (ts->ts_ltick - ts->ts_ftick)) *
+		    (ts->ts_ltick - (t - SCHED_TICK_TARG));
+		ts->ts_ftick = t - SCHED_TICK_TARG;
+	}
+	if (run)
+		ts->ts_ticks += (t - ts->ts_ltick) << SCHED_TICK_SHIFT;
+	ts->ts_ltick = t;
 }
 
 /*
@@ -1824,6 +1820,7 @@ sched_switch(struct thread *td, struct t
 	tdq = TDQ_CPU(cpuid);
 	ts = td->td_sched;
 	mtx = td->td_lock;
+	sched_pctcpu_update(ts, 1);
 	ts->ts_rltick = ticks;
 	td->td_lastcpu = td->td_oncpu;
 	td->td_oncpu = NOCPU;
@@ -1878,6 +1875,7 @@ sched_switch(struct thread *td, struct t
 #endif
 		lock_profile_release_lock(&TDQ_LOCKPTR(tdq)->lock_object);
 		TDQ_LOCKPTR(tdq)->mtx_lock = (uintptr_t)newtd;
+		sched_pctcpu_update(newtd->td_sched, 0);
 
 #ifdef KDTRACE_HOOKS
 		/*
@@ -1972,12 +1970,9 @@ sched_wakeup(struct thread *td)
 	slptick = td->td_slptick;
 	td->td_slptick = 0;
 	if (slptick && slptick != ticks) {
-		u_int hzticks;
-
-		hzticks = (ticks - slptick) << SCHED_TICK_SHIFT;
-		ts->ts_slptime += hzticks;
+		ts->ts_slptime += (ticks - slptick) << SCHED_TICK_SHIFT;
 		sched_interact_update(td);
-		sched_pctcpu_update(ts);
+		sched_pctcpu_update(ts, 0);
 	}
 	/* Reset the slice value after we sleep. */
 	ts->ts_slice = sched_slice;
@@ -1992,6 +1987,7 @@ void
 sched_fork(struct thread *td, struct thread *child)
 {
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
+	sched_pctcpu_update(td->td_sched, 1);
 	sched_fork_thread(td, child);
 	/*
 	 * Penalize the parent and child for forking.
@@ -2027,7 +2023,6 @@ sched_fork_thread(struct thread *td, str
 	 */
 	ts2->ts_ticks = ts->ts_ticks;
 	ts2->ts_ltick = ts->ts_ltick;
-	ts2->ts_incrtick = ts->ts_incrtick;
 	ts2->ts_ftick = ts->ts_ftick;
 	/*
 	 * Do not inherit any borrowed priority from the parent.
@@ -2184,6 +2179,7 @@ sched_clock(struct thread *td)
 			tdq->tdq_ridx = tdq->tdq_idx;
 	}
 	ts = td->td_sched;
+	sched_pctcpu_update(ts, 1);
 	if (td->td_pri_class & PRI_FIFO_BIT)
 		return;
 	if (PRI_BASE(td->td_pri_class) == PRI_TIMESHARE) {
@@ -2208,31 +2204,12 @@ sched_clock(struct thread *td)
 }
 
 /*
- * Called once per hz tick.  Used for cpu utilization information.  This
- * is easier than trying to scale based on stathz.
+ * Called once per hz tick.
  */
 void
 sched_tick(int cnt)
 {
-	struct td_sched *ts;
 
-	ts = curthread->td_sched;
-	/*
-	 * Ticks is updated asynchronously on a single cpu.  Check here to
-	 * avoid incrementing ts_ticks multiple times in a single tick.
-	 */
-	if (ts->ts_incrtick == ticks)
-		return;
-	/* Adjust ticks for pctcpu */
-	ts->ts_ticks += cnt << SCHED_TICK_SHIFT;
-	ts->ts_ltick = ticks;
-	ts->ts_incrtick = ticks;
-	/*
-	 * Update if we've exceeded our desired tick threshold by over one
-	 * second.
-	 */
-	if (ts->ts_ftick + SCHED_TICK_MAX < ts->ts_ltick)
-		sched_pctcpu_update(ts);
 }
 
 /*
@@ -2274,7 +2251,6 @@ sched_choose(void)
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	td = tdq_choose(tdq);
 	if (td) {
-		td->td_sched->ts_ltick = ticks;
 		tdq_runq_rem(tdq, td);
 		tdq->tdq_lowpri = td->td_priority;
 		return (td);
@@ -2420,10 +2396,10 @@ sched_pctcpu(struct thread *td)
 		return (0);
 
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
+	sched_pctcpu_update(ts, TD_IS_RUNNING(td));
 	if (ts->ts_ticks) {
 		int rtick;
 
-		sched_pctcpu_update(ts);
 		/* How many rtick per second ? */
 		rtick = min(SCHED_TICK_HZ(ts) / SCHED_TICK_SECS, hz);
 		pctcpu = (FSCALE * ((FSCALE * rtick)/hz)) >> FSHIFT;

From owner-svn-src-stable-9@FreeBSD.ORG  Thu Apr 12 06:29:03 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BB9B106564A;
	Thu, 12 Apr 2012 06:29:03 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 34D5C8FC15;
	Thu, 12 Apr 2012 06:29:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3C6T3jt014098;
	Thu, 12 Apr 2012 06:29:03 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3C6T3rX014095;
	Thu, 12 Apr 2012 06:29:03 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201204120629.q3C6T3rX014095@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 12 Apr 2012 06:29:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234167 - in stable/9: share/man/man4 sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 06:29:03 -0000

Author: mav
Date: Thu Apr 12 06:29:02 2012
New Revision: 234167
URL: http://svn.freebsd.org/changeset/base/234167

Log:
  MFC 232919:
  Add kern.eventtimer.activetick tunable/sysctl, specifying whether each
  hardclock() tick should be run on every active CPU, or on only one.
  
  On my tests, avoiding extra interrupts because of this on 8-CPU Core i7
  system with HZ=10000 saves about 2% of performance. At this moment option
  implemented only for global timers, as reprogramming per-CPU timers is
  too expensive now to be compensated by this benefit, especially since we
  still have to regularly run hardclock() on at least one active CPU to
  update system uptime. For global timer it is quite trivial: timer runs
  always, but we just skip IPIs to other CPUs when possible.
  
  Option is enabled by default now, keeping previous behavior, as periodic
  hardclock() calls are still used at least to implement setitimer(2) with
  ITIMER_VIRTUAL and ITIMER_PROF arguments. But since default schedulers don't
  depend on it since r232917, we are much more free to experiment with it.

Modified:
  stable/9/share/man/man4/eventtimers.4
  stable/9/sys/kern/kern_clocksource.c
Directory Properties:
  stable/9/share/man/man4/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/share/man/man4/eventtimers.4
==============================================================================
--- stable/9/share/man/man4/eventtimers.4	Thu Apr 12 06:24:47 2012	(r234166)
+++ stable/9/share/man/man4/eventtimers.4	Thu Apr 12 06:29:02 2012	(r234167)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 15, 2010
+.Dd March 13, 2012
 .Dt EVENTTIMERS 4
 .Os
 .Sh NAME
@@ -143,6 +143,12 @@ By default this options is disabled.
 If chosen timer is per-CPU
 and runs in periodic mode, this option has no effect - all interrupts are
 always generating.
+.It Va kern.eventtimer.activetick
+makes each CPU to receive all kinds of timer interrupts when they are busy.
+Disabling it allows to skip some hardclock() calls in some cases.
+By default this options is enabled.
+If chosen timer is per-CPU, this option has no effect - all interrupts are
+always generating, as timer reprogramming is too expensive for that case.
 .El
 .Sh SEE ALSO
 .Xr apic 4 ,

Modified: stable/9/sys/kern/kern_clocksource.c
==============================================================================
--- stable/9/sys/kern/kern_clocksource.c	Thu Apr 12 06:24:47 2012	(r234166)
+++ stable/9/sys/kern/kern_clocksource.c	Thu Apr 12 06:29:02 2012	(r234167)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
+ * Copyright (c) 2010-2012 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -99,6 +99,7 @@ static struct bintime	hardperiod;	/* har
 static struct bintime	statperiod;	/* statclock() events period. */
 static struct bintime	profperiod;	/* profclock() events period. */
 static struct bintime	nexttick;	/* Next global timer tick time. */
+static struct bintime	nexthard;	/* Next global hardlock() event. */
 static u_int		busy = 0;	/* Reconfiguration is in progress. */
 static int		profiling = 0;	/* Profiling events enabled. */
 
@@ -110,11 +111,16 @@ TUNABLE_INT("kern.eventtimer.singlemul",
 SYSCTL_INT(_kern_eventtimer, OID_AUTO, singlemul, CTLFLAG_RW, &singlemul,
     0, "Multiplier for periodic mode");
 
-static u_int		idletick = 0;	/* Idle mode allowed. */
+static u_int		idletick = 0;	/* Run periodic events when idle. */
 TUNABLE_INT("kern.eventtimer.idletick", &idletick);
 SYSCTL_UINT(_kern_eventtimer, OID_AUTO, idletick, CTLFLAG_RW, &idletick,
     0, "Run periodic events when idle");
 
+static u_int		activetick = 1;	/* Run all periodic events when active. */
+TUNABLE_INT("kern.eventtimer.activetick", &activetick);
+SYSCTL_UINT(_kern_eventtimer, OID_AUTO, activetick, CTLFLAG_RW, &activetick,
+    0, "Run all periodic events when active");
+
 static int		periodic = 0;	/* Periodic or one-shot mode. */
 static int		want_periodic = 0; /* What mode to prefer. */
 TUNABLE_INT("kern.eventtimer.periodic", &want_periodic);
@@ -202,6 +208,9 @@ handleevents(struct bintime *now, int fa
 		bintime_add(&state->nexthard, &hardperiod);
 		runs++;
 	}
+	if ((timer->et_flags & ET_FLAGS_PERCPU) == 0 &&
+	    bintime_cmp(&state->nexthard, &nexthard, >))
+		nexthard = state->nexthard;
 	if (runs && fake < 2) {
 		hardclock_cnt(runs, usermode);
 		done = 1;
@@ -263,9 +272,11 @@ getnextcpuevent(struct bintime *event, i
 	int skip;
 
 	state = DPCPU_PTR(timerstate);
+	/* Handle hardclock() events. */
 	*event = state->nexthard;
-	if (idle) { /* If CPU is idle - ask callouts for how long. */
-		skip = 4;
+	if (idle || (!activetick && !profiling &&
+	    (timer->et_flags & ET_FLAGS_PERCPU) == 0)) {
+		skip = idle ? 4 : (stathz / 2);
 		if (curcpu == CPU_FIRST() && tc_min_ticktock_freq > skip)
 			skip = tc_min_ticktock_freq;
 		skip = callout_tickstofirst(hz / skip) - 1;
@@ -273,7 +284,8 @@ getnextcpuevent(struct bintime *event, i
 		tmp = hardperiod;
 		bintime_mul(&tmp, skip);
 		bintime_add(event, &tmp);
-	} else { /* If CPU is active - handle all types of events. */
+	}
+	if (!idle) { /* If CPU is active - handle other types of events. */
 		if (bintime_cmp(event, &state->nextstat, >))
 			*event = state->nextstat;
 		if (profiling && bintime_cmp(event, &state->nextprof, >))
@@ -295,24 +307,28 @@ getnextevent(struct bintime *event)
 #ifdef SMP
 	int	cpu;
 #endif
-	int	c;
+	int	c, nonidle;
 
 	state = DPCPU_PTR(timerstate);
 	*event = state->nextevent;
 	c = curcpu;
-#ifdef SMP
+	nonidle = !state->idle;
 	if ((timer->et_flags & ET_FLAGS_PERCPU) == 0) {
+#ifdef SMP
 		CPU_FOREACH(cpu) {
 			if (curcpu == cpu)
 				continue;
 			state = DPCPU_ID_PTR(cpu, timerstate);
+			nonidle += !state->idle;
 			if (bintime_cmp(event, &state->nextevent, >)) {
 				*event = state->nextevent;
 				c = cpu;
 			}
 		}
-	}
 #endif
+		if (nonidle != 0 && bintime_cmp(event, &nexthard, >))
+			*event = nexthard;
+	}
 	CTR5(KTR_SPARE2, "next at %d:    next %d.%08x%08x by %d",
 	    curcpu, event->sec, (unsigned int)(event->frac >> 32),
 			     (unsigned int)(event->frac & 0xffffffff), c);

From owner-svn-src-stable-9@FreeBSD.ORG  Thu Apr 12 13:46:57 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D9CC106566C;
	Thu, 12 Apr 2012 13:46:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 262128FC0C;
	Thu, 12 Apr 2012 13:46:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3CDkusa030833;
	Thu, 12 Apr 2012 13:46:56 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3CDku4W030828;
	Thu, 12 Apr 2012 13:46:56 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204121346.q3CDku4W030828@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 12 Apr 2012 13:46:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234179 - in stable/9/sys: amd64/include i386/conf
	i386/include kern mips/include powerpc/include
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 13:46:57 -0000

Author: jhb
Date: Thu Apr 12 13:46:56 2012
New Revision: 234179
URL: http://svn.freebsd.org/changeset/base/234179

Log:
  MFC 233670,233671:
  - Use VM_MEMATTR_UNCACHEABLE for the constant for UC memory rather than
    VM_MEMATTR_UNCACHED on mips.
  - Rename VM_MEMATTR_UNCACHED to VM_MEMATTR_WEAK_UNCACHEABLE on x86 to
    be less ambiguous and more clearly identify what it means.  An alias
    from VM_MEMATTR_WEAK_UNCACHEABLE to VM_MEMATTR_WEAK_UNCACHED remains
    on x86 to preserve the KPI.
  - Remove the VM_MEMATTR_UNCACHED alias from powerpc.

Modified:
  stable/9/sys/amd64/include/vm.h
  stable/9/sys/i386/include/vm.h
  stable/9/sys/mips/include/vm.h
  stable/9/sys/powerpc/include/vm.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/amd64/include/vm.h
==============================================================================
--- stable/9/sys/amd64/include/vm.h	Thu Apr 12 13:43:43 2012	(r234178)
+++ stable/9/sys/amd64/include/vm.h	Thu Apr 12 13:46:56 2012	(r234179)
@@ -38,7 +38,8 @@
 #define	VM_MEMATTR_WRITE_THROUGH	((vm_memattr_t)PAT_WRITE_THROUGH)
 #define	VM_MEMATTR_WRITE_PROTECTED	((vm_memattr_t)PAT_WRITE_PROTECTED)
 #define	VM_MEMATTR_WRITE_BACK		((vm_memattr_t)PAT_WRITE_BACK)
-#define	VM_MEMATTR_UNCACHED		((vm_memattr_t)PAT_UNCACHED)
+#define	VM_MEMATTR_WEAK_UNCACHEABLE	((vm_memattr_t)PAT_UNCACHED)
+#define	VM_MEMATTR_UNCACHED		VM_MEMATTR_WEAK_UNCACHEABLE
 
 #define	VM_MEMATTR_DEFAULT		VM_MEMATTR_WRITE_BACK
 

Modified: stable/9/sys/i386/include/vm.h
==============================================================================
--- stable/9/sys/i386/include/vm.h	Thu Apr 12 13:43:43 2012	(r234178)
+++ stable/9/sys/i386/include/vm.h	Thu Apr 12 13:46:56 2012	(r234179)
@@ -38,7 +38,8 @@
 #define	VM_MEMATTR_WRITE_THROUGH	((vm_memattr_t)PAT_WRITE_THROUGH)
 #define	VM_MEMATTR_WRITE_PROTECTED	((vm_memattr_t)PAT_WRITE_PROTECTED)
 #define	VM_MEMATTR_WRITE_BACK		((vm_memattr_t)PAT_WRITE_BACK)
-#define	VM_MEMATTR_UNCACHED		((vm_memattr_t)PAT_UNCACHED)
+#define	VM_MEMATTR_WEAK_UNCACHEABLE	((vm_memattr_t)PAT_UNCACHED)
+#define	VM_MEMATTR_UNCACHED		VM_MEMATTR_WEAK_UNCACHEABLE
 
 #define	VM_MEMATTR_DEFAULT		VM_MEMATTR_WRITE_BACK
 

Modified: stable/9/sys/mips/include/vm.h
==============================================================================
--- stable/9/sys/mips/include/vm.h	Thu Apr 12 13:43:43 2012	(r234178)
+++ stable/9/sys/mips/include/vm.h	Thu Apr 12 13:46:56 2012	(r234179)
@@ -32,7 +32,7 @@
 #include <machine/pte.h>
 
 /* Memory attributes. */
-#define	VM_MEMATTR_UNCACHED	((vm_memattr_t)PTE_C_UNCACHED)
+#define	VM_MEMATTR_UNCACHEABLE	((vm_memattr_t)PTE_C_UNCACHED)
 #define	VM_MEMATTR_DEFAULT	((vm_memattr_t)PTE_C_CACHE)
 
 #endif /* !_MACHINE_VM_H_ */

Modified: stable/9/sys/powerpc/include/vm.h
==============================================================================
--- stable/9/sys/powerpc/include/vm.h	Thu Apr 12 13:43:43 2012	(r234178)
+++ stable/9/sys/powerpc/include/vm.h	Thu Apr 12 13:46:56 2012	(r234179)
@@ -34,7 +34,6 @@
 /* Memory attributes. */
 #define	VM_MEMATTR_DEFAULT		0
 #define	VM_MEMATTR_UNCACHEABLE		0x01
-#define	VM_MEMATTR_UNCACHED		VM_MEMATTR_UNCACHEABLE
 #define	VM_MEMATTR_CACHEABLE		0x02
 #define	VM_MEMATTR_WRITE_COMBINING	0x04
 #define	VM_MEMATTR_WRITE_BACK		0x08

From owner-svn-src-stable-9@FreeBSD.ORG  Thu Apr 12 13:53:11 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97FC8106566C;
	Thu, 12 Apr 2012 13:53:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 67C0B8FC08;
	Thu, 12 Apr 2012 13:53:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3CDrB02031115;
	Thu, 12 Apr 2012 13:53:11 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3CDrB7k031111;
	Thu, 12 Apr 2012 13:53:11 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201204121353.q3CDrB7k031111@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 12 Apr 2012 13:53:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234181 - in stable/9/sys: i386/conf kern
	ofed/include/linux
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 13:53:11 -0000

Author: jhb
Date: Thu Apr 12 13:53:10 2012
New Revision: 234181
URL: http://svn.freebsd.org/changeset/base/234181

Log:
  MFC 233547:
  Use VM_MEMATTR_UNCACHEABLE instead of VM_MEMATTR_UNCACHED for UC mappings.
  VM_MEMATTR_UNCACHED is actually the x86-specific UC- mode (where a WC
  MTRR can override the PAT setting).

Modified:
  stable/9/sys/ofed/include/linux/io.h
  stable/9/sys/ofed/include/linux/page.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/ofed/include/linux/io.h
==============================================================================
--- stable/9/sys/ofed/include/linux/io.h	Thu Apr 12 13:47:23 2012	(r234180)
+++ stable/9/sys/ofed/include/linux/io.h	Thu Apr 12 13:53:10 2012	(r234181)
@@ -90,7 +90,7 @@ writew(uint16_t b, void *addr)
 
 void *_ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr);
 #define	ioremap_nocache(addr, size)					\
-    _ioremap_attr((addr), (size), VM_MEMATTR_UNCACHED)
+    _ioremap_attr((addr), (size), VM_MEMATTR_UNCACHEABLE)
 #define	ioremap_wc(addr, size)						\
     _ioremap_attr((addr), (size), VM_MEMATTR_WRITE_COMBINING)
 #define	ioremap	ioremap_nocache

Modified: stable/9/sys/ofed/include/linux/page.h
==============================================================================
--- stable/9/sys/ofed/include/linux/page.h	Thu Apr 12 13:47:23 2012	(r234180)
+++ stable/9/sys/ofed/include/linux/page.h	Thu Apr 12 13:53:10 2012	(r234181)
@@ -40,7 +40,7 @@
 #define	virt_to_page(x)	PHYS_TO_VM_PAGE(vtophys((x)))
 
 #define	clear_page(page)		memset((page), 0, PAGE_SIZE)
-#define	pgprot_noncached(prot)		VM_MEMATTR_UNCACHED
+#define	pgprot_noncached(prot)		VM_MEMATTR_UNCACHEABLE
 #define	pgprot_writecombine(prot)	VM_MEMATTR_WRITE_COMBINING
 
 #undef	PAGE_MASK

From owner-svn-src-stable-9@FreeBSD.ORG  Thu Apr 12 17:49:54 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2C471065670;
	Thu, 12 Apr 2012 17:49:53 +0000 (UTC)
	(envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DD6148FC17;
	Thu, 12 Apr 2012 17:49:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3CHnrOO039555;
	Thu, 12 Apr 2012 17:49:53 GMT
	(envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3CHnriJ039549;
	Thu, 12 Apr 2012 17:49:53 GMT
	(envelope-from melifaro@svn.freebsd.org)
Message-Id: <201204121749.q3CHnriJ039549@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 12 Apr 2012 17:49:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234191 - stable/9/lib/libradius
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 17:49:54 -0000

Author: melifaro
Date: Thu Apr 12 17:49:53 2012
New Revision: 234191
URL: http://svn.freebsd.org/changeset/base/234191

Log:
  MFC: r228730
  
  Add binding support to libradius(3).
  Submitted by:    Sergey Matveychuk <sem33@yandex-team.ru>
  
  Approved by:     kib(mentor)

Modified:
  stable/9/lib/libradius/Makefile
  stable/9/lib/libradius/libradius.3
  stable/9/lib/libradius/radlib.c
  stable/9/lib/libradius/radlib.h
  stable/9/lib/libradius/radlib_private.h
Directory Properties:
  stable/9/lib/libradius/   (props changed)

Modified: stable/9/lib/libradius/Makefile
==============================================================================
--- stable/9/lib/libradius/Makefile	Thu Apr 12 17:43:59 2012	(r234190)
+++ stable/9/lib/libradius/Makefile	Thu Apr 12 17:49:53 2012	(r234191)
@@ -36,6 +36,7 @@ MAN=		libradius.3 radius.conf.5
 MLINKS+=libradius.3 rad_acct_open.3 \
 	libradius.3 rad_add_server.3 \
 	libradius.3 rad_auth_open.3 \
+	libradius.3 rad_bind_to.3 \
 	libradius.3 rad_close.3 \
 	libradius.3 rad_config.3 \
 	libradius.3 rad_continue_send_request.3 \

Modified: stable/9/lib/libradius/libradius.3
==============================================================================
--- stable/9/lib/libradius/libradius.3	Thu Apr 12 17:43:59 2012	(r234190)
+++ stable/9/lib/libradius/libradius.3	Thu Apr 12 17:49:53 2012	(r234191)
@@ -91,6 +91,8 @@
 .Fn rad_server_open "int fd"
 .Ft "const char *"
 .Fn rad_server_secret "struct rad_handle *h"
+.Ft "void"
+.Fn rad_bind_to "struct rad_handle *h" "in_addr_t addr"
 .Ft u_char *
 .Fn rad_demangle "struct rad_handle *h" "const void *mangled" "size_t mlen"
 .Ft u_char *
@@ -431,6 +433,10 @@ returns the secret shared with the curre
 supplied rad_handle.
 .Pp
 The
+.Fn rad_bind_to
+assigns a source address for all requests to the current RADIUS server.
+.Pp
+The
 .Fn rad_demangle
 function demangles attributes containing passwords and MS-CHAPv1 MPPE-Keys.
 The return value is

Modified: stable/9/lib/libradius/radlib.c
==============================================================================
--- stable/9/lib/libradius/radlib.c	Thu Apr 12 17:43:59 2012	(r234190)
+++ stable/9/lib/libradius/radlib.c	Thu Apr 12 17:49:53 2012	(r234191)
@@ -756,9 +756,16 @@ rad_create_request(struct rad_handle *h,
 	clear_password(h);
 	h->authentic_pos = 0;
 	h->out_created = 1;
+	h->bindto = INADDR_ANY;
 	return 0;
 }
 
+void
+rad_bind_to(struct rad_handle *h, in_addr_t addr)
+{
+    h->bindto = addr;
+}
+
 int
 rad_create_response(struct rad_handle *h, int code)
 {
@@ -857,7 +864,7 @@ rad_init_send_request(struct rad_handle 
 		memset(&sin, 0, sizeof sin);
 		sin.sin_len = sizeof sin;
 		sin.sin_family = AF_INET;
-		sin.sin_addr.s_addr = INADDR_ANY;
+		sin.sin_addr.s_addr = h->bindto;
 		sin.sin_port = htons(0);
 		if (bind(h->fd, (const struct sockaddr *)&sin,
 		    sizeof sin) == -1) {

Modified: stable/9/lib/libradius/radlib.h
==============================================================================
--- stable/9/lib/libradius/radlib.h	Thu Apr 12 17:43:59 2012	(r234190)
+++ stable/9/lib/libradius/radlib.h	Thu Apr 12 17:49:53 2012	(r234191)
@@ -195,6 +195,7 @@ struct rad_handle	*rad_acct_open(void);
 int			 rad_add_server(struct rad_handle *,
 			    const char *, int, const char *, int, int);
 struct rad_handle	*rad_auth_open(void);
+void			 rad_bind_to(struct rad_handle *, in_addr_t);
 void			 rad_close(struct rad_handle *);
 int			 rad_config(struct rad_handle *, const char *);
 int			 rad_continue_send_request(struct rad_handle *, int,

Modified: stable/9/lib/libradius/radlib_private.h
==============================================================================
--- stable/9/lib/libradius/radlib_private.h	Thu Apr 12 17:43:59 2012	(r234190)
+++ stable/9/lib/libradius/radlib_private.h	Thu Apr 12 17:49:53 2012	(r234191)
@@ -92,6 +92,7 @@ struct rad_handle {
 	int		 try;		/* How many requests we've sent */
 	int		 srv;		/* Server number we did last */
 	int		 type;		/* Handle type */
+	in_addr_t	 bindto;	/* Bind to address */
 };
 
 struct vendor_attribute {

From owner-svn-src-stable-9@FreeBSD.ORG  Thu Apr 12 23:06:08 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 78D46106566C;
	Thu, 12 Apr 2012 23:06:08 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 638CD8FC15;
	Thu, 12 Apr 2012 23:06:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3CN68XZ049619;
	Thu, 12 Apr 2012 23:06:08 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3CN6893049616;
	Thu, 12 Apr 2012 23:06:08 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201204122306.q3CN6893049616@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 12 Apr 2012 23:06:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234197 - in stable/9/sys/amd64: acpica amd64
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2012 23:06:08 -0000

Author: jkim
Date: Thu Apr 12 23:06:07 2012
New Revision: 234197
URL: http://svn.freebsd.org/changeset/base/234197

Log:
  MFC:	r233704
  
  Re-initialize more model-specific registers when we resume CPUs.

Modified:
  stable/9/sys/amd64/acpica/acpi_wakeup.c
  stable/9/sys/amd64/amd64/mp_machdep.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- stable/9/sys/amd64/acpica/acpi_wakeup.c	Thu Apr 12 21:34:58 2012	(r234196)
+++ stable/9/sys/amd64/acpica/acpi_wakeup.c	Thu Apr 12 23:06:07 2012	(r234197)
@@ -284,6 +284,7 @@ acpi_sleep_machdep(struct acpi_softc *sc
 	} else {
 		pmap_init_pat();
 		load_cr3(susppcbs[0]->pcb_cr3);
+		initializecpu();
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);
 #ifdef SMP

Modified: stable/9/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- stable/9/sys/amd64/amd64/mp_machdep.c	Thu Apr 12 21:34:58 2012	(r234196)
+++ stable/9/sys/amd64/amd64/mp_machdep.c	Thu Apr 12 23:06:07 2012	(r234197)
@@ -1425,6 +1425,7 @@ cpususpend_handler(void)
 	} else {
 		pmap_init_pat();
 		load_cr3(susppcbs[cpu]->pcb_cr3);
+		initializecpu();
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);
 	}

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 04:17:45 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1E451106564A;
	Fri, 13 Apr 2012 04:17:45 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E30E68FC08;
	Fri, 13 Apr 2012 04:17:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3D4Hi7F059571;
	Fri, 13 Apr 2012 04:17:44 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3D4HiMo059568;
	Fri, 13 Apr 2012 04:17:44 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201204130417.q3D4HiMo059568@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 13 Apr 2012 04:17:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234198 - stable/9/sys/geom/part
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 04:17:45 -0000

Author: ae
Date: Fri Apr 13 04:17:43 2012
New Revision: 234198
URL: http://svn.freebsd.org/changeset/base/234198

Log:
  MFC r233000:
    Add MODULE_DEPEND() to geom_part modules.
  
  MFC r233342:
    Check that scheme is not already registered. This may happens when a
    KLD is preloaded with loader(8) and leads to infinity loop.
  
    Also do not return EEXIST error code from MOD_LOAD handler, because
    we have undocumented(?) ability replace kernel's module with preloaded one.
    And if we have so, then preloaded module will be initialized first.
    Thus error in MOD_LOAD handler will be triggered for the kernel.
  
    PR:		kern/165573

Modified:
  stable/9/sys/geom/part/g_part.c
  stable/9/sys/geom/part/g_part.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/part/g_part.c
==============================================================================
--- stable/9/sys/geom/part/g_part.c	Thu Apr 12 23:06:07 2012	(r234197)
+++ stable/9/sys/geom/part/g_part.c	Fri Apr 13 04:17:43 2012	(r234198)
@@ -145,6 +145,7 @@ static struct g_class g_part_class = {
 };
 
 DECLARE_GEOM_CLASS(g_part_class, g_part);
+MODULE_VERSION(g_part, 0);
 
 /*
  * Support functions.
@@ -2208,23 +2209,32 @@ g_part_unload_event(void *arg, int flag)
 int
 g_part_modevent(module_t mod, int type, struct g_part_scheme *scheme)
 {
+	struct g_part_scheme *iter;
 	uintptr_t arg;
 	int error;
 
+	error = 0;
 	switch (type) {
 	case MOD_LOAD:
-		TAILQ_INSERT_TAIL(&g_part_schemes, scheme, scheme_list);
-
-		error = g_retaste(&g_part_class);
-		if (error)
-			TAILQ_REMOVE(&g_part_schemes, scheme, scheme_list);
+		TAILQ_FOREACH(iter, &g_part_schemes, scheme_list) {
+			if (scheme == iter) {
+				printf("GEOM_PART: scheme %s is already "
+				    "registered!\n", scheme->name);
+				break;
+			}
+		}
+		if (iter == NULL) {
+			TAILQ_INSERT_TAIL(&g_part_schemes, scheme,
+			    scheme_list);
+			g_retaste(&g_part_class);
+		}
 		break;
 	case MOD_UNLOAD:
 		arg = (uintptr_t)scheme;
 		error = g_waitfor_event(g_part_unload_event, &arg, M_WAITOK,
 		    NULL);
-		if (!error)
-			error = (arg == (uintptr_t)scheme) ? EDOOFUS : arg;
+		if (error == 0)
+			error = arg;
 		break;
 	default:
 		error = EOPNOTSUPP;

Modified: stable/9/sys/geom/part/g_part.h
==============================================================================
--- stable/9/sys/geom/part/g_part.h	Thu Apr 12 23:06:07 2012	(r234197)
+++ stable/9/sys/geom/part/g_part.h	Fri Apr 13 04:17:43 2012	(r234198)
@@ -208,6 +208,7 @@ int g_part_modevent(module_t, int, struc
 	name##_modevent,					\
 	&name##_scheme						\
     };								\
-    DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_ANY)
+    DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); \
+    MODULE_DEPEND(name, g_part, 0, 0, 0)
 
 #endif /* !_GEOM_PART_H_ */

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 07:39:21 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 06C79106566C;
	Fri, 13 Apr 2012 07:39:21 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E5D998FC14;
	Fri, 13 Apr 2012 07:39:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3D7dKEg066262;
	Fri, 13 Apr 2012 07:39:20 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3D7dKFQ066260;
	Fri, 13 Apr 2012 07:39:20 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204130739.q3D7dKFQ066260@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 13 Apr 2012 07:39:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234209 - in stable/9/sys: conf i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 07:39:21 -0000

Author: avg
Date: Fri Apr 13 07:39:20 2012
New Revision: 234209
URL: http://svn.freebsd.org/changeset/base/234209

Log:
  MFC r231558: newvers.sh: unbreak git/git-svn support

Modified:
  stable/9/sys/conf/newvers.sh
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/conf/newvers.sh
==============================================================================
--- stable/9/sys/conf/newvers.sh	Fri Apr 13 07:18:19 2012	(r234208)
+++ stable/9/sys/conf/newvers.sh	Fri Apr 13 07:39:20 2012	(r234209)
@@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin;
 		svnversion=${dir}/svnversion
 		break
 	fi
-	if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
-		git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
-		break
-	fi
 done
+if [ -d "${SYSDIR}/../.git" ] ; then
+	for dir in /bin /usr/bin /usr/local/bin; do
+		if [ -x "${dir}/git" ] ; then
+			git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
+			break
+		fi
+	done
+fi
 
 if [ -n "$svnversion" ] ; then
 	echo "$svnversion"

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 07:48:46 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B847C106564A;
	Fri, 13 Apr 2012 07:48:46 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 88F028FC08;
	Fri, 13 Apr 2012 07:48:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3D7mkQW066678;
	Fri, 13 Apr 2012 07:48:46 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3D7mkdG066676;
	Fri, 13 Apr 2012 07:48:46 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204130748.q3D7mkdG066676@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 13 Apr 2012 07:48:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234211 - in stable/9/sys:
	cddl/contrib/opensolaris/uts/common/fs/zfs i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 07:48:46 -0000

Author: avg
Date: Fri Apr 13 07:48:45 2012
New Revision: 234211
URL: http://svn.freebsd.org/changeset/base/234211

Log:
  MFC r233918: zfs_ioctl: no need for ddi_copyin/out here because
  sys_ioctl handles that

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Apr 13 07:44:40 2012	(r234210)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Apr 13 07:48:45 2012	(r234211)
@@ -293,9 +293,12 @@ zfs_ioctl(vnode_t *vp, u_long com, intpt
 
 	case _FIO_SEEK_DATA:
 	case _FIO_SEEK_HOLE:
+#ifdef sun
 		if (ddi_copyin((void *)data, &off, sizeof (off), flag))
 			return (EFAULT);
-
+#else
+		off = *(offset_t *)data;
+#endif
 		zp = VTOZ(vp);
 		zfsvfs = zp->z_zfsvfs;
 		ZFS_ENTER(zfsvfs);
@@ -306,8 +309,12 @@ zfs_ioctl(vnode_t *vp, u_long com, intpt
 		ZFS_EXIT(zfsvfs);
 		if (error)
 			return (error);
+#ifdef sun
 		if (ddi_copyout(&off, (void *)data, sizeof (off), flag))
 			return (EFAULT);
+#else
+		*(offset_t *)data = off;
+#endif
 		return (0);
 	}
 	return (ENOTTY);

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 08:01:34 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E0F6F1065670;
	Fri, 13 Apr 2012 08:01:34 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CBB4E8FC0C;
	Fri, 13 Apr 2012 08:01:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3D81Ylj067230;
	Fri, 13 Apr 2012 08:01:34 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3D81YHK067228;
	Fri, 13 Apr 2012 08:01:34 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204130801.q3D81YHK067228@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 13 Apr 2012 08:01:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234213 - in stable/9/sys: i386/conf kern pci
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 08:01:35 -0000

Author: avg
Date: Fri Apr 13 08:01:34 2012
New Revision: 234213
URL: http://svn.freebsd.org/changeset/base/234213

Log:
  MFC r234040: intpm: reflect the fact that SB800 and later AMD chipsets
  are not supported

Modified:
  stable/9/sys/pci/intpm.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/pci/intpm.c
==============================================================================
--- stable/9/sys/pci/intpm.c	Fri Apr 13 07:54:09 2012	(r234212)
+++ stable/9/sys/pci/intpm.c	Fri Apr 13 08:01:34 2012	(r234213)
@@ -99,6 +99,9 @@ intsmb_probe(device_t dev)
 		device_set_desc(dev, "Intel PIIX4 SMBUS Interface");
 		break;
 	case 0x43851002:
+		/* SB800 and newer can not be configured in a compatible way. */
+		if (pci_get_revid(dev) >= 0x40)
+			return (ENXIO);
 		device_set_desc(dev, "AMD SB600/700/710/750 SMBus Controller");
 		/* XXX Maybe force polling right here? */
 		break;

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 08:08:45 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5ECFE1065680;
	Fri, 13 Apr 2012 08:08:45 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 490B88FC0C;
	Fri, 13 Apr 2012 08:08:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3D88jiG067557;
	Fri, 13 Apr 2012 08:08:45 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3D88jr2067555;
	Fri, 13 Apr 2012 08:08:45 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204130808.q3D88jr2067555@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 13 Apr 2012 08:08:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234215 - in stable/9/sys: i386/conf kern pci
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 08:08:45 -0000

Author: avg
Date: Fri Apr 13 08:08:44 2012
New Revision: 234215
URL: http://svn.freebsd.org/changeset/base/234215

Log:
  MFC r234043: intpm: return only SMB bus error codes from SMB methods

Modified:
  stable/9/sys/pci/intpm.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/pci/intpm.c
==============================================================================
--- stable/9/sys/pci/intpm.c	Fri Apr 13 08:04:00 2012	(r234214)
+++ stable/9/sys/pci/intpm.c	Fri Apr 13 08:08:44 2012	(r234215)
@@ -272,7 +272,7 @@ intsmb_callback(device_t dev, int index,
 	case SMB_RELEASE_BUS:
 		break;
 	default:
-		error = EINVAL;
+		error = SMB_EINVAL;
 	}
 
 	return (error);
@@ -519,7 +519,7 @@ intsmb_quick(device_t dev, u_char slave,
 		data |= LSB;
 		break;
 	default:
-		return (EINVAL);
+		return (SMB_EINVAL);
 	}
 
 	INTSMB_LOCK(sc);
@@ -774,7 +774,7 @@ intsmb_bread(device_t dev, u_char slave,
 			}
 			*count = nread;
 		} else
-			error = EIO;
+			error = SMB_EBUSERR;
 	}
 	INTSMB_UNLOCK(sc);
 	return (error);

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 10:49:18 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1151B106564A;
	Fri, 13 Apr 2012 10:49:18 +0000 (UTC)
	(envelope-from oliver.pntr@gmail.com)
Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com
	[209.85.161.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 78E448FC08;
	Fri, 13 Apr 2012 10:49:17 +0000 (UTC)
Received: by ggnk4 with SMTP id k4so1869149ggn.13
	for <multiple recipients>; Fri, 13 Apr 2012 03:49:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type;
	bh=Rc2C92j85/3+zrEjX+NKqHrzrUfFoCpkvP7FI+gcgs0=;
	b=nJtokKs6JNxRTOle6muKY8AvBqlDduYTwgLYMYE7tBLpwth8zJfGw1ru0rj79ITgxk
	0EhXVbCV0KzlE+6MZjUbh4a0gDVaIUoYRkIFRrwgaQVAQvbicLbSBZ7FYCElgrR5j1Bv
	2FdFjZBkRdMCu5aeJ1g6J6x4QihVbaVuoOe53bQPg99Zlpt7Bh21FwoLrwtOTLrfjhZI
	zd+rmV4CfUjGxPhuHs2sH8zj2uXHFoXBuVLUcjiXMTurDf9kvPCbay+PSPM3H5fWK6UC
	wkhrlrQOzOx9Y10yOF+I8o6fB4uOzPHTQvQOGPwseoZFXMDwe68Sg/WxkvCZbIkdX1b4
	z+bQ==
MIME-Version: 1.0
Received: by 10.236.200.228 with SMTP id z64mr1156463yhn.10.1334314156816;
	Fri, 13 Apr 2012 03:49:16 -0700 (PDT)
Received: by 10.236.181.225 with HTTP; Fri, 13 Apr 2012 03:49:16 -0700 (PDT)
In-Reply-To: <201204130739.q3D7dKFQ066260@svn.freebsd.org>
References: <201204130739.q3D7dKFQ066260@svn.freebsd.org>
Date: Fri, 13 Apr 2012 12:49:16 +0200
Message-ID: <CAPjTQNFxw5uX4ivfCH0Da+zHpWXskV=1tDTv63pF0v8yuO__MA@mail.gmail.com>
From: Oliver Pinter <oliver.pntr@gmail.com>
To: Andriy Gapon <avg@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r234209 - in stable/9/sys: conf i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 10:49:18 -0000

Hi!

Please MFC back this patch to 7 and 8 STABLE.

On 4/13/12, Andriy Gapon <avg@freebsd.org> wrote:
> Author: avg
> Date: Fri Apr 13 07:39:20 2012
> New Revision: 234209
> URL: http://svn.freebsd.org/changeset/base/234209
>
> Log:
>   MFC r231558: newvers.sh: unbreak git/git-svn support
>
> Modified:
>   stable/9/sys/conf/newvers.sh
> Directory Properties:
>   stable/9/sys/   (props changed)
>   stable/9/sys/amd64/include/xen/   (props changed)
>   stable/9/sys/boot/   (props changed)
>   stable/9/sys/boot/i386/efi/   (props changed)
>   stable/9/sys/boot/ia64/efi/   (props changed)
>   stable/9/sys/boot/ia64/ski/   (props changed)
>   stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
>   stable/9/sys/boot/powerpc/ofw/   (props changed)
>   stable/9/sys/cddl/contrib/opensolaris/   (props changed)
>   stable/9/sys/conf/   (props changed)
>   stable/9/sys/contrib/dev/acpica/   (props changed)
>   stable/9/sys/contrib/octeon-sdk/   (props changed)
>   stable/9/sys/contrib/pf/   (props changed)
>   stable/9/sys/contrib/x86emu/   (props changed)
>   stable/9/sys/fs/   (props changed)
>   stable/9/sys/fs/ntfs/   (props changed)
>   stable/9/sys/i386/conf/XENHVM   (props changed)
>   stable/9/sys/kern/subr_witness.c   (props changed)
>
> Modified: stable/9/sys/conf/newvers.sh
> ==============================================================================
> --- stable/9/sys/conf/newvers.sh	Fri Apr 13 07:18:19 2012	(r234208)
> +++ stable/9/sys/conf/newvers.sh	Fri Apr 13 07:39:20 2012	(r234209)
> @@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin;
>  		svnversion=${dir}/svnversion
>  		break
>  	fi
> -	if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
> -		git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
> -		break
> -	fi
>  done
> +if [ -d "${SYSDIR}/../.git" ] ; then
> +	for dir in /bin /usr/bin /usr/local/bin; do
> +		if [ -x "${dir}/git" ] ; then
> +			git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
> +			break
> +		fi
> +	done
> +fi
>
>  if [ -n "$svnversion" ] ; then
>  	echo "$svnversion"
> _______________________________________________
> svn-src-stable@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-stable
> To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org"
>

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 21:35:25 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 78F99106566B;
	Fri, 13 Apr 2012 21:35:25 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 621828FC08;
	Fri, 13 Apr 2012 21:35:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3DLZPWi098230;
	Fri, 13 Apr 2012 21:35:25 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DLZPRY098228;
	Fri, 13 Apr 2012 21:35:25 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201204132135.q3DLZPRY098228@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 13 Apr 2012 21:35:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234237 - stable/9/share/mk
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 21:35:25 -0000

Author: dim
Date: Fri Apr 13 21:35:24 2012
New Revision: 234237
URL: http://svn.freebsd.org/changeset/base/234237

Log:
  MFC r233052:
  
  Change the style of share/mk/bsd.sys.mk to that of the other bsd.*.mk
  files, and style.Makefile(5), where applicable.  While here, update the
  link to the gcc warning documentation.
  
  No functional change.

Modified:
  stable/9/share/mk/bsd.sys.mk   (contents, props changed)
Directory Properties:
  stable/9/share/mk/   (props changed)

Modified: stable/9/share/mk/bsd.sys.mk
==============================================================================
--- stable/9/share/mk/bsd.sys.mk	Fri Apr 13 20:58:01 2012	(r234236)
+++ stable/9/share/mk/bsd.sys.mk	Fri Apr 13 21:35:24 2012	(r234237)
@@ -6,112 +6,113 @@
 # Enable various levels of compiler warning checks.  These may be
 # overridden (e.g. if using a non-gcc compiler) by defining NO_WARNS.
 
-# for GCC:  http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
+# for GCC:   http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Warning-Options.html
 
 # the default is gnu99 for now
-CSTD		?= gnu99
+CSTD?=		gnu99
 
 .if ${CSTD} == "k&r"
-CFLAGS		+= -traditional
+CFLAGS+=	-traditional
 .elif ${CSTD} == "c89" || ${CSTD} == "c90"
-CFLAGS		+= -std=iso9899:1990
+CFLAGS+=	-std=iso9899:1990
 .elif ${CSTD} == "c94" || ${CSTD} == "c95"
-CFLAGS		+= -std=iso9899:199409
+CFLAGS+=	-std=iso9899:199409
 .elif ${CSTD} == "c99"
-CFLAGS		+= -std=iso9899:1999
-.else
-CFLAGS		+= -std=${CSTD}
-.endif
+CFLAGS+=	-std=iso9899:1999
+.else # CSTD
+CFLAGS+=	-std=${CSTD}
+.endif # CSTD
 .if !defined(NO_WARNS)
 # -pedantic is problematic because it also imposes namespace restrictions
-#CFLAGS		+= -pedantic
-. if defined(WARNS)
-.  if ${WARNS} >= 1
-CWARNFLAGS	+=	-Wsystem-headers
-.   if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
-CWARNFLAGS	+=	-Werror
-.   endif
-.  endif
-.  if ${WARNS} >= 2
-CWARNFLAGS	+=	-Wall -Wno-format-y2k
-.  endif
-.  if ${WARNS} >= 3
-CWARNFLAGS	+=	-W -Wno-unused-parameter -Wstrict-prototypes\
-			-Wmissing-prototypes -Wpointer-arith
-.  endif
-.  if ${WARNS} >= 4
-CWARNFLAGS	+=	-Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\
-			-Wshadow -Wunused-parameter
-.   if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang))
-CWARNFLAGS	+=	-Wcast-align
-.   endif
-.  endif
+#CFLAGS+=	-pedantic
+.if defined(WARNS)
+.if ${WARNS} >= 1
+CWARNFLAGS+=	-Wsystem-headers
+.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
+    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
+CWARNFLAGS+=	-Werror
+.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+.endif # WARNS >= 1
+.if ${WARNS} >= 2
+CWARNFLAGS+=	-Wall -Wno-format-y2k
+.endif # WARNS >= 2
+.if ${WARNS} >= 3
+CWARNFLAGS+=	-W -Wno-unused-parameter -Wstrict-prototypes\
+		-Wmissing-prototypes -Wpointer-arith
+.endif # WARNS >= 3
+.if ${WARNS} >= 4
+CWARNFLAGS+=	-Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow\
+		-Wunused-parameter
+.if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && \
+    ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang))
+CWARNFLAGS+=	-Wcast-align
+.endif # !NO_WCAST_ALIGN && (!CLANG || !NO_WCAST_ALIGN.clang)
+.endif # WARNS >= 4
 # BDECFLAGS
-.  if ${WARNS} >= 6
-CWARNFLAGS	+=	-Wchar-subscripts -Winline -Wnested-externs\
-			-Wredundant-decls -Wold-style-definition
-.  endif
-.  if ${WARNS} >= 2 && ${WARNS} <= 4
+.if ${WARNS} >= 6
+CWARNFLAGS+=	-Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls\
+		-Wold-style-definition
+.endif # WARNS >= 6
+.if ${WARNS} >= 2 && ${WARNS} <= 4
 # XXX Delete -Wuninitialized by default for now -- the compiler doesn't
 # XXX always get it right.
-CWARNFLAGS	+=	-Wno-uninitialized
-.  endif
-CWARNFLAGS	+=	-Wno-pointer-sign
+CWARNFLAGS+=	-Wno-uninitialized
+.endif # WARNS >=2 && WARNS <= 4
+CWARNFLAGS+=	-Wno-pointer-sign
 # Clang has more warnings enabled by default, and when using -Wall, so if WARNS
 # is set to low values, these have to be disabled explicitly.
-.  if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
-.   if ${WARNS} <= 3
-CWARNFLAGS	+=	-Wno-tautological-compare -Wno-unused-value\
-			-Wno-parentheses-equality -Wno-unused-function\
-			-Wno-conversion
-.   endif
-.   if ${WARNS} <= 2
-CWARNFLAGS	+=	-Wno-switch-enum -Wno-empty-body
-.   endif
-.   if ${WARNS} <= 1
-CWARNFLAGS	+=	-Wno-parentheses
-.   endif
-.   if defined(NO_WARRAY_BOUNDS)
-CWARNFLAGS	+=	-Wno-array-bounds
-.   endif
-.  endif
-. endif
-
-. if defined(FORMAT_AUDIT)
-WFORMAT		=	1
-. endif
-. if defined(WFORMAT)
-.  if ${WFORMAT} > 0
-#CWARNFLAGS	+=	-Wformat-nonliteral -Wformat-security -Wno-format-extra-args
-CWARNFLAGS	+=	-Wformat=2 -Wno-format-extra-args
-.   if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
-CWARNFLAGS	+=	-Werror
-.   endif
-.  endif
-. endif
-. if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang))
-CWARNFLAGS	+=	-Wno-format
-. endif
-.endif
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
+.if ${WARNS} <= 3
+CWARNFLAGS+=	-Wno-tautological-compare -Wno-unused-value\
+		-Wno-parentheses-equality -Wno-unused-function -Wno-conversion
+.endif # WARNS <= 3
+.if ${WARNS} <= 2
+CWARNFLAGS+=	-Wno-switch-enum -Wno-empty-body
+.endif # WARNS <= 2
+.if ${WARNS} <= 1
+CWARNFLAGS+=	-Wno-parentheses
+.endif # WARNS <= 1
+.if defined(NO_WARRAY_BOUNDS)
+CWARNFLAGS+=	-Wno-array-bounds
+.endif # NO_WARRAY_BOUNDS
+.endif # CLANG
+.endif # WARNS
+
+.if defined(FORMAT_AUDIT)
+WFORMAT=	1
+.endif # FORMAT_AUDIT
+.if defined(WFORMAT)
+.if ${WFORMAT} > 0
+#CWARNFLAGS+=	-Wformat-nonliteral -Wformat-security -Wno-format-extra-args
+CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
+.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
+    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
+CWARNFLAGS+=	-Werror
+.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+.endif # WFORMAT > 0
+.endif # WFORMAT
+.if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \
+    ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang))
+CWARNFLAGS+=	-Wno-format
+.endif # NO_WFORMAT || (CLANG && NO_WFORMAT.clang)
+.endif # !NO_WARNS
 
 .if defined(IGNORE_PRAGMA)
-CWARNFLAGS	+=	-Wno-unknown-pragmas
-.endif
+CWARNFLAGS+=	-Wno-unknown-pragmas
+.endif # IGNORE_PRAGMA
 
 .if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
-CLANG_NO_IAS	=	-no-integrated-as
-CLANG_OPT_SMALL	=	-mllvm -stack-alignment=8 \
-			-mllvm -inline-threshold=3 \
-			-mllvm -enable-load-pre=false \
-			-mllvm -simplifycfg-dup-ret
-.endif
+CLANG_NO_IAS=	 -no-integrated-as
+CLANG_OPT_SMALL= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3\
+		 -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret
+.endif # CLANG
 
 .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 # Don't use -Wstack-protector as it breaks world with -Werror.
-SSP_CFLAGS	?=	-fstack-protector
-CFLAGS		+=	${SSP_CFLAGS}
-.endif
+SSP_CFLAGS?=	-fstack-protector
+CFLAGS+=	${SSP_CFLAGS}
+.endif # SSP && !IA64 && !ARM && !MIPS
 
 # Allow user-specified additional warning flags
-CFLAGS		+=	${CWARNFLAGS}
+CFLAGS+=	${CWARNFLAGS}

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 21:47:15 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 56EDB106566C;
	Fri, 13 Apr 2012 21:47:15 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 281138FC1D;
	Fri, 13 Apr 2012 21:47:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3DLlFNa098641;
	Fri, 13 Apr 2012 21:47:15 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DLlElW098637;
	Fri, 13 Apr 2012 21:47:14 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201204132147.q3DLlElW098637@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 13 Apr 2012 21:47:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234238 - in stable/9/sys: conf modules/mps
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 21:47:15 -0000

Author: dim
Date: Fri Apr 13 21:47:14 2012
New Revision: 234238
URL: http://svn.freebsd.org/changeset/base/234238

Log:
  MFC r233354:
  
  Work around the following clang warning in mps(4):
  
    sys/dev/mps/mps_sas.c:861:1: error: function 'mpssas_discovery_timeout' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
    mpssas_discovery_timeout(void *data)
    ^
  
  Because the driver is obtained from upstream, we don't want to modify
  it; just silence the warning instead, it is harmless.

Modified:
  stable/9/sys/conf/files
  stable/9/sys/conf/kern.mk
  stable/9/sys/modules/mps/Makefile
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/conf/files
==============================================================================
--- stable/9/sys/conf/files	Fri Apr 13 21:35:24 2012	(r234237)
+++ stable/9/sys/conf/files	Fri Apr 13 21:47:14 2012	(r234238)
@@ -1464,7 +1464,8 @@ dev/mps/mps.c			optional mps
 dev/mps/mps_config.c		optional mps
 dev/mps/mps_mapping.c		optional mps
 dev/mps/mps_pci.c		optional mps pci
-dev/mps/mps_sas.c		optional mps
+dev/mps/mps_sas.c		optional mps \
+	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
 dev/mps/mps_sas_lsi.c		optional mps
 dev/mps/mps_table.c		optional mps
 dev/mps/mps_user.c		optional mps

Modified: stable/9/sys/conf/kern.mk
==============================================================================
--- stable/9/sys/conf/kern.mk	Fri Apr 13 21:35:24 2012	(r234237)
+++ stable/9/sys/conf/kern.mk	Fri Apr 13 21:47:14 2012	(r234238)
@@ -23,6 +23,7 @@ NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-cou
 NO_WUNUSED_VALUE=		-Wno-unused-value
 NO_WSELF_ASSIGN=		-Wno-self-assign
 NO_WFORMAT_SECURITY=		-Wno-format-security
+NO_WUNNEEDED_INTERNAL_DECL=	-Wno-unneeded-internal-declaration
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.

Modified: stable/9/sys/modules/mps/Makefile
==============================================================================
--- stable/9/sys/modules/mps/Makefile	Fri Apr 13 21:35:24 2012	(r234237)
+++ stable/9/sys/modules/mps/Makefile	Fri Apr 13 21:47:14 2012	(r234238)
@@ -12,3 +12,6 @@ SRCS+=	device_if.h bus_if.h pci_if.h
 DEBUG_FLAGS += -g
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.mps_sas.c=	${NO_WUNNEEDED_INTERNAL_DECL}
+CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 21:50:15 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 20932106566B;
	Fri, 13 Apr 2012 21:50:15 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0CFB18FC1A;
	Fri, 13 Apr 2012 21:50:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3DLoE7g098786;
	Fri, 13 Apr 2012 21:50:14 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DLoEGm098784;
	Fri, 13 Apr 2012 21:50:14 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201204132150.q3DLoEGm098784@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 13 Apr 2012 21:50:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234239 - stable/9/sys/dev/isci
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 21:50:15 -0000

Author: dim
Date: Fri Apr 13 21:50:14 2012
New Revision: 234239
URL: http://svn.freebsd.org/changeset/base/234239

Log:
  MFC r233710:
  
  Fix the following compilation warning with clang trunk in isci(4):
  
    sys/dev/isci/isci_task_request.c:198:7: error: case value not in enumerated type 'SCI_TASK_STATUS' (aka 'enum _SCI_TASK_STATUS') [-Werror,-Wswitch]
      case SCI_FAILURE_TIMEOUT:
  	   ^
  
  This is because the switch is done on a SCI_TASK_STATUS enum type, but
  the SCI_FAILURE_TIMEOUT value belongs to SCI_STATUS instead.
  
  Because the list of SCI_TASK_STATUS values cannot be modified at this
  time, use the simplest way to get rid of this warning, which is to cast
  the switch argument to int.  No functional change.
  
  Reviewed by:	jimharris

Modified:
  stable/9/sys/dev/isci/isci_task_request.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/isci/isci_task_request.c
==============================================================================
--- stable/9/sys/dev/isci/isci_task_request.c	Fri Apr 13 21:47:14 2012	(r234238)
+++ stable/9/sys/dev/isci/isci_task_request.c	Fri Apr 13 21:50:14 2012	(r234239)
@@ -188,7 +188,7 @@ isci_task_request_complete(SCI_CONTROLLE
 
 	isci_remote_device->is_resetting = FALSE;
 
-	switch (completion_status) {
+	switch ((int)completion_status) {
 	case SCI_TASK_SUCCESS:
 	case SCI_TASK_FAILURE_RESPONSE_VALID:
 		break;

From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr 13 22:04:27 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B728106566B;
	Fri, 13 Apr 2012 22:04:27 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B0DF8FC14;
	Fri, 13 Apr 2012 22:04:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3DM4QxN099336;
	Fri, 13 Apr 2012 22:04:26 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DM4Q16099334;
	Fri, 13 Apr 2012 22:04:26 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201204132204.q3DM4Q16099334@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 13 Apr 2012 22:04:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234240 - in stable/9/sys: dev/ale i386/conf kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 22:04:27 -0000

Author: marius
Date: Fri Apr 13 22:04:26 2012
New Revision: 234240
URL: http://svn.freebsd.org/changeset/base/234240

Log:
  MFC: r233888
  
  - Const'ify the device lookup-table.
  - Use DEVMETHOD_END.
  - Use NULL instead of 0 for pointers.
  - Enable support for flow control.
    Tested by: yongari

Modified:
  stable/9/sys/dev/ale/if_ale.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/dev/ale/if_ale.c
==============================================================================
--- stable/9/sys/dev/ale/if_ale.c	Fri Apr 13 21:50:14 2012	(r234239)
+++ stable/9/sys/dev/ale/if_ale.c	Fri Apr 13 22:04:26 2012	(r234240)
@@ -91,11 +91,11 @@ TUNABLE_INT("hw.ale.msix_disable", &msix
 /*
  * Devices supported by this driver.
  */
-static struct ale_dev {
+static const struct ale_dev {
 	uint16_t	ale_vendorid;
 	uint16_t	ale_deviceid;
 	const char	*ale_name;
-} ale_devs[] = {
+} const ale_devs[] = {
     { VENDORID_ATHEROS, DEVICEID_ATHEROS_AR81XX,
     "Atheros AR8121/AR8113/AR8114 PCIe Ethernet" },
 };
@@ -163,7 +163,7 @@ static device_method_t ale_methods[] = {
 	DEVMETHOD(miibus_writereg,	ale_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	ale_miibus_statchg),
 
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static driver_t ale_driver = {
@@ -174,8 +174,8 @@ static driver_t ale_driver = {
 
 static devclass_t ale_devclass;
 
-DRIVER_MODULE(ale, pci, ale_driver, ale_devclass, 0, 0);
-DRIVER_MODULE(miibus, ale, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE(ale, pci, ale_driver, ale_devclass, NULL, NULL);
+DRIVER_MODULE(miibus, ale, miibus_driver, miibus_devclass, NULL, NULL);
 
 static struct resource_spec ale_res_spec_mem[] = {
 	{ SYS_RES_MEMORY,	PCIR_BAR(0),	RF_ACTIVE },
@@ -335,7 +335,7 @@ ale_mediachange(struct ifnet *ifp)
 static int
 ale_probe(device_t dev)
 {
-	struct ale_dev *sp;
+	const struct ale_dev *sp;
 	int i;
 	uint16_t vendor, devid;
 
@@ -635,7 +635,7 @@ ale_attach(device_t dev)
 	/* Set up MII bus. */
 	error = mii_attach(dev, &sc->ale_miibus, ifp, ale_mediachange,
 	    ale_mediastatus, BMSR_DEFCAPMASK, sc->ale_phyaddr, MII_OFFSET_ANY,
-	    0);
+	    MIIF_DOPAUSE);
 	if (error != 0) {
 		device_printf(dev, "attaching PHYs failed\n");
 		goto fail;
@@ -2101,12 +2101,10 @@ ale_mac_config(struct ale_softc *sc)
 	}
 	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0) {
 		reg |= MAC_CFG_FULL_DUPLEX;
-#ifdef notyet
 		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
 			reg |= MAC_CFG_TX_FC;
 		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
 			reg |= MAC_CFG_RX_FC;
-#endif
 	}
 	CSR_WRITE_4(sc, ALE_MAC_CFG, reg);
 }
@@ -2798,7 +2796,7 @@ ale_init_locked(struct ale_softc *sc)
 		    ((rxf_lo << RX_FIFO_PAUSE_THRESH_LO_SHIFT) &
 		    RX_FIFO_PAUSE_THRESH_LO_MASK) |
 		    ((rxf_hi << RX_FIFO_PAUSE_THRESH_HI_SHIFT) &
-		     RX_FIFO_PAUSE_THRESH_HI_MASK));
+		    RX_FIFO_PAUSE_THRESH_HI_MASK));
 	}
 
 	/* Disable RSS. */

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 02:06:54 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4C32D106564A;
	Sat, 14 Apr 2012 02:06:54 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 375E48FC0A;
	Sat, 14 Apr 2012 02:06:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3E26sBQ008011;
	Sat, 14 Apr 2012 02:06:54 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3E26rnf008009;
	Sat, 14 Apr 2012 02:06:53 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201204140206.q3E26rnf008009@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 14 Apr 2012 02:06:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234260 - stable/9/sbin/sysctl
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 02:06:54 -0000

Author: eadler
Date: Sat Apr 14 02:06:53 2012
New Revision: 234260
URL: http://svn.freebsd.org/changeset/base/234260

Log:
  MFC r234134:
  	s/Free Memory Pages/Free Memory/ to avoid confusion, since we're
  	reporting a number of bytes rather than a number of pages
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/sbin/sysctl/sysctl.c
Directory Properties:
  stable/9/sbin/sysctl/   (props changed)

Modified: stable/9/sbin/sysctl/sysctl.c
==============================================================================
--- stable/9/sbin/sysctl/sysctl.c	Sat Apr 14 00:40:32 2012	(r234259)
+++ stable/9/sbin/sysctl/sysctl.c	Sat Apr 14 02:06:53 2012	(r234260)
@@ -419,7 +419,7 @@ S_vmtotal(int l2, void *p)
 	    v->t_vmshr * pageKilo, v->t_avmshr * pageKilo);
 	printf("Shared Real Memory:\t(Total: %dK Active: %dK)\n",
 	    v->t_rmshr * pageKilo, v->t_armshr * pageKilo);
-	printf("Free Memory Pages:\t%dK\n", v->t_free * pageKilo);
+	printf("Free Memory:\t%dK\n", v->t_free * pageKilo);
 
 	return (0);
 }

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 02:10:46 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5928F106566C;
	Sat, 14 Apr 2012 02:10:46 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44DB58FC17;
	Sat, 14 Apr 2012 02:10:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3E2Akcg008259;
	Sat, 14 Apr 2012 02:10:46 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3E2Ak9M008257;
	Sat, 14 Apr 2012 02:10:46 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201204140210.q3E2Ak9M008257@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 14 Apr 2012 02:10:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234263 - stable/9/usr.sbin/ppp
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 02:10:46 -0000

Author: eadler
Date: Sat Apr 14 02:10:45 2012
New Revision: 234263
URL: http://svn.freebsd.org/changeset/base/234263

Log:
  MFC r230347:
  	Fix warning when compiling with gcc46:
  		error: variable 'addrs' set but not used
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/usr.sbin/ppp/iface.c
Directory Properties:
  stable/9/usr.sbin/ppp/   (props changed)

Modified: stable/9/usr.sbin/ppp/iface.c
==============================================================================
--- stable/9/usr.sbin/ppp/iface.c	Sat Apr 14 02:07:37 2012	(r234262)
+++ stable/9/usr.sbin/ppp/iface.c	Sat Apr 14 02:10:45 2012	(r234263)
@@ -471,12 +471,11 @@ iface_Descr(struct cmdargs const *arg)
 void
 iface_Clear(struct iface *iface, struct ncp *ncp, int family, int how)
 {
-  int addrs, af, inskip, in6skip, s4 = -1, s6 = -1, *s;
+  int af, inskip, in6skip, s4 = -1, s6 = -1, *s;
   unsigned n;
 
   if (iface->addrs) {
     inskip = in6skip = how == IFACE_CLEAR_ALL ? 0 : 1;
-    addrs = 0;
 
     for (n = 0; n < iface->addrs; n++) {
       af = ncprange_family(&iface->addr[n].ifa);

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 02:47:00 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 78F0C106566B;
	Sat, 14 Apr 2012 02:47:00 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6449C8FC0C;
	Sat, 14 Apr 2012 02:47:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3E2l0hs009444;
	Sat, 14 Apr 2012 02:47:00 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3E2kxFF009442;
	Sat, 14 Apr 2012 02:46:59 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201204140246.q3E2kxFF009442@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 14 Apr 2012 02:46:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234266 - stable/9/lib/libc/string
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 02:47:00 -0000

Author: eadler
Date: Sat Apr 14 02:46:59 2012
New Revision: 234266
URL: http://svn.freebsd.org/changeset/base/234266

Log:
  MFC r231813:
  	Add err(3) to strerror(3) SEE ALSO section
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/lib/libc/string/strerror.3
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/string/strerror.3
==============================================================================
--- stable/9/lib/libc/string/strerror.3	Sat Apr 14 02:11:26 2012	(r234265)
+++ stable/9/lib/libc/string/strerror.3	Sat Apr 14 02:46:59 2012	(r234266)
@@ -147,6 +147,7 @@ or
 should be used instead.
 .Sh SEE ALSO
 .Xr intro 2 ,
+.Xr err 3 ,
 .Xr psignal 3
 .Sh STANDARDS
 The

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 09:21:07 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35ADE1065670;
	Sat, 14 Apr 2012 09:21:07 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FB618FC14;
	Sat, 14 Apr 2012 09:21:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3E9L6MA022040;
	Sat, 14 Apr 2012 09:21:06 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3E9L67i022038;
	Sat, 14 Apr 2012 09:21:06 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204140921.q3E9L67i022038@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 09:21:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234273 - stable/9/share/man/man4
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 09:21:07 -0000

Author: glebius
Date: Sat Apr 14 09:21:06 2012
New Revision: 234273
URL: http://svn.freebsd.org/changeset/base/234273

Log:
  Merge 232538:
    Fix ng_ipfw(4) cookie number in example.
  
    Pointed out by:	"Jacco van Buuren" <jaccovanbuuren gmail.com>

Modified:
  stable/9/share/man/man4/ng_patch.4
Directory Properties:
  stable/9/share/man/man4/   (props changed)

Modified: stable/9/share/man/man4/ng_patch.4
==============================================================================
--- stable/9/share/man/man4/ng_patch.4	Sat Apr 14 06:53:15 2012	(r234272)
+++ stable/9/share/man/man4/ng_patch.4	Sat Apr 14 09:21:06 2012	(r234273)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 9, 2010
+.Dd March 5, 2012
 .Dt NG_PATCH 4
 .Os
 .Sh NAME
@@ -185,7 +185,7 @@ So you do:
 		{ mode=7 value=0xf7 length=1 offset=1 }		\e
 		{ mode=8 value=0x02 length=1 offset=1 } ] }
 SEQ
-/sbin/ipfw add 160 netgraph 600 ip from any to any not dst-port 80
+/sbin/ipfw add 160 netgraph 300 ip from any to any not dst-port 80
 .Ed
 .Pp
 This first does

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 09:43:59 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AB4F106564A;
	Sat, 14 Apr 2012 09:43:59 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C6688FC18;
	Sat, 14 Apr 2012 09:43:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3E9hxwZ022775;
	Sat, 14 Apr 2012 09:43:59 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3E9hxsJ022772;
	Sat, 14 Apr 2012 09:43:59 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204140943.q3E9hxsJ022772@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 09:43:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234274 - stable/9/usr.bin/write
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 09:43:59 -0000

Author: glebius
Date: Sat Apr 14 09:43:58 2012
New Revision: 234274
URL: http://svn.freebsd.org/changeset/base/234274

Log:
  Merge 231586:
    Fix write(1) to support wide characters.
  
    Submitted by: amdmi3
    PR:           bin/164317

Modified:
  stable/9/usr.bin/write/write.1
  stable/9/usr.bin/write/write.c
Directory Properties:
  stable/9/usr.bin/write/   (props changed)

Modified: stable/9/usr.bin/write/write.1
==============================================================================
--- stable/9/usr.bin/write/write.1	Sat Apr 14 09:21:06 2012	(r234273)
+++ stable/9/usr.bin/write/write.1	Sat Apr 14 09:43:58 2012	(r234274)
@@ -31,7 +31,7 @@
 .\"     @(#)write.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd July 17, 2004
+.Dd February 13, 2012
 .Dt WRITE 1
 .Os
 .Sh NAME
@@ -107,7 +107,3 @@ setting is used to determine which chara
 terminal, not the receiver's (which
 .Nm
 has no way of knowing).
-.Pp
-The
-.Nm
-utility does not recognize multibyte characters.

Modified: stable/9/usr.bin/write/write.c
==============================================================================
--- stable/9/usr.bin/write/write.c	Sat Apr 14 09:21:06 2012	(r234273)
+++ stable/9/usr.bin/write/write.c	Sat Apr 14 09:43:58 2012	(r234274)
@@ -60,12 +60,14 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 #include <utmpx.h>
+#include <wchar.h>
+#include <wctype.h>
 
 void done(int);
 void do_write(char *, char *, uid_t);
 static void usage(void);
 int term_chk(char *, int *, time_t *, int);
-void wr_fputs(unsigned char *s);
+void wr_fputs(wchar_t *s);
 void search_utmp(char *, char *, char *, uid_t);
 int utmp_chk(char *, char *);
 
@@ -243,7 +245,8 @@ do_write(char *tty, char *mytty, uid_t m
 	char *nows;
 	struct passwd *pwd;
 	time_t now;
-	char path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512];
+	char path[MAXPATHLEN], host[MAXHOSTNAMELEN];
+	wchar_t line[512];
 
 	/* Determine our login name before we reopen() stdout */
 	if ((login = getlogin()) == NULL) {
@@ -269,7 +272,7 @@ do_write(char *tty, char *mytty, uid_t m
 	(void)printf("\r\n\007\007\007Message from %s@%s on %s at %s ...\r\n",
 	    login, host, mytty, nows + 11);
 
-	while (fgets(line, sizeof(line), stdin) != NULL)
+	while (fgetws(line, sizeof(line)/sizeof(wchar_t), stdin) != NULL)
 		wr_fputs(line);
 }
 
@@ -288,30 +291,20 @@ done(int n __unused)
  *     turns \n into \r\n
  */
 void
-wr_fputs(unsigned char *s)
+wr_fputs(wchar_t *s)
 {
 
-#define	PUTC(c)	if (putchar(c) == EOF) err(1, NULL);
+#define	PUTC(c)	if (putwchar(c) == WEOF) err(1, NULL);
 
-	for (; *s != '\0'; ++s) {
-		if (*s == '\n') {
-			PUTC('\r');
-		} else if (((*s & 0x80) && *s < 0xA0) ||
-			   /* disable upper controls */
-			   (!isprint(*s) && !isspace(*s) &&
-			    *s != '\a' && *s != '\b')
-			  ) {
-			if (*s & 0x80) {
-				*s &= ~0x80;
-				PUTC('M');
-				PUTC('-');
-			}
-			if (iscntrl(*s)) {
-				*s ^= 0x40;
-				PUTC('^');
-			}
+	for (; *s != L'\0'; ++s) {
+		if (*s == L'\n') {
+			PUTC(L'\r');
+			PUTC(L'\n');
+		} else if (iswprint(*s) || iswspace(*s)) {
+			PUTC(*s);
+		} else {
+			wprintf(L"<0x%X>", *s);
 		}
-		PUTC(*s);
 	}
 	return;
 #undef PUTC

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 09:48:53 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17853106566C;
	Sat, 14 Apr 2012 09:48:53 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ECD298FC18;
	Sat, 14 Apr 2012 09:48:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3E9mqsb022988;
	Sat, 14 Apr 2012 09:48:52 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3E9mqRQ022985;
	Sat, 14 Apr 2012 09:48:52 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204140948.q3E9mqRQ022985@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 09:48:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234275 - stable/9/usr.bin/wall
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 09:48:53 -0000

Author: glebius
Date: Sat Apr 14 09:48:52 2012
New Revision: 234275
URL: http://svn.freebsd.org/changeset/base/234275

Log:
  Merge 233269:
    Add multibyte char support.
  
    PR:           165429
    Submitted by: amdmi3

Modified:
  stable/9/usr.bin/wall/wall.1
  stable/9/usr.bin/wall/wall.c
Directory Properties:
  stable/9/usr.bin/wall/   (props changed)

Modified: stable/9/usr.bin/wall/wall.1
==============================================================================
--- stable/9/usr.bin/wall/wall.1	Sat Apr 14 09:43:58 2012	(r234274)
+++ stable/9/usr.bin/wall/wall.1	Sat Apr 14 09:48:52 2012	(r234275)
@@ -28,7 +28,7 @@
 .\"     @(#)wall.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd July 17, 2004
+.Dd February 24, 2012
 .Dt WALL 1
 .Os
 .Sh NAME
@@ -73,7 +73,3 @@ setting is used to determine which chara
 terminal, not the receiver's (which
 .Nm
 has no way of knowing).
-.Pp
-The
-.Nm
-utility does not recognize multibyte characters.

Modified: stable/9/usr.bin/wall/wall.c
==============================================================================
--- stable/9/usr.bin/wall/wall.c	Sat Apr 14 09:43:58 2012	(r234274)
+++ stable/9/usr.bin/wall/wall.c	Sat Apr 14 09:48:52 2012	(r234275)
@@ -62,6 +62,8 @@ static const char sccsid[] = "@(#)wall.c
 #include <time.h>
 #include <unistd.h>
 #include <utmpx.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include "ttymsg.h"
 
@@ -185,14 +187,15 @@ void
 makemsg(char *fname)
 {
 	int cnt;
-	unsigned char ch;
+	wchar_t ch;
 	struct tm *lt;
 	struct passwd *pw;
 	struct stat sbuf;
 	time_t now;
 	FILE *fp;
 	int fd;
-	char *p, hostname[MAXHOSTNAMELEN], lbuf[256], tmpname[64];
+	char hostname[MAXHOSTNAMELEN], tmpname[64];
+	wchar_t *p, *tmp, lbuf[256], codebuf[13];
 	const char *tty;
 	const char *whom;
 	gid_t egid;
@@ -220,78 +223,61 @@ makemsg(char *fname)
 		 * Which means that we may leave a non-blank character
 		 * in column 80, but that can't be helped.
 		 */
-		(void)fprintf(fp, "\r%79s\r\n", " ");
-		(void)snprintf(lbuf, sizeof(lbuf), 
-		    "Broadcast Message from %s@%s",
+		(void)fwprintf(fp, L"\r%79s\r\n", " ");
+		(void)swprintf(lbuf, sizeof(lbuf)/sizeof(wchar_t),
+		    L"Broadcast Message from %s@%s",
 		    whom, hostname);
-		(void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
-		(void)snprintf(lbuf, sizeof(lbuf),
-		    "        (%s) at %d:%02d %s...", tty,
+		(void)fwprintf(fp, L"%-79.79S\007\007\r\n", lbuf);
+		(void)swprintf(lbuf, sizeof(lbuf)/sizeof(wchar_t),
+		    L"        (%s) at %d:%02d %s...", tty,
 		    lt->tm_hour, lt->tm_min, lt->tm_zone);
-		(void)fprintf(fp, "%-79.79s\r\n", lbuf);
+		(void)fwprintf(fp, L"%-79.79S\r\n", lbuf);
 	}
-	(void)fprintf(fp, "%79s\r\n", " ");
+	(void)fwprintf(fp, L"%79s\r\n", " ");
 
 	if (fname) {
 		egid = getegid();
 		setegid(getgid());
-	       	if (freopen(fname, "r", stdin) == NULL)
+		if (freopen(fname, "r", stdin) == NULL)
 			err(1, "can't read %s", fname);
 		setegid(egid);
 	}
 	cnt = 0;
-	while (fgets(lbuf, sizeof(lbuf), stdin)) {
-		for (p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) {
-			if (ch == '\r') {
-				putc('\r', fp);
+	while (fgetws(lbuf, sizeof(lbuf)/sizeof(wchar_t), stdin)) {
+		for (p = lbuf; (ch = *p) != L'\0'; ++p, ++cnt) {
+			if (ch == L'\r') {
+				putwc(L'\r', fp);
 				cnt = 0;
 				continue;
-			} else if (ch == '\n') {
+			} else if (ch == L'\n') {
 				for (; cnt < 79; ++cnt)
-					putc(' ', fp);
-				putc('\r', fp);
-				putc('\n', fp);
+					putwc(L' ', fp);
+				putwc(L'\r', fp);
+				putwc(L'\n', fp);
 				break;
 			}
 			if (cnt == 79) {
-				putc('\r', fp);
-				putc('\n', fp);
+				putwc(L'\r', fp);
+				putwc(L'\n', fp);
 				cnt = 0;
 			}
-			if (((ch & 0x80) && ch < 0xA0) ||
-				   /* disable upper controls */
-				   (!isprint(ch) && !isspace(ch) &&
-				    ch != '\a' && ch != '\b')
-				  ) {
-				if (ch & 0x80) {
-					ch &= 0x7F;
-					putc('M', fp);
+			if (iswprint(ch) || iswspace(ch) || ch == L'\a' || ch == L'\b') {
+				putwc(ch, fp);
+			} else {
+				(void)swprintf(codebuf, sizeof(codebuf)/sizeof(wchar_t), L"<0x%X>", ch);
+				for (tmp = codebuf; *tmp != L'\0'; ++tmp) {
+					putwc(*tmp, fp);
 					if (++cnt == 79) {
-						putc('\r', fp);
-						putc('\n', fp);
-						cnt = 0;
-					}
-					putc('-', fp);
-					if (++cnt == 79) {
-						putc('\r', fp);
-						putc('\n', fp);
-						cnt = 0;
-					}
-				}
-				if (iscntrl(ch)) {
-					ch ^= 040;
-					putc('^', fp);
-					if (++cnt == 79) {
-						putc('\r', fp);
-						putc('\n', fp);
+						putwc(L'\r', fp);
+						putwc(L'\n', fp);
 						cnt = 0;
 					}
 				}
+				--cnt;
 			}
-			putc(ch, fp);
 		}
 	}
-	(void)fprintf(fp, "%79s\r\n", " ");
+	(void)fwprintf(fp, L"%79s\r\n", " ");
 	rewind(fp);
 
 	if (fstat(fd, &sbuf))

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 10:08:08 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8980A106564A;
	Sat, 14 Apr 2012 10:08:08 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 738E08FC14;
	Sat, 14 Apr 2012 10:08:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3EA88DP023710;
	Sat, 14 Apr 2012 10:08:08 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3EA88sw023707;
	Sat, 14 Apr 2012 10:08:08 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204141008.q3EA88sw023707@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 10:08:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234276 - stable/9/sys/netgraph
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 10:08:08 -0000

Author: glebius
Date: Sat Apr 14 10:08:07 2012
New Revision: 234276
URL: http://svn.freebsd.org/changeset/base/234276

Log:
  Merge 231760,231761,231764,231765,231766,231823,231830 from head:
  
    231760,231766:
  	style(9): sort includes
    231761:
  	In ng_bypass() add more protection against potential race
  	with ng_rmnode() and its followers.
    231764:
  	Remove testing stuff, reducing kernel memory footprint by 1 Kb.
    231765:
  	Trim double empty lines.
    231823:
  	In ng_getsockaddr() allocate memory prior to obtaining lock.
    231830:
  	Specify correct loading order for core of netgraph(4).

Modified:
  stable/9/sys/netgraph/ng_base.c
  stable/9/sys/netgraph/ng_socket.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netgraph/ng_base.c
==============================================================================
--- stable/9/sys/netgraph/ng_base.c	Sat Apr 14 09:48:52 2012	(r234275)
+++ stable/9/sys/netgraph/ng_base.c	Sat Apr 14 10:08:07 2012	(r234276)
@@ -45,23 +45,22 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ctype.h>
-#include <sys/errno.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
+#include <sys/kthread.h>
 #include <sys/ktr.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/proc.h>
 #include <sys/queue.h>
-#include <sys/sysctl.h>
-#include <sys/syslog.h>
 #include <sys/refcount.h>
-#include <sys/proc.h>
 #include <sys/rwlock.h>
-#include <sys/unistd.h>
-#include <sys/kthread.h>
 #include <sys/smp.h>
+#include <sys/sysctl.h>
+#include <sys/syslog.h>
+#include <sys/unistd.h>
 #include <machine/cpu.h>
 
 #include <net/netisr.h>
@@ -240,7 +239,6 @@ int	ng_path_parse(char *addr, char **nod
 void	ng_rmnode(node_p node, hook_p dummy1, void *dummy2, int dummy3);
 void	ng_unname(node_p node);
 
-
 /* Our own netgraph malloc type */
 MALLOC_DEFINE(M_NETGRAPH, "netgraph", "netgraph structures and ctrl messages");
 MALLOC_DEFINE(M_NETGRAPH_HOOK, "netgraph_hook", "netgraph hook structures");
@@ -338,7 +336,6 @@ ng_alloc_node(void)
 #define NG_ALLOC_HOOK(hook) do { (hook) = ng_alloc_hook(); } while (0)
 #define NG_ALLOC_NODE(node) do { (node) = ng_alloc_node(); } while (0)
 
-
 #define NG_FREE_HOOK(hook)						\
 	do {								\
 		mtx_lock(&ng_nodelist_mtx);				\
@@ -1158,6 +1155,10 @@ ng_bypass(hook_p hook1, hook_p hook2)
 		return (EINVAL);
 	}
 	mtx_lock(&ng_topo_mtx);
+	if (NG_HOOK_NOT_VALID(hook1) || NG_HOOK_NOT_VALID(hook2)) {
+		mtx_unlock(&ng_topo_mtx);
+		return (EINVAL);
+	}
 	hook1->hk_peer->hk_peer = hook2->hk_peer;
 	hook2->hk_peer->hk_peer = hook1->hk_peer;
 
@@ -1199,7 +1200,6 @@ ng_newtype(struct ng_type *tp)
 		return (EEXIST);
 	}
 
-
 	/* Link in new type */
 	TYPELIST_WLOCK();
 	LIST_INSERT_HEAD(&ng_typelist, tp, types);
@@ -3063,7 +3063,7 @@ vnet_netgraph_uninit(const void *unused 
 		}
 	} while (node != NULL);
 }
-VNET_SYSUNINIT(vnet_netgraph_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
+VNET_SYSUNINIT(vnet_netgraph_uninit, SI_SUB_NETGRAPH, SI_ORDER_FIRST,
     vnet_netgraph_uninit, NULL);
 #endif /* VIMAGE */
 
@@ -3129,7 +3129,7 @@ static moduledata_t netgraph_mod = {
 	ngb_mod_event,
 	(NULL)
 };
-DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_NETGRAPH, SI_ORDER_MIDDLE);
+DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_NETGRAPH, SI_ORDER_FIRST);
 SYSCTL_NODE(_net, OID_AUTO, graph, CTLFLAG_RW, 0, "netgraph Family");
 SYSCTL_INT(_net_graph, OID_AUTO, abi_version, CTLFLAG_RD, 0, NG_ABI_VERSION,"");
 SYSCTL_INT(_net_graph, OID_AUTO, msg_version, CTLFLAG_RD, 0, NG_VERSION, "");
@@ -3268,7 +3268,6 @@ SYSCTL_PROC(_debug, OID_AUTO, ng_dump_it
     0, sizeof(int), sysctl_debug_ng_dump_items, "I", "Number of allocated items");
 #endif	/* NETGRAPH_DEBUG */
 
-
 /***********************************************************************
 * Worklist routines
 **********************************************************************/
@@ -3352,7 +3351,6 @@ ng_worklist_add(node_p node)
 	}
 }
 
-
 /***********************************************************************
 * Externally useable functions to set up a queue item ready for sending
 ***********************************************************************/
@@ -3433,8 +3431,6 @@ ng_package_msg(struct ng_mesg *msg, int 
 	return (item);
 }
 
-
-
 #define SET_RETADDR(item, here, retaddr)				\
 	do {	/* Data or fn items don't have retaddrs */		\
 		if ((item->el_flags & NGQF_TYPE) == NGQF_MESG) {	\
@@ -3660,7 +3656,6 @@ ng_callout_trampoline(void *arg)
 	CURVNET_RESTORE();
 }
 
-
 int
 ng_callout(struct callout *c, node_p node, hook_p hook, int ticks,
     ng_item_fn *fn, void * arg1, int arg2)
@@ -3730,32 +3725,3 @@ ng_replace_retaddr(node_p here, item_p i
 		NGI_RETADDR(item) = ng_node2ID(here);
 	}
 }
-
-#define TESTING
-#ifdef TESTING
-/* just test all the macros */
-void
-ng_macro_test(item_p item);
-void
-ng_macro_test(item_p item)
-{
-	node_p node = NULL;
-	hook_p hook = NULL;
-	struct mbuf *m;
-	struct ng_mesg *msg;
-	ng_ID_t retaddr;
-	int	error;
-
-	NGI_GET_M(item, m);
-	NGI_GET_MSG(item, msg);
-	retaddr = NGI_RETADDR(item);
-	NG_SEND_DATA(error, hook, m, NULL);
-	NG_SEND_DATA_ONLY(error, hook, m);
-	NG_FWD_NEW_DATA(error, item, hook, m);
-	NG_FWD_ITEM_HOOK(error, item, hook);
-	NG_SEND_MSG_HOOK(error, node, msg, hook, retaddr);
-	NG_SEND_MSG_ID(error, node, msg, retaddr, retaddr);
-	NG_SEND_MSG_PATH(error, node, msg, ".:", retaddr);
-	NG_FWD_MSG_HOOK(error, node, item, hook, retaddr);
-}
-#endif /* TESTING */

Modified: stable/9/sys/netgraph/ng_socket.c
==============================================================================
--- stable/9/sys/netgraph/ng_socket.c	Sat Apr 14 09:48:52 2012	(r234275)
+++ stable/9/sys/netgraph/ng_socket.c	Sat Apr 14 10:08:07 2012	(r234276)
@@ -469,33 +469,30 @@ ng_getsockaddr(struct socket *so, struct
 	int sg_len;
 	int error = 0;
 
-	/* Why isn't sg_data a `char[1]' ? :-( */
-	sg_len = sizeof(struct sockaddr_ng) - sizeof(sg->sg_data) + 1;
-
 	pcbp = sotongpcb(so);
 	if ((pcbp == NULL) || (pcbp->sockdata == NULL))
 		/* XXXGL: can this still happen? */
 		return (EINVAL);
 
+	sg_len = sizeof(struct sockaddr_ng) + NG_NODESIZ -
+	    sizeof(sg->sg_data);
+	sg = malloc(sg_len, M_SONAME, M_WAITOK | M_ZERO);
+
 	mtx_lock(&pcbp->sockdata->mtx);
 	if (pcbp->sockdata->node != NULL) {
 		node_p node = pcbp->sockdata->node;
-		int namelen = 0;	/* silence compiler! */
 
 		if (NG_NODE_HAS_NAME(node))
-			sg_len += namelen = strlen(NG_NODE_NAME(node));
-
-		sg = malloc(sg_len, M_SONAME, M_WAITOK | M_ZERO);
-
-		if (NG_NODE_HAS_NAME(node))
-			bcopy(NG_NODE_NAME(node), sg->sg_data, namelen);
+			bcopy(NG_NODE_NAME(node), sg->sg_data,
+			    strlen(NG_NODE_NAME(node)));
+		mtx_unlock(&pcbp->sockdata->mtx);
 
 		sg->sg_len = sg_len;
 		sg->sg_family = AF_NETGRAPH;
 		*addr = (struct sockaddr *)sg;
-		mtx_unlock(&pcbp->sockdata->mtx);
 	} else {
 		mtx_unlock(&pcbp->sockdata->mtx);
+		free(sg, M_SONAME);
 		error = EINVAL;
 	}
 

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 10:13:36 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D23561065672;
	Sat, 14 Apr 2012 10:13:36 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB6968FC12;
	Sat, 14 Apr 2012 10:13:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3EADaSM023925;
	Sat, 14 Apr 2012 10:13:36 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3EADaHd023922;
	Sat, 14 Apr 2012 10:13:36 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204141013.q3EADaHd023922@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 10:13:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234277 - stable/9/sys/netgraph
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 10:13:36 -0000

Author: glebius
Date: Sat Apr 14 10:13:36 2012
New Revision: 234277
URL: http://svn.freebsd.org/changeset/base/234277

Log:
  Merge 231831:
    Refactor the name hash and the ID hash, that are used to address nodes:
  
    - Make hash sizes growable, to satisfy users running large mpd
      installations, having thousands of nodes.
    - NG_NAMEHASH() proved to give a very bad distribution in real life
      name sets, while generic hash32_str(name, HASHINIT) proved to give
      an even one, so use the latter for name hash.
    - Do not store unnamed nodes in slot 0 of name hash, no reason for that.
    - Use the ID hash in cases when we need to run through all nodes: the
      NGM_LISTNODES command and in the vnet_netgraph_uninit().
    - Implement NGM_LISTNODES and NGM_LISTNAMES as separate code, the former
      iterates through the ID hash, and the latter through the name hash.
    - Keep count of all nodes and of named nodes, so that we don't need
      to count nodes in NGM_LISTNODES and NGM_LISTNAMES. The counters are
      also used to estimate whether we need to grow hashes.
    - Close a race between two threads running ng_name_node() assigning same
      name to different nodes.

Modified:
  stable/9/sys/netgraph/netgraph.h
  stable/9/sys/netgraph/ng_base.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netgraph/netgraph.h
==============================================================================
--- stable/9/sys/netgraph/netgraph.h	Sat Apr 14 10:08:07 2012	(r234276)
+++ stable/9/sys/netgraph/netgraph.h	Sat Apr 14 10:13:36 2012	(r234277)
@@ -365,7 +365,7 @@ struct ng_node {
 	void   *nd_private;		/* node type dependant node ID */
 	ng_ID_t	nd_ID;			/* Unique per node */
 	LIST_HEAD(hooks, ng_hook) nd_hooks;	/* linked list of node hooks */
-	LIST_ENTRY(ng_node)	  nd_nodes;	/* linked list of all nodes */
+	LIST_ENTRY(ng_node)	  nd_nodes;	/* name hash collision list */
 	LIST_ENTRY(ng_node)	  nd_idnodes;	/* ID hash collision list */
 	struct	ng_queue	  nd_input_queue; /* input queue for locking */
 	int	nd_refs;		/* # of references to this node */
@@ -1202,10 +1202,6 @@ typedef void *meta_p;
 #define NGI_GET_META(i,m)
 #define	ng_copy_meta(meta) NULL
 
-/* Hash related definitions */
-#define	NG_ID_HASH_SIZE 128 /* most systems wont need even this many */
-#define	NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */
-
 /*
  * Mark the current thread when called from the outbound path of the
  * network stack, in order to enforce queuing on ng nodes calling into

Modified: stable/9/sys/netgraph/ng_base.c
==============================================================================
--- stable/9/sys/netgraph/ng_base.c	Sat Apr 14 10:08:07 2012	(r234276)
+++ stable/9/sys/netgraph/ng_base.c	Sat Apr 14 10:13:36 2012	(r234277)
@@ -45,6 +45,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ctype.h>
+#include <sys/hash.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
@@ -170,10 +171,20 @@ static struct rwlock	ng_typelist_lock;
 #define	TYPELIST_WLOCK()	rw_wlock(&ng_typelist_lock)
 #define	TYPELIST_WUNLOCK()	rw_wunlock(&ng_typelist_lock)
 
-/* Hash related definitions */
-/* XXX Don't need to initialise them because it's a LIST */
-static VNET_DEFINE(LIST_HEAD(, ng_node), ng_ID_hash[NG_ID_HASH_SIZE]);
-#define	V_ng_ID_hash			VNET(ng_ID_hash)
+/* Hash related definitions. */
+LIST_HEAD(nodehash, ng_node);
+static VNET_DEFINE(struct nodehash *, ng_ID_hash);
+static VNET_DEFINE(u_long, ng_ID_hmask);
+static VNET_DEFINE(u_long, ng_nodes);
+static VNET_DEFINE(struct nodehash *, ng_name_hash);
+static VNET_DEFINE(u_long, ng_name_hmask);
+static VNET_DEFINE(u_long, ng_named_nodes);
+#define	V_ng_ID_hash		VNET(ng_ID_hash)
+#define	V_ng_ID_hmask		VNET(ng_ID_hmask)
+#define	V_ng_nodes		VNET(ng_nodes)
+#define	V_ng_name_hash		VNET(ng_name_hash)
+#define	V_ng_name_hmask		VNET(ng_name_hmask)
+#define	V_ng_named_nodes	VNET(ng_named_nodes)
 
 static struct rwlock	ng_idhash_lock;
 #define	IDHASH_RLOCK()		rw_rlock(&ng_idhash_lock)
@@ -182,7 +193,7 @@ static struct rwlock	ng_idhash_lock;
 #define	IDHASH_WUNLOCK()	rw_wunlock(&ng_idhash_lock)
 
 /* Method to find a node.. used twice so do it here */
-#define NG_IDHASH_FN(ID) ((ID) % (NG_ID_HASH_SIZE))
+#define NG_IDHASH_FN(ID) ((ID) % (V_ng_ID_hmask + 1))
 #define NG_IDHASH_FIND(ID, node)					\
 	do { 								\
 		rw_assert(&ng_idhash_lock, RA_LOCKED);			\
@@ -195,18 +206,6 @@ static struct rwlock	ng_idhash_lock;
 		}							\
 	} while (0)
 
-static VNET_DEFINE(LIST_HEAD(, ng_node), ng_name_hash[NG_NAME_HASH_SIZE]);
-#define	V_ng_name_hash			VNET(ng_name_hash)
-
-#define NG_NAMEHASH(NAME, HASH)				\
-	do {						\
-		u_char	h = 0;				\
-		const u_char	*c;			\
-		for (c = (const u_char*)(NAME); *c; c++)\
-			h += *c;			\
-		(HASH) = h % (NG_NAME_HASH_SIZE);	\
-	} while (0)
-
 static struct rwlock	ng_namehash_lock;
 #define	NAMEHASH_RLOCK()	rw_rlock(&ng_namehash_lock)
 #define	NAMEHASH_RUNLOCK()	rw_runlock(&ng_namehash_lock)
@@ -227,8 +226,10 @@ static int	ng_con_nodes(item_p item, nod
 		    node_p node2, const char *name2);
 static int	ng_con_part2(node_p node, item_p item, hook_p hook);
 static int	ng_con_part3(node_p node, item_p item, hook_p hook);
-static int	ng_mkpeer(node_p node, const char *name,
-						const char *name2, char *type);
+static int	ng_mkpeer(node_p node, const char *name, const char *name2,
+		    char *type);
+static void	ng_name_rehash(void);
+static void	ng_ID_rehash(void);
 
 /* Imported, these used to be externally visible, some may go back. */
 void	ng_destroy_hook(hook_p hook);
@@ -658,12 +659,7 @@ ng_make_node_common(struct ng_type *type
 	/* Initialize hook list for new node */
 	LIST_INIT(&node->nd_hooks);
 
-	/* Link us into the name hash. */
-	NAMEHASH_WLOCK();
-	LIST_INSERT_HEAD(&V_ng_name_hash[0], node, nd_nodes);
-	NAMEHASH_WUNLOCK();
-
-	/* get an ID and put us in the hash chain */
+	/* Get an ID and put us in the hash chain. */
 	IDHASH_WLOCK();
 	for (;;) { /* wrap protection, even if silly */
 		node_p node2 = NULL;
@@ -675,6 +671,9 @@ ng_make_node_common(struct ng_type *type
 			break;
 		}
 	}
+	V_ng_nodes++;
+	if (V_ng_nodes * 2 > V_ng_ID_hmask)
+		ng_ID_rehash();
 	LIST_INSERT_HEAD(&V_ng_ID_hash[NG_IDHASH_FN(node->nd_ID)], node,
 	    nd_idnodes);
 	IDHASH_WUNLOCK();
@@ -791,10 +790,14 @@ ng_unref_node(node_p node)
 
 		node->nd_type->refs--; /* XXX maybe should get types lock? */
 		NAMEHASH_WLOCK();
-		LIST_REMOVE(node, nd_nodes);
+		if (NG_NODE_HAS_NAME(node)) {
+			V_ng_named_nodes--;
+			LIST_REMOVE(node, nd_nodes);
+		}
 		NAMEHASH_WUNLOCK();
 
 		IDHASH_WLOCK();
+		V_ng_nodes--;
 		LIST_REMOVE(node, nd_idnodes);
 		IDHASH_WUNLOCK();
 
@@ -810,9 +813,10 @@ static node_p
 ng_ID2noderef(ng_ID_t ID)
 {
 	node_p node;
+
 	IDHASH_RLOCK();
 	NG_IDHASH_FIND(ID, node);
-	if(node)
+	if (node)
 		NG_NODE_REF(node);
 	IDHASH_RUNLOCK();
 	return(node);
@@ -834,8 +838,9 @@ ng_node2ID(node_p node)
 int
 ng_name_node(node_p node, const char *name)
 {
-	int i, hash;
+	uint32_t hash;
 	node_p node2;
+	int i;
 
 	/* Check the name is valid */
 	for (i = 0; i < NG_NODESIZ; i++) {
@@ -851,20 +856,26 @@ ng_name_node(node_p node, const char *na
 		return (EINVAL);
 	}
 
-	/* Check the name isn't already being used */
-	if ((node2 = ng_name2noderef(node, name)) != NULL) {
-		NG_NODE_UNREF(node2);
-		TRAP_ERROR();
-		return (EADDRINUSE);
-	}
+	NAMEHASH_WLOCK();
+	if (V_ng_named_nodes * 2 > V_ng_name_hmask)
+		ng_name_rehash();
 
-	/* copy it */
-	strlcpy(NG_NODE_NAME(node), name, NG_NODESIZ);
+	hash = hash32_str(name, HASHINIT) & V_ng_name_hmask;
+	/* Check the name isn't already being used. */
+	LIST_FOREACH(node2, &V_ng_name_hash[hash], nd_nodes)
+		if (NG_NODE_IS_VALID(node2) &&
+		    (strcmp(NG_NODE_NAME(node2), name) == 0)) {
+			NAMEHASH_WUNLOCK();
+			return (EADDRINUSE);
+		}
 
+	if (NG_NODE_HAS_NAME(node))
+		LIST_REMOVE(node, nd_nodes);
+	else
+		V_ng_named_nodes++;
+	/* Copy it. */
+	strlcpy(NG_NODE_NAME(node), name, NG_NODESIZ);
 	/* Update name hash. */
-	NG_NAMEHASH(name, hash);
-	NAMEHASH_WLOCK();
-	LIST_REMOVE(node, nd_nodes);
 	LIST_INSERT_HEAD(&V_ng_name_hash[hash], node, nd_nodes);
 	NAMEHASH_WUNLOCK();
 
@@ -899,8 +910,8 @@ ng_name2noderef(node_p here, const char 
 		return (ng_ID2noderef(temp));
 	}
 
-	/* Find node by name */
-	NG_NAMEHASH(name, hash);
+	/* Find node by name. */
+	hash = hash32_str(name, HASHINIT) & V_ng_name_hmask;
 	NAMEHASH_RLOCK();
 	LIST_FOREACH(node, &V_ng_name_hash[hash], nd_nodes)
 		if (NG_NODE_IS_VALID(node) &&
@@ -946,6 +957,68 @@ ng_unname(node_p node)
 {
 }
 
+/*
+ * Allocate a bigger name hash.
+ */
+static void
+ng_name_rehash()
+{
+	struct nodehash *new;
+	uint32_t hash;
+	u_long hmask;
+	node_p node, node2;
+	int i;
+
+	new = hashinit_flags((V_ng_name_hmask + 1) * 2, M_NETGRAPH_NODE, &hmask,
+	    HASH_NOWAIT);
+	if (new == NULL)
+		return;
+
+	for (i = 0; i <= V_ng_name_hmask; i++)
+		LIST_FOREACH_SAFE(node, &V_ng_name_hash[i], nd_nodes, node2) {
+#ifdef INVARIANTS
+			LIST_REMOVE(node, nd_nodes);
+#endif
+			hash = hash32_str(NG_NODE_NAME(node), HASHINIT) & hmask;
+			LIST_INSERT_HEAD(&new[hash], node, nd_nodes);
+		}
+
+	hashdestroy(V_ng_name_hash, M_NETGRAPH_NODE, V_ng_name_hmask);
+	V_ng_name_hash = new;
+	V_ng_name_hmask = hmask;
+}
+
+/*
+ * Allocate a bigger ID hash.
+ */
+static void
+ng_ID_rehash()
+{
+	struct nodehash *new;
+	uint32_t hash;
+	u_long hmask;
+	node_p node, node2;
+	int i;
+
+	new = hashinit_flags((V_ng_ID_hmask + 1) * 2, M_NETGRAPH_NODE, &hmask,
+	    HASH_NOWAIT);
+	if (new == NULL)
+		return;
+
+	for (i = 0; i <= V_ng_ID_hmask; i++)
+		LIST_FOREACH_SAFE(node, &V_ng_ID_hash[i], nd_idnodes, node2) {
+#ifdef INVARIANTS
+			LIST_REMOVE(node, nd_idnodes);
+#endif
+			hash = (node->nd_ID % (hmask + 1));
+			LIST_INSERT_HEAD(&new[hash], node, nd_idnodes);
+		}
+
+	hashdestroy(V_ng_ID_hash, M_NETGRAPH_NODE, V_ng_name_hmask);
+	V_ng_ID_hash = new;
+	V_ng_ID_hmask = hmask;
+}
+
 /************************************************************************
 			Hook routines
  Names are not optional. Hooks are always connected, except for a
@@ -2571,28 +2644,55 @@ ng_generic_msg(node_p here, item_p item,
 		break;
 	    }
 
-	case NGM_LISTNAMES:
 	case NGM_LISTNODES:
 	    {
-		const int unnamed = (msg->header.cmd == NGM_LISTNODES);
 		struct namelist *nl;
 		node_p node;
-		int num = 0, i;
+		int i;
 
-		NAMEHASH_RLOCK();
-		/* Count number of nodes */
-		for (i = 0; i < NG_NAME_HASH_SIZE; i++) {
-			LIST_FOREACH(node, &V_ng_name_hash[i], nd_nodes) {
-				if (NG_NODE_IS_VALID(node) &&
-				    (unnamed || NG_NODE_HAS_NAME(node))) {
-					num++;
-				}
+		IDHASH_RLOCK();
+		/* Get response struct. */
+		NG_MKRESPONSE(resp, msg, sizeof(*nl) +
+		    (V_ng_nodes * sizeof(struct nodeinfo)), M_NOWAIT | M_ZERO);
+		if (resp == NULL) {
+			IDHASH_RUNLOCK();
+			error = ENOMEM;
+			break;
+		}
+		nl = (struct namelist *) resp->data;
+
+		/* Cycle through the lists of nodes. */
+		nl->numnames = 0;
+		for (i = 0; i <= V_ng_ID_hmask; i++) {
+			LIST_FOREACH(node, &V_ng_ID_hash[i], nd_idnodes) {
+				struct nodeinfo *const np =
+				    &nl->nodeinfo[nl->numnames];
+
+				if (NG_NODE_NOT_VALID(node))
+					continue;
+				if (NG_NODE_HAS_NAME(node))
+					strcpy(np->name, NG_NODE_NAME(node));
+				strcpy(np->type, node->nd_type->name);
+				np->id = ng_node2ID(node);
+				np->hooks = node->nd_numhooks;
+				KASSERT(nl->numnames < V_ng_nodes,
+				    ("%s: no space", __func__));
+				nl->numnames++;
 			}
 		}
+		IDHASH_RUNLOCK();
+		break;
+	    }
+	case NGM_LISTNAMES:
+	    {
+		struct namelist *nl;
+		node_p node;
+		int i;
 
-		/* Get response struct */
+		NAMEHASH_RLOCK();
+		/* Get response struct. */
 		NG_MKRESPONSE(resp, msg, sizeof(*nl) +
-		    (num * sizeof(struct nodeinfo)), M_NOWAIT);
+		    (V_ng_named_nodes * sizeof(struct nodeinfo)), M_NOWAIT);
 		if (resp == NULL) {
 			NAMEHASH_RUNLOCK();
 			error = ENOMEM;
@@ -2600,24 +2700,21 @@ ng_generic_msg(node_p here, item_p item,
 		}
 		nl = (struct namelist *) resp->data;
 
-		/* Cycle through the linked list of nodes */
+		/* Cycle through the lists of nodes. */
 		nl->numnames = 0;
-		for (i = 0; i < NG_NAME_HASH_SIZE; i++) {
+		for (i = 0; i <= V_ng_name_hmask; i++) {
 			LIST_FOREACH(node, &V_ng_name_hash[i], nd_nodes) {
 				struct nodeinfo *const np =
 				    &nl->nodeinfo[nl->numnames];
 
 				if (NG_NODE_NOT_VALID(node))
 					continue;
-				if (!unnamed && (! NG_NODE_HAS_NAME(node)))
-					continue;
-				if (NG_NODE_HAS_NAME(node))
-					strcpy(np->name, NG_NODE_NAME(node));
+				strcpy(np->name, NG_NODE_NAME(node));
 				strcpy(np->type, node->nd_type->name);
 				np->id = ng_node2ID(node);
 				np->hooks = node->nd_numhooks;
-				KASSERT(nl->numnames < num, ("%s: no space",
-				    __func__));
+				KASSERT(nl->numnames < V_ng_named_nodes,
+				    ("%s: no space", __func__));
 				nl->numnames++;
 			}
 		}
@@ -3024,6 +3121,17 @@ ng_mod_event(module_t mod, int event, vo
 	return (error);
 }
 
+static void
+vnet_netgraph_init(const void *unused __unused)
+{
+
+	/* We start with small hashes, but they can grow. */
+	V_ng_ID_hash = hashinit(16, M_NETGRAPH_NODE, &V_ng_ID_hmask);
+	V_ng_name_hash = hashinit(16, M_NETGRAPH_NODE, &V_ng_name_hmask);
+}
+VNET_SYSINIT(vnet_netgraph_init, SI_SUB_NETGRAPH, SI_ORDER_FIRST,
+    vnet_netgraph_init, NULL);
+
 #ifdef VIMAGE
 static void
 vnet_netgraph_uninit(const void *unused __unused)
@@ -3033,9 +3141,9 @@ vnet_netgraph_uninit(const void *unused 
 
 	do {
 		/* Find a node to kill */
-		NAMEHASH_RLOCK();
-		for (i = 0; i < NG_NAME_HASH_SIZE; i++) {
-			LIST_FOREACH(node, &V_ng_name_hash[i], nd_nodes) {
+		IDHASH_RLOCK();
+		for (i = 0; i <= V_ng_ID_hmask; i++) {
+			LIST_FOREACH(node, &V_ng_ID_hash[i], nd_idnodes) {
 				if (node != &ng_deadnode) {
 					NG_NODE_REF(node);
 					break;
@@ -3044,7 +3152,7 @@ vnet_netgraph_uninit(const void *unused 
 			if (node != NULL)
 				break;
 		}
-		NAMEHASH_RUNLOCK();
+		IDHASH_RUNLOCK();
 
 		/* Attempt to kill it only if it is a regular node */
 		if (node != NULL) {
@@ -3062,6 +3170,9 @@ vnet_netgraph_uninit(const void *unused 
 			last_killed = node;
 		}
 	} while (node != NULL);
+
+	hashdestroy(V_ng_name_hash, M_NETGRAPH_NODE, V_ng_name_hmask);
+	hashdestroy(V_ng_ID_hash, M_NETGRAPH_NODE, V_ng_ID_hmask);
 }
 VNET_SYSUNINIT(vnet_netgraph_uninit, SI_SUB_NETGRAPH, SI_ORDER_FIRST,
     vnet_netgraph_uninit, NULL);

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 10:20:35 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2E05F106564A;
	Sat, 14 Apr 2012 10:20:35 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 190198FC15;
	Sat, 14 Apr 2012 10:20:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3EAKYGN024205;
	Sat, 14 Apr 2012 10:20:34 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3EAKY7a024200;
	Sat, 14 Apr 2012 10:20:34 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204141020.q3EAKY7a024200@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 10:20:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234278 - in stable/9: sbin/ipfw sys/netinet/ipfw
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 10:20:35 -0000

Author: glebius
Date: Sat Apr 14 10:20:34 2012
New Revision: 234278
URL: http://svn.freebsd.org/changeset/base/234278

Log:
  Merge 231076,231078:
    Make the 'tcpwin' option of ipfw(8) accept ranges and lists.
  
    Submitted by: sem

Modified:
  stable/9/sbin/ipfw/ipfw.8
  stable/9/sbin/ipfw/ipfw2.c
  stable/9/sys/netinet/ipfw/ip_fw2.c
  stable/9/sys/netinet/ipfw/ip_fw_sockopt.c
Directory Properties:
  stable/9/sbin/ipfw/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sbin/ipfw/ipfw.8
==============================================================================
--- stable/9/sbin/ipfw/ipfw.8	Sat Apr 14 10:13:36 2012	(r234277)
+++ stable/9/sbin/ipfw/ipfw.8	Sat Apr 14 10:20:34 2012	(r234278)
@@ -1,7 +1,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 10, 2011
+.Dd February 6, 2012
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -1652,10 +1652,12 @@ option for details on matching fragmente
 TCP packets only.
 Match if the TCP header sequence number field is set to
 .Ar seq .
-.It Cm tcpwin Ar win
-TCP packets only.
-Match if the TCP header window field is set to
-.Ar win .
+.It Cm tcpwin Ar tcpwin-list
+Matches TCP packets whose  header window field is set to
+.Ar tcpwin-list ,
+which is either a single value or a list of values or ranges
+specified in the same way as
+.Ar ports .
 .It Cm tcpoptions Ar spec
 TCP packets only.
 Match if the TCP header contains the comma separated list of

Modified: stable/9/sbin/ipfw/ipfw2.c
==============================================================================
--- stable/9/sbin/ipfw/ipfw2.c	Sat Apr 14 10:13:36 2012	(r234277)
+++ stable/9/sbin/ipfw/ipfw2.c	Sat Apr 14 10:20:34 2012	(r234278)
@@ -512,6 +512,7 @@ static struct _s_x _port_name[] = {
 	{"ipttl",	O_IPTTL},
 	{"mac-type",	O_MAC_TYPE},
 	{"tcpdatalen",	O_TCPDATALEN},
+	{"tcpwin",	O_TCPWIN},
 	{"tagged",	O_TAGGED},
 	{NULL,		0}
 };
@@ -1480,7 +1481,11 @@ show_ipfw(struct ip_fw *rule, int pcwidt
 				break;
 
 			case O_TCPWIN:
-				printf(" tcpwin %d", ntohs(cmd->arg1));
+				if (F_LEN(cmd) == 1)
+				    printf(" tcpwin %u", cmd->arg1);
+				else
+				    print_newports((ipfw_insn_u16 *)cmd, 0,
+					O_TCPWIN);
 				break;
 
 			case O_TCPACK:
@@ -3447,8 +3452,12 @@ read_options:
 
 		case TOK_TCPWIN:
 			NEED1("tcpwin requires length");
-			fill_cmd(cmd, O_TCPWIN, 0,
-			    htons(strtoul(*av, NULL, 0)));
+			if (strpbrk(*av, "-,")) {
+			    if (!add_ports(cmd, *av, 0, O_TCPWIN))
+				errx(EX_DATAERR, "invalid tcpwin len %s", *av);
+			} else
+			    fill_cmd(cmd, O_TCPWIN, 0,
+				    strtoul(*av, NULL, 0));
 			av++;
 			break;
 

Modified: stable/9/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw2.c	Sat Apr 14 10:13:36 2012	(r234277)
+++ stable/9/sys/netinet/ipfw/ip_fw2.c	Sat Apr 14 10:20:34 2012	(r234278)
@@ -1649,8 +1649,22 @@ do {								\
 				break;
 
 			case O_TCPWIN:
-				match = (proto == IPPROTO_TCP && offset == 0 &&
-				    cmd->arg1 == TCP(ulp)->th_win);
+				if (proto == IPPROTO_TCP && offset == 0) {
+				    uint16_t x;
+				    uint16_t *p;
+				    int i;
+
+				    x = ntohs(TCP(ulp)->th_win);
+				    if (cmdlen == 1) {
+					match = (cmd->arg1 == x);
+					break;
+				    }
+				    /* Otherwise we have ranges. */
+				    p = ((ipfw_insn_u16 *)cmd)->ports;
+				    i = cmdlen - 1;
+				    for (; !match && i > 0; i--, p += 2)
+					match = (x >= p[0] && x <= p[1]);
+				}
 				break;
 
 			case O_ESTAB:

Modified: stable/9/sys/netinet/ipfw/ip_fw_sockopt.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_sockopt.c	Sat Apr 14 10:13:36 2012	(r234277)
+++ stable/9/sys/netinet/ipfw/ip_fw_sockopt.c	Sat Apr 14 10:20:34 2012	(r234278)
@@ -569,7 +569,6 @@ check_ipfw_struct(struct ip_fw *rule, in
 		case O_IPPRECEDENCE:
 		case O_IPVER:
 		case O_SOCKARG:
-		case O_TCPWIN:
 		case O_TCPFLAGS:
 		case O_TCPOPTS:
 		case O_ESTAB:
@@ -679,6 +678,7 @@ check_ipfw_struct(struct ip_fw *rule, in
 		case O_IPTTL:
 		case O_IPLEN:
 		case O_TCPDATALEN:
+		case O_TCPWIN:
 		case O_TAGGED:
 			if (cmdlen < 1 || cmdlen > 31)
 				goto bad_size;

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 10:36:44 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DFDF106564A;
	Sat, 14 Apr 2012 10:36:44 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EC7C28FC15;
	Sat, 14 Apr 2012 10:36:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3EAahWQ024745;
	Sat, 14 Apr 2012 10:36:43 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3EAah2x024743;
	Sat, 14 Apr 2012 10:36:43 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204141036.q3EAah2x024743@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 10:36:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234279 - stable/9/sys/netinet6
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 10:36:44 -0000

Author: glebius
Date: Sat Apr 14 10:36:43 2012
New Revision: 234279
URL: http://svn.freebsd.org/changeset/base/234279

Log:
  Merge 233272:
    in6_pcblookup_local() still can return a pcb with NULL
    inp_socket. To avoid panic, do not dereference inp_socket,
    but obtain reuse port option from inp_flags2, like this
    is done after next call to in_pcblookup_local() a few lines
    down below.
  
    Submitted by: rwatson

Modified:
  stable/9/sys/netinet6/in6_pcb.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet6/in6_pcb.c
==============================================================================
--- stable/9/sys/netinet6/in6_pcb.c	Sat Apr 14 10:20:34 2012	(r234278)
+++ stable/9/sys/netinet6/in6_pcb.c	Sat Apr 14 10:36:43 2012	(r234279)
@@ -245,8 +245,8 @@ in6_pcbbind(register struct inpcb *inp, 
 				if (tw == NULL ||
 				    (reuseport & tw->tw_so_options) == 0)
 					return (EADDRINUSE);
-			} else if (t && (reuseport & t->inp_socket->so_options)
-			    == 0) {
+			} else if (t && (reuseport == 0 ||
+			    (t->inp_flags2 & INP_REUSEPORT) == 0)) {
 				return (EADDRINUSE);
 			}
 #ifdef INET

From owner-svn-src-stable-9@FreeBSD.ORG  Sat Apr 14 17:33:48 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F817106566C;
	Sat, 14 Apr 2012 17:33:48 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EE9028FC0A;
	Sat, 14 Apr 2012 17:33:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3EHXlYn040328;
	Sat, 14 Apr 2012 17:33:47 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3EHXl8D040325;
	Sat, 14 Apr 2012 17:33:47 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201204141733.q3EHXl8D040325@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Sat, 14 Apr 2012 17:33:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234294 - stable/9/sbin/hastd
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 17:33:48 -0000

Author: trociny
Date: Sat Apr 14 17:33:47 2012
New Revision: 234294
URL: http://svn.freebsd.org/changeset/base/234294

Log:
  MFC r233392, r233679:
  
  r233392:
  
  Fix typo.
  
  r233679:
  
  If hastd is invoked with "-P pidfile" option always create pidfile
  regardless of whether -F (foreground) option is set or not.
  
  Also, if -P option is specified, ignore pidfile setting from configuration
  not only on start but on reload too. This fixes the issue when for hastd
  run with -P option reload caused the pidfile change.
  
  Reviewed by:	pjd

Modified:
  stable/9/sbin/hastd/hastd.c
  stable/9/sbin/hastd/nv.c
Directory Properties:
  stable/9/sbin/hastd/   (props changed)

Modified: stable/9/sbin/hastd/hastd.c
==============================================================================
--- stable/9/sbin/hastd/hastd.c	Sat Apr 14 17:27:34 2012	(r234293)
+++ stable/9/sbin/hastd/hastd.c	Sat Apr 14 17:33:47 2012	(r234294)
@@ -66,6 +66,8 @@ const char *cfgpath = HAST_CONFIG;
 static struct hastd_config *cfg;
 /* Was SIGINT or SIGTERM signal received? */
 bool sigexit_received = false;
+/* Path to pidfile. */
+static const char *pidfile;
 /* PID file handle. */
 struct pidfh *pfh;
 /* Do we run in foreground? */
@@ -537,7 +539,8 @@ hastd_reload(void)
 	/*
 	 * Check if pidfile's path has changed.
 	 */
-	if (!foreground && strcmp(cfg->hc_pidfile, newcfg->hc_pidfile) != 0) {
+	if (!foreground && pidfile == NULL &&
+	    strcmp(cfg->hc_pidfile, newcfg->hc_pidfile) != 0) {
 		newpfh = pidfile_open(newcfg->hc_pidfile, 0600, &otherpid);
 		if (newpfh == NULL) {
 			if (errno == EEXIST) {
@@ -1163,14 +1166,12 @@ int
 main(int argc, char *argv[])
 {
 	struct hastd_listen *lst;
-	const char *pidfile;
 	pid_t otherpid;
 	int debuglevel;
 	sigset_t mask;
 
 	foreground = false;
 	debuglevel = 0;
-	pidfile = NULL;
 
 	for (;;) {
 		int ch;
@@ -1230,7 +1231,7 @@ main(int argc, char *argv[])
 		}
 	}
 
-	if (!foreground) {
+	if (pidfile != NULL || !foreground) {
 		pfh = pidfile_open(cfg->hc_pidfile, 0600, &otherpid);
 		if (pfh == NULL) {
 			if (errno == EEXIST) {
@@ -1291,7 +1292,8 @@ main(int argc, char *argv[])
 
 		/* Start logging to syslog. */
 		pjdlog_mode_set(PJDLOG_MODE_SYSLOG);
-
+	}
+	if (pidfile != NULL || !foreground) {
 		/* Write PID to a file. */
 		if (pidfile_write(pfh) == -1) {
 			pjdlog_errno(LOG_WARNING,

Modified: stable/9/sbin/hastd/nv.c
==============================================================================
--- stable/9/sbin/hastd/nv.c	Sat Apr 14 17:27:34 2012	(r234293)
+++ stable/9/sbin/hastd/nv.c	Sat Apr 14 17:33:47 2012	(r234294)
@@ -263,17 +263,17 @@ nv_validate(struct nv *nv, size_t *extra
 		case NV_TYPE_UINT8:
 			if (vsize == 0)
 				vsize = 1;
-			/* FALLTHOUGH */
+			/* FALLTHROUGH */
 		case NV_TYPE_INT16:
 		case NV_TYPE_UINT16:
 			if (vsize == 0)
 				vsize = 2;
-			/* FALLTHOUGH */
+			/* FALLTHROUGH */
 		case NV_TYPE_INT32:
 		case NV_TYPE_UINT32:
 			if (vsize == 0)
 				vsize = 4;
-			/* FALLTHOUGH */
+			/* FALLTHROUGH */
 		case NV_TYPE_INT64:
 		case NV_TYPE_UINT64:
 			if (vsize == 0)
@@ -290,12 +290,12 @@ nv_validate(struct nv *nv, size_t *extra
 		case NV_TYPE_UINT16_ARRAY:
 			if (vsize == 0)
 				vsize = 2;
-			/* FALLTHOUGH */
+			/* FALLTHROUGH */
 		case NV_TYPE_INT32_ARRAY:
 		case NV_TYPE_UINT32_ARRAY:
 			if (vsize == 0)
 				vsize = 4;
-			/* FALLTHOUGH */
+			/* FALLTHROUGH */
 		case NV_TYPE_INT64_ARRAY:
 		case NV_TYPE_UINT64_ARRAY:
 			if (vsize == 0)
@@ -906,14 +906,14 @@ nv_swap(struct nvhdr *nvh, bool tohost)
 	case NV_TYPE_UINT16_ARRAY:
 		if (vsize == 0)
 			vsize = 2;
-		/* FALLTHOUGH */
+		/* FALLTHROUGH */
 	case NV_TYPE_INT32:
 	case NV_TYPE_UINT32:
 	case NV_TYPE_INT32_ARRAY:
 	case NV_TYPE_UINT32_ARRAY:
 		if (vsize == 0)
 			vsize = 4;
-		/* FALLTHOUGH */
+		/* FALLTHROUGH */
 	case NV_TYPE_INT64:
 	case NV_TYPE_UINT64:
 	case NV_TYPE_INT64_ARRAY: