From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 23 18:20:51 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B782E106566C;
	Sun, 23 Oct 2011 18:20:51 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A76608FC15;
	Sun, 23 Oct 2011 18:20: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 p9NIKptT050090;
	Sun, 23 Oct 2011 18:20:51 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9NIKpN8050088;
	Sun, 23 Oct 2011 18:20:51 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110231820.p9NIKpN8050088@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 23 Oct 2011 18:20: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: r226667 - stable/9/sys/dev/iicbus
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Oct 2011 18:20:51 -0000

Author: brueffer
Date: Sun Oct 23 18:20:51 2011
New Revision: 226667
URL: http://svn.freebsd.org/changeset/base/226667

Log:
  MFC: r226398, r226442
  
  Move the allocation of usrbufs down a few lines to avoid leaking it
  in case of an error.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/iicbus/iic.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)

Modified: stable/9/sys/dev/iicbus/iic.c
==============================================================================
--- stable/9/sys/dev/iicbus/iic.c	Sun Oct 23 16:57:10 2011	(r226666)
+++ stable/9/sys/dev/iicbus/iic.c	Sun Oct 23 18:20:51 2011	(r226667)
@@ -346,11 +346,11 @@ iicioctl(struct cdev *dev, u_long cmd, c
 
 	case I2CRDWR:
 		buf = malloc(sizeof(*d->msgs) * d->nmsgs, M_TEMP, M_WAITOK);
-		usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK);
 		error = copyin(d->msgs, buf, sizeof(*d->msgs) * d->nmsgs);
 		if (error)
 			break;
 		/* Alloc kernel buffers for userland data, copyin write data */
+		usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK);
 		for (i = 0; i < d->nmsgs; i++) {
 			m = &((struct iic_msg *)buf)[i];
 			usrbufs[i] = m->buf;

From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 23 18:24:55 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F12C1065677;
	Sun, 23 Oct 2011 18:24:55 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F04C8FC15;
	Sun, 23 Oct 2011 18:24: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 p9NIOt5N050273;
	Sun, 23 Oct 2011 18:24:55 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9NIOtYp050271;
	Sun, 23 Oct 2011 18:24:55 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110231824.p9NIOtYp050271@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 23 Oct 2011 18:24:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226668 - stable/8/sys/dev/iicbus
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Oct 2011 18:24:55 -0000

Author: brueffer
Date: Sun Oct 23 18:24:55 2011
New Revision: 226668
URL: http://svn.freebsd.org/changeset/base/226668

Log:
  MFC: r226398, r226442
  
  Move the allocation of usrbufs down a few lines to avoid leaking it
  in case of an error.

Modified:
  stable/8/sys/dev/iicbus/iic.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/iicbus/iic.c
==============================================================================
--- stable/8/sys/dev/iicbus/iic.c	Sun Oct 23 18:20:51 2011	(r226667)
+++ stable/8/sys/dev/iicbus/iic.c	Sun Oct 23 18:24:55 2011	(r226668)
@@ -346,11 +346,11 @@ iicioctl(struct cdev *dev, u_long cmd, c
 
 	case I2CRDWR:
 		buf = malloc(sizeof(*d->msgs) * d->nmsgs, M_TEMP, M_WAITOK);
-		usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK);
 		error = copyin(d->msgs, buf, sizeof(*d->msgs) * d->nmsgs);
 		if (error)
 			break;
 		/* Alloc kernel buffers for userland data, copyin write data */
+		usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK);
 		for (i = 0; i < d->nmsgs; i++) {
 			m = &((struct iic_msg *)buf)[i];
 			usrbufs[i] = m->buf;

From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 23 18:27:54 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1BE9E106564A;
	Sun, 23 Oct 2011 18:27:54 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BD6C8FC1E;
	Sun, 23 Oct 2011 18:27: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 p9NIRr3f050424;
	Sun, 23 Oct 2011 18:27:53 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9NIRrKu050422;
	Sun, 23 Oct 2011 18:27:53 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110231827.p9NIRrKu050422@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 23 Oct 2011 18:27:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226669 - stable/7/sys/dev/iicbus
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Oct 2011 18:27:54 -0000

Author: brueffer
Date: Sun Oct 23 18:27:53 2011
New Revision: 226669
URL: http://svn.freebsd.org/changeset/base/226669

Log:
  MFC: r226398, r226442
  
  Move the allocation of usrbufs down a few lines to avoid leaking it
  in case of an error.

Modified:
  stable/7/sys/dev/iicbus/iic.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/iicbus/iic.c
==============================================================================
--- stable/7/sys/dev/iicbus/iic.c	Sun Oct 23 18:24:55 2011	(r226668)
+++ stable/7/sys/dev/iicbus/iic.c	Sun Oct 23 18:27:53 2011	(r226669)
@@ -301,11 +301,11 @@ iicioctl(struct cdev *dev, u_long cmd, c
 
 	case I2CRDWR:
 		buf = malloc(sizeof(*d->msgs) * d->nmsgs, M_TEMP, M_WAITOK);
-		usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK);
 		error = copyin(d->msgs, buf, sizeof(*d->msgs) * d->nmsgs);
 		if (error)
 			break;
 		/* Alloc kernel buffers for userland data, copyin write data */
+		usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK);
 		for (i = 0; i < d->nmsgs; i++) {
 			m = &((struct iic_msg *)buf)[i];
 			usrbufs[i] = m->buf;

From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 23 18:31:25 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39129106566B;
	Sun, 23 Oct 2011 18:31:25 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 291738FC15;
	Sun, 23 Oct 2011 18:31: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 p9NIVPSn050591;
	Sun, 23 Oct 2011 18:31:25 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9NIVPYG050589;
	Sun, 23 Oct 2011 18:31:25 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110231831.p9NIVPYG050589@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 23 Oct 2011 18:31: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: r226670 - stable/9/sys/dev/siba
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Oct 2011 18:31:25 -0000

Author: brueffer
Date: Sun Oct 23 18:31:24 2011
New Revision: 226670
URL: http://svn.freebsd.org/changeset/base/226670

Log:
  MFC: r226406
  
  Properly free resources in case of an error.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/siba/siba_bwn.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)

Modified: stable/9/sys/dev/siba/siba_bwn.c
==============================================================================
--- stable/9/sys/dev/siba/siba_bwn.c	Sun Oct 23 18:27:53 2011	(r226669)
+++ stable/9/sys/dev/siba/siba_bwn.c	Sun Oct 23 18:31:24 2011	(r226670)
@@ -208,6 +208,7 @@ siba_bwn_suspend(device_t dev)
 		if (error) {
 			for (j = 0; j < i; j++)
 				DEVICE_RESUME(devlistp[j]);
+			free(devlistp, M_TEMP);
 			return (error);
 		}
 	}

From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 23 18:37:57 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 77E941065680;
	Sun, 23 Oct 2011 18:37:57 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 674548FC13;
	Sun, 23 Oct 2011 18:37: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 p9NIbve7050852;
	Sun, 23 Oct 2011 18:37:57 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9NIbvo3050850;
	Sun, 23 Oct 2011 18:37:57 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110231837.p9NIbvo3050850@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 23 Oct 2011 18:37:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226671 - stable/8/sys/dev/siba
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Oct 2011 18:37:57 -0000

Author: brueffer
Date: Sun Oct 23 18:37:57 2011
New Revision: 226671
URL: http://svn.freebsd.org/changeset/base/226671

Log:
  MFC: r226406
  
  Properly free resources in case of an error.

Modified:
  stable/8/sys/dev/siba/siba_bwn.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/siba/siba_bwn.c
==============================================================================
--- stable/8/sys/dev/siba/siba_bwn.c	Sun Oct 23 18:31:24 2011	(r226670)
+++ stable/8/sys/dev/siba/siba_bwn.c	Sun Oct 23 18:37:57 2011	(r226671)
@@ -208,6 +208,7 @@ siba_bwn_suspend(device_t dev)
 		if (error) {
 			for (j = 0; j < i; j++)
 				DEVICE_RESUME(devlistp[j]);
+			free(devlistp, M_TEMP);
 			return (error);
 		}
 	}

From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 25 19:47:42 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB4A2106566C;
	Tue, 25 Oct 2011 19:47:42 +0000 (UTC)
	(envelope-from pluknet@gmail.com)
Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com
	[209.85.214.54])
	by mx1.freebsd.org (Postfix) with ESMTP id DBB0E8FC17;
	Tue, 25 Oct 2011 19:47:41 +0000 (UTC)
Received: by bkbzt4 with SMTP id zt4so970316bkb.13
	for <multiple recipients>; Tue, 25 Oct 2011 12:47:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=mime-version:sender:in-reply-to:references:date
	:x-google-sender-auth:message-id:subject:from:to:cc:content-type
	:content-transfer-encoding;
	bh=TmN7mASRc0VAGPts9Sfb0qlY/v+yVpDCussrAk5BT2c=;
	b=hILOGpRhQ1Vom1GyoyATbJBk3cfHZXWTJ/p2Jlf5GqhiIzsLe41013CxOLCqtlKXnY
	h34VQgFtApjCvdLkfsWKOdU8BEG079K864W3PJY+fbr6GFls4TKfQGhu3C+4OlHgEwjr
	N/1OLwf6A4WwsInxLM1sk+GbL6n40EVNw8+/E=
MIME-Version: 1.0
Received: by 10.182.86.232 with SMTP id s8mr4591230obz.58.1319570565433; Tue,
	25 Oct 2011 12:22:45 -0700 (PDT)
Sender: pluknet@gmail.com
Received: by 10.182.160.97 with HTTP; Tue, 25 Oct 2011 12:22:45 -0700 (PDT)
In-Reply-To: <1318862413.55691.12.camel@bauer.cse.buffalo.edu>
References: <201110152123.p9FLN5Ht031202@svn.freebsd.org>
	<CAJ-Vmo=BTek=WFcEPUM7EdJMeG3Z9LegXw0+HuR=mjbrHAT55A@mail.gmail.com>
	<1318862413.55691.12.camel@bauer.cse.buffalo.edu>
Date: Tue, 25 Oct 2011 23:22:45 +0400
X-Google-Sender-Auth: YF3EjaeImM_QzqpQzyPBrQfFNjA
Message-ID: <CAE-mSOJ8V6cf2x8V_JXXa8_2j+LAtqgOz++Rw-fU5DEVFf+niw@mail.gmail.com>
From: Sergey Kandaurov <pluknet@freebsd.org>
To: Ken Smith <kensmith@buffalo.edu>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: svn-src-stable@freebsd.org, Adrian Chadd <adrian@freebsd.org>,
	src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r226405 - in stable/9: . etc/defaults
 lib/libc/stdlib
 sys/amd64/conf sys/i386/conf sys/ia64/conf sys/pc98/conf sys/powerpc/conf
 sys/sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2011 19:47:42 -0000

On 17 October 2011 18:40, Ken Smith <kensmith@buffalo.edu> wrote:
> On Sun, 2011-10-16 at 09:24 +0800, Adrian Chadd wrote:
>> Hi!
>>
>> Would you consider leaving these in but just commenting them out?
>>
>> That way if a user hits a deadlock or memory corruption issue, we can
>> just say "uncomment the section marked _debugging_ in your config
>> file."
>>
>> Thanks,
>
> I'm not completely against it. =A0My *slight* hesitation in doing it woul=
d
> be that from my experience these knobs aren't a one-size-fits-all thing
> for people trying to debug stuff in production. =A0So you sorta need to
> know a bit more about what you're doing when fiddling with them.
>
> Turning them all on is probably OK for a workstation user but less
> likely to be OK for a server admin. =A0Some may want/need to add in
> KDB_UNATTENDED depending on their circumstances, etc.
>

Hi.

In 8-STABLE (and 8.2) both KDB and KDB_TRACE present in GENERIC
kernels (added in r214326, I guess they are needed for printing a stack
trace on panic). Were these options removed intentionally in this commit?

--=20
wbr,
pluknet

From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 25 21:58:30 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 37FC2106566B;
	Tue, 25 Oct 2011 21:58:30 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 258488FC08;
	Tue, 25 Oct 2011 21:58:30 +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 p9PLwU1f018243;
	Tue, 25 Oct 2011 21:58:30 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9PLwT5Q018235;
	Tue, 25 Oct 2011 21:58:29 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201110252158.p9PLwT5Q018235@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 25 Oct 2011 21:58:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226753 - stable/8/share/zoneinfo
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2011 21:58:30 -0000

Author: edwin
Date: Tue Oct 25 21:58:29 2011
New Revision: 226753
URL: http://svn.freebsd.org/changeset/base/226753

Log:
  MFC of 226752, tzdata2011m
  
  Europe:
  - Pridnestrovian Moldavian Republic (PMR, also known as
    "Pridnestrovie") has abolished seasonal clock change (no transition
    to the Winter Time).
  - The recent change to the Ukranian time zone (Europe/Kiev) to
    introduce permanent daylight saving time (similar to Russia) was
    reverted.
  
  South America:
  - Bahia: The President signed a decree that includes Bahia in summer
    time.
  
  zone.tab:
  - Add Europe/Tiraspol Pridnestrovie
  
  Obtained from:  ftp://ftp.iana.org/tz/releases/

Modified:
  stable/8/share/zoneinfo/asia
  stable/8/share/zoneinfo/australasia
  stable/8/share/zoneinfo/backward
  stable/8/share/zoneinfo/europe
  stable/8/share/zoneinfo/northamerica
  stable/8/share/zoneinfo/southamerica
  stable/8/share/zoneinfo/zone.tab
Directory Properties:
  stable/8/share/zoneinfo/   (props changed)

Modified: stable/8/share/zoneinfo/asia
==============================================================================
--- stable/8/share/zoneinfo/asia	Tue Oct 25 21:53:43 2011	(r226752)
+++ stable/8/share/zoneinfo/asia	Tue Oct 25 21:58:29 2011	(r226753)
@@ -1,4 +1,4 @@
-# @(#)asia	8.68
+# @(#)asia	8.69
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/8/share/zoneinfo/australasia
==============================================================================
--- stable/8/share/zoneinfo/australasia	Tue Oct 25 21:53:43 2011	(r226752)
+++ stable/8/share/zoneinfo/australasia	Tue Oct 25 21:58:29 2011	(r226753)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)australasia	8.27
+# @(#)australasia	8.28
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/8/share/zoneinfo/backward
==============================================================================
--- stable/8/share/zoneinfo/backward	Tue Oct 25 21:53:43 2011	(r226752)
+++ stable/8/share/zoneinfo/backward	Tue Oct 25 21:58:29 2011	(r226753)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)backward	8.9
+# @(#)backward	8.10
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -67,7 +67,6 @@ Link	America/Havana		Cuba
 Link	Africa/Cairo		Egypt
 Link	Europe/Dublin		Eire
 Link	Europe/London		Europe/Belfast
-Link	Europe/Chisinau		Europe/Tiraspol
 Link	Europe/London		GB
 Link	Europe/London		GB-Eire
 Link	Etc/GMT			GMT+0

Modified: stable/8/share/zoneinfo/europe
==============================================================================
--- stable/8/share/zoneinfo/europe	Tue Oct 25 21:53:43 2011	(r226752)
+++ stable/8/share/zoneinfo/europe	Tue Oct 25 21:58:29 2011	(r226753)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)europe	8.38
+# @(#)europe	8.39
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1655,6 +1655,29 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov
 # But [two people] separately reported via
 # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
 # The Tiraspol entry has therefore been removed for now.
+#
+# From Alexander Krivenyshev (2011-10-17):
+# Pridnestrovian Moldavian Republic (PMR, also known as
+# "Pridnestrovie") has abolished seasonal clock change (no transition
+# to the Winter Time).
+#
+# News (in Russian):
+# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
+# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
+# </a>
+#
+# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
+# http://www.allmoldova.com/moldova-news/1249064116.html
+# </a>
+#
+# The substance of this change (reinstatement of the Tiraspol entry)
+# is from a patch from Petr Machata (2011-10-17)
+#
+# From Tim Parenti (2011-10-19)
+# In addition, being situated at +4651+2938 would give Tiraspol
+# a pre-1880 LMT offset of 1:58:32.
+#
+# (which agrees with the earlier entry that had been removed)
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1671,6 +1694,21 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 # See Romania commentary for the guessed 1997 transition to EU rules.
 			2:00	EU	EE%sT
 
+Zone	Europe/Tiraspol	1:58:32 -	LMT	1880
+			1:55	-	CMT	1918 Feb 15 # Chisinau MT
+			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
+			2:00	Romania	EE%sT	1940 Aug 15
+			2:00	1:00	EEST	1941 Jul 17
+			1:00	C-Eur	CE%sT	1944 Aug 24
+			3:00	Russia	MSK/MSD	1990
+			3:00	-	MSK	1990 May 6
+			2:00	-	EET	1991
+			2:00	Russia	EE%sT	1992
+			2:00	E-Eur	EE%sT	1997
+# See Romania commentary for the guessed 1997 transition to EU rules.
+			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+			3:00	-	FET # Further-eastern European Time
+
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
@@ -2651,6 +2689,28 @@ Link	Europe/Istanbul	Asia/Istanbul	# Ist
 # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
 # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
 # </a>
+#
+# From Philip Pizzey (2011-10-18):
+# Today my Ukrainian colleagues have informed me that the
+# Ukrainian parliament have decided that they will go to winter
+# time this year after all.
+#
+# From Udo Schwedt (2011-10-18):
+# As far as I understand, the recent change to the Ukranian time zone 
+# (Europe/Kiev) to introduce permanent daylight saving time (similar
+# to Russia) was reverted today:
+#
+# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
+# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
+# </a>
+#
+# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
+# The law documents themselves are at
+#
+# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
+# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
+# </a>
+
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Most of Ukraine since 1970 has been like Kiev.
@@ -2665,8 +2725,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
 			3:00	-	MSK	1990 Jul  1 2:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Ruthenia used CET 1990/1991.
 # "Uzhhorod" is the transliteration of the Ukrainian name, but
 # "Uzhgorod" is more common in English.
@@ -2680,8 +2739,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 
 			1:00	-	CET	1991 Mar 31 3:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
 # "Zaporizhia" is the transliteration of the Ukrainian name, but
 # "Zaporozh'ye" is more common in English.  Use the common English
@@ -2694,8 +2752,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	188
 			1:00	C-Eur	CE%sT	1943 Oct 25
 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Central Crimea used Moscow time 1994/1997.
 Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
@@ -2720,8 +2777,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	188
 # Assume it happened in March by not changing the clocks.
 			3:00	Russia	MSK/MSD	1997
 			3:00	-	MSK	1997 Mar lastSun 1:00u
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 
 ###############################################################################
 

Modified: stable/8/share/zoneinfo/northamerica
==============================================================================
--- stable/8/share/zoneinfo/northamerica	Tue Oct 25 21:53:43 2011	(r226752)
+++ stable/8/share/zoneinfo/northamerica	Tue Oct 25 21:58:29 2011	(r226753)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)northamerica	8.49
+# @(#)northamerica	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/8/share/zoneinfo/southamerica
==============================================================================
--- stable/8/share/zoneinfo/southamerica	Tue Oct 25 21:53:43 2011	(r226752)
+++ stable/8/share/zoneinfo/southamerica	Tue Oct 25 21:58:29 2011	(r226753)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)southamerica	8.50
+# @(#)southamerica	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -818,6 +818,19 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # oficial agency about time in Brazil, and she confirmed that the old rule is
 # still in force.
 
+# From Guilherme Bernardes Rodrigues (2011-10-14)
+# It's official, the President signed a decree that includes Bahia in summer
+# time.
+#	 [ and in a second message (same day): ]
+# I found the decree.
+#
+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# Link :
+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+# </a>
+
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
 # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1054,10 +1067,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
 # of America/Salvador.
 Zone America/Bahia	-2:34:04 -	LMT	1914
 			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT
-# as noted above, not yet in operation.
-#			-3:00	-	BRT	2011 Oct 16
-#			-3:00	Brazil	BR%sT
+			-3:00	-	BRT	2011 Oct 16
+			-3:00	Brazil	BR%sT
 #
 # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
 # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),

Modified: stable/8/share/zoneinfo/zone.tab
==============================================================================
--- stable/8/share/zoneinfo/zone.tab	Tue Oct 25 21:53:43 2011	(r226752)
+++ stable/8/share/zoneinfo/zone.tab	Tue Oct 25 21:58:29 2011	(r226753)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)zone.tab	8.49
+# @(#)zone.tab	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -258,6 +258,7 @@ LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
+MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo

From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 25 21:59:25 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1DC401065677;
	Tue, 25 Oct 2011 21:59:25 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B5048FC17;
	Tue, 25 Oct 2011 21:59: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 p9PLxOeu018325;
	Tue, 25 Oct 2011 21:59:24 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9PLxO3A018316;
	Tue, 25 Oct 2011 21:59:24 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201110252159.p9PLxO3A018316@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 25 Oct 2011 21:59:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226754 - stable/7/share/zoneinfo
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2011 21:59:25 -0000

Author: edwin
Date: Tue Oct 25 21:59:24 2011
New Revision: 226754
URL: http://svn.freebsd.org/changeset/base/226754

Log:
  MFC of 226752, tzdata2011m
  
  Europe:
  - Pridnestrovian Moldavian Republic (PMR, also known as
    "Pridnestrovie") has abolished seasonal clock change (no transition
    to the Winter Time).
  - The recent change to the Ukranian time zone (Europe/Kiev) to
    introduce permanent daylight saving time (similar to Russia) was
    reverted.
  
  South America:
  - Bahia: The President signed a decree that includes Bahia in summer
    time.
  
  zone.tab:
  - Add Europe/Tiraspol Pridnestrovie
  
  Obtained from:  ftp://ftp.iana.org/tz/releases/

Modified:
  stable/7/share/zoneinfo/asia
  stable/7/share/zoneinfo/australasia
  stable/7/share/zoneinfo/backward
  stable/7/share/zoneinfo/europe
  stable/7/share/zoneinfo/northamerica
  stable/7/share/zoneinfo/southamerica
  stable/7/share/zoneinfo/zone.tab
Directory Properties:
  stable/7/share/zoneinfo/   (props changed)

Modified: stable/7/share/zoneinfo/asia
==============================================================================
--- stable/7/share/zoneinfo/asia	Tue Oct 25 21:58:29 2011	(r226753)
+++ stable/7/share/zoneinfo/asia	Tue Oct 25 21:59:24 2011	(r226754)
@@ -1,4 +1,4 @@
-# @(#)asia	8.68
+# @(#)asia	8.69
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/7/share/zoneinfo/australasia
==============================================================================
--- stable/7/share/zoneinfo/australasia	Tue Oct 25 21:58:29 2011	(r226753)
+++ stable/7/share/zoneinfo/australasia	Tue Oct 25 21:59:24 2011	(r226754)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)australasia	8.27
+# @(#)australasia	8.28
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/7/share/zoneinfo/backward
==============================================================================
--- stable/7/share/zoneinfo/backward	Tue Oct 25 21:58:29 2011	(r226753)
+++ stable/7/share/zoneinfo/backward	Tue Oct 25 21:59:24 2011	(r226754)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)backward	8.9
+# @(#)backward	8.10
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -67,7 +67,6 @@ Link	America/Havana		Cuba
 Link	Africa/Cairo		Egypt
 Link	Europe/Dublin		Eire
 Link	Europe/London		Europe/Belfast
-Link	Europe/Chisinau		Europe/Tiraspol
 Link	Europe/London		GB
 Link	Europe/London		GB-Eire
 Link	Etc/GMT			GMT+0

Modified: stable/7/share/zoneinfo/europe
==============================================================================
--- stable/7/share/zoneinfo/europe	Tue Oct 25 21:58:29 2011	(r226753)
+++ stable/7/share/zoneinfo/europe	Tue Oct 25 21:59:24 2011	(r226754)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)europe	8.38
+# @(#)europe	8.39
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1655,6 +1655,29 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov
 # But [two people] separately reported via
 # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
 # The Tiraspol entry has therefore been removed for now.
+#
+# From Alexander Krivenyshev (2011-10-17):
+# Pridnestrovian Moldavian Republic (PMR, also known as
+# "Pridnestrovie") has abolished seasonal clock change (no transition
+# to the Winter Time).
+#
+# News (in Russian):
+# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
+# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
+# </a>
+#
+# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
+# http://www.allmoldova.com/moldova-news/1249064116.html
+# </a>
+#
+# The substance of this change (reinstatement of the Tiraspol entry)
+# is from a patch from Petr Machata (2011-10-17)
+#
+# From Tim Parenti (2011-10-19)
+# In addition, being situated at +4651+2938 would give Tiraspol
+# a pre-1880 LMT offset of 1:58:32.
+#
+# (which agrees with the earlier entry that had been removed)
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1671,6 +1694,21 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 # See Romania commentary for the guessed 1997 transition to EU rules.
 			2:00	EU	EE%sT
 
+Zone	Europe/Tiraspol	1:58:32 -	LMT	1880
+			1:55	-	CMT	1918 Feb 15 # Chisinau MT
+			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
+			2:00	Romania	EE%sT	1940 Aug 15
+			2:00	1:00	EEST	1941 Jul 17
+			1:00	C-Eur	CE%sT	1944 Aug 24
+			3:00	Russia	MSK/MSD	1990
+			3:00	-	MSK	1990 May 6
+			2:00	-	EET	1991
+			2:00	Russia	EE%sT	1992
+			2:00	E-Eur	EE%sT	1997
+# See Romania commentary for the guessed 1997 transition to EU rules.
+			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+			3:00	-	FET # Further-eastern European Time
+
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
@@ -2651,6 +2689,28 @@ Link	Europe/Istanbul	Asia/Istanbul	# Ist
 # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
 # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
 # </a>
+#
+# From Philip Pizzey (2011-10-18):
+# Today my Ukrainian colleagues have informed me that the
+# Ukrainian parliament have decided that they will go to winter
+# time this year after all.
+#
+# From Udo Schwedt (2011-10-18):
+# As far as I understand, the recent change to the Ukranian time zone 
+# (Europe/Kiev) to introduce permanent daylight saving time (similar
+# to Russia) was reverted today:
+#
+# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
+# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
+# </a>
+#
+# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
+# The law documents themselves are at
+#
+# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
+# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
+# </a>
+
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Most of Ukraine since 1970 has been like Kiev.
@@ -2665,8 +2725,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
 			3:00	-	MSK	1990 Jul  1 2:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Ruthenia used CET 1990/1991.
 # "Uzhhorod" is the transliteration of the Ukrainian name, but
 # "Uzhgorod" is more common in English.
@@ -2680,8 +2739,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 
 			1:00	-	CET	1991 Mar 31 3:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
 # "Zaporizhia" is the transliteration of the Ukrainian name, but
 # "Zaporozh'ye" is more common in English.  Use the common English
@@ -2694,8 +2752,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	188
 			1:00	C-Eur	CE%sT	1943 Oct 25
 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Central Crimea used Moscow time 1994/1997.
 Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
@@ -2720,8 +2777,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	188
 # Assume it happened in March by not changing the clocks.
 			3:00	Russia	MSK/MSD	1997
 			3:00	-	MSK	1997 Mar lastSun 1:00u
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 
 ###############################################################################
 

Modified: stable/7/share/zoneinfo/northamerica
==============================================================================
--- stable/7/share/zoneinfo/northamerica	Tue Oct 25 21:58:29 2011	(r226753)
+++ stable/7/share/zoneinfo/northamerica	Tue Oct 25 21:59:24 2011	(r226754)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)northamerica	8.49
+# @(#)northamerica	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/7/share/zoneinfo/southamerica
==============================================================================
--- stable/7/share/zoneinfo/southamerica	Tue Oct 25 21:58:29 2011	(r226753)
+++ stable/7/share/zoneinfo/southamerica	Tue Oct 25 21:59:24 2011	(r226754)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)southamerica	8.50
+# @(#)southamerica	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -818,6 +818,19 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # oficial agency about time in Brazil, and she confirmed that the old rule is
 # still in force.
 
+# From Guilherme Bernardes Rodrigues (2011-10-14)
+# It's official, the President signed a decree that includes Bahia in summer
+# time.
+#	 [ and in a second message (same day): ]
+# I found the decree.
+#
+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# Link :
+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+# </a>
+
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
 # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1054,10 +1067,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
 # of America/Salvador.
 Zone America/Bahia	-2:34:04 -	LMT	1914
 			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT
-# as noted above, not yet in operation.
-#			-3:00	-	BRT	2011 Oct 16
-#			-3:00	Brazil	BR%sT
+			-3:00	-	BRT	2011 Oct 16
+			-3:00	Brazil	BR%sT
 #
 # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
 # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),

Modified: stable/7/share/zoneinfo/zone.tab
==============================================================================
--- stable/7/share/zoneinfo/zone.tab	Tue Oct 25 21:58:29 2011	(r226753)
+++ stable/7/share/zoneinfo/zone.tab	Tue Oct 25 21:59:24 2011	(r226754)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)zone.tab	8.49
+# @(#)zone.tab	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -258,6 +258,7 @@ LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
+MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo

From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 25 22:02:53 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28B03106564A;
	Tue, 25 Oct 2011 22:02:53 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1628C8FC12;
	Tue, 25 Oct 2011 22:02: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 p9PM2q0d018508;
	Tue, 25 Oct 2011 22:02:52 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9PM2qDi018500;
	Tue, 25 Oct 2011 22:02:52 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201110252202.p9PM2qDi018500@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 25 Oct 2011 22:02:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226755 - stable/6/share/zoneinfo
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2011 22:02:53 -0000

Author: edwin
Date: Tue Oct 25 22:02:52 2011
New Revision: 226755
URL: http://svn.freebsd.org/changeset/base/226755

Log:
  MFC of 226752, tzdata2011m
  
  Europe:
  - Pridnestrovian Moldavian Republic (PMR, also known as
    "Pridnestrovie") has abolished seasonal clock change (no transition
    to the Winter Time).
  - The recent change to the Ukranian time zone (Europe/Kiev) to
    introduce permanent daylight saving time (similar to Russia) was
    reverted.
  
  South America:
  - Bahia: The President signed a decree that includes Bahia in summer
    time.
  
  zone.tab:
  - Add Europe/Tiraspol Pridnestrovie
  
  Obtained from:	ftp://ftp.iana.org/tz/releases/

Modified:
  stable/6/share/zoneinfo/asia
  stable/6/share/zoneinfo/australasia
  stable/6/share/zoneinfo/backward
  stable/6/share/zoneinfo/europe
  stable/6/share/zoneinfo/northamerica
  stable/6/share/zoneinfo/southamerica
  stable/6/share/zoneinfo/zone.tab
Directory Properties:
  stable/6/share/zoneinfo/   (props changed)

Modified: stable/6/share/zoneinfo/asia
==============================================================================
--- stable/6/share/zoneinfo/asia	Tue Oct 25 21:59:24 2011	(r226754)
+++ stable/6/share/zoneinfo/asia	Tue Oct 25 22:02:52 2011	(r226755)
@@ -1,4 +1,4 @@
-# @(#)asia	8.68
+# @(#)asia	8.69
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/6/share/zoneinfo/australasia
==============================================================================
--- stable/6/share/zoneinfo/australasia	Tue Oct 25 21:59:24 2011	(r226754)
+++ stable/6/share/zoneinfo/australasia	Tue Oct 25 22:02:52 2011	(r226755)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)australasia	8.27
+# @(#)australasia	8.28
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/6/share/zoneinfo/backward
==============================================================================
--- stable/6/share/zoneinfo/backward	Tue Oct 25 21:59:24 2011	(r226754)
+++ stable/6/share/zoneinfo/backward	Tue Oct 25 22:02:52 2011	(r226755)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)backward	8.9
+# @(#)backward	8.10
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -67,7 +67,6 @@ Link	America/Havana		Cuba
 Link	Africa/Cairo		Egypt
 Link	Europe/Dublin		Eire
 Link	Europe/London		Europe/Belfast
-Link	Europe/Chisinau		Europe/Tiraspol
 Link	Europe/London		GB
 Link	Europe/London		GB-Eire
 Link	Etc/GMT			GMT+0

Modified: stable/6/share/zoneinfo/europe
==============================================================================
--- stable/6/share/zoneinfo/europe	Tue Oct 25 21:59:24 2011	(r226754)
+++ stable/6/share/zoneinfo/europe	Tue Oct 25 22:02:52 2011	(r226755)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)europe	8.38
+# @(#)europe	8.39
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1655,6 +1655,29 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov
 # But [two people] separately reported via
 # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
 # The Tiraspol entry has therefore been removed for now.
+#
+# From Alexander Krivenyshev (2011-10-17):
+# Pridnestrovian Moldavian Republic (PMR, also known as
+# "Pridnestrovie") has abolished seasonal clock change (no transition
+# to the Winter Time).
+#
+# News (in Russian):
+# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
+# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
+# </a>
+#
+# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
+# http://www.allmoldova.com/moldova-news/1249064116.html
+# </a>
+#
+# The substance of this change (reinstatement of the Tiraspol entry)
+# is from a patch from Petr Machata (2011-10-17)
+#
+# From Tim Parenti (2011-10-19)
+# In addition, being situated at +4651+2938 would give Tiraspol
+# a pre-1880 LMT offset of 1:58:32.
+#
+# (which agrees with the earlier entry that had been removed)
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1671,6 +1694,21 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 # See Romania commentary for the guessed 1997 transition to EU rules.
 			2:00	EU	EE%sT
 
+Zone	Europe/Tiraspol	1:58:32 -	LMT	1880
+			1:55	-	CMT	1918 Feb 15 # Chisinau MT
+			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
+			2:00	Romania	EE%sT	1940 Aug 15
+			2:00	1:00	EEST	1941 Jul 17
+			1:00	C-Eur	CE%sT	1944 Aug 24
+			3:00	Russia	MSK/MSD	1990
+			3:00	-	MSK	1990 May 6
+			2:00	-	EET	1991
+			2:00	Russia	EE%sT	1992
+			2:00	E-Eur	EE%sT	1997
+# See Romania commentary for the guessed 1997 transition to EU rules.
+			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+			3:00	-	FET # Further-eastern European Time
+
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
@@ -2651,6 +2689,28 @@ Link	Europe/Istanbul	Asia/Istanbul	# Ist
 # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
 # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
 # </a>
+#
+# From Philip Pizzey (2011-10-18):
+# Today my Ukrainian colleagues have informed me that the
+# Ukrainian parliament have decided that they will go to winter
+# time this year after all.
+#
+# From Udo Schwedt (2011-10-18):
+# As far as I understand, the recent change to the Ukranian time zone 
+# (Europe/Kiev) to introduce permanent daylight saving time (similar
+# to Russia) was reverted today:
+#
+# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
+# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
+# </a>
+#
+# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
+# The law documents themselves are at
+#
+# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
+# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
+# </a>
+
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Most of Ukraine since 1970 has been like Kiev.
@@ -2665,8 +2725,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
 			3:00	-	MSK	1990 Jul  1 2:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Ruthenia used CET 1990/1991.
 # "Uzhhorod" is the transliteration of the Ukrainian name, but
 # "Uzhgorod" is more common in English.
@@ -2680,8 +2739,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 
 			1:00	-	CET	1991 Mar 31 3:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
 # "Zaporizhia" is the transliteration of the Ukrainian name, but
 # "Zaporozh'ye" is more common in English.  Use the common English
@@ -2694,8 +2752,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	188
 			1:00	C-Eur	CE%sT	1943 Oct 25
 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Central Crimea used Moscow time 1994/1997.
 Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
@@ -2720,8 +2777,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	188
 # Assume it happened in March by not changing the clocks.
 			3:00	Russia	MSK/MSD	1997
 			3:00	-	MSK	1997 Mar lastSun 1:00u
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 
 ###############################################################################
 

Modified: stable/6/share/zoneinfo/northamerica
==============================================================================
--- stable/6/share/zoneinfo/northamerica	Tue Oct 25 21:59:24 2011	(r226754)
+++ stable/6/share/zoneinfo/northamerica	Tue Oct 25 22:02:52 2011	(r226755)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)northamerica	8.49
+# @(#)northamerica	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/6/share/zoneinfo/southamerica
==============================================================================
--- stable/6/share/zoneinfo/southamerica	Tue Oct 25 21:59:24 2011	(r226754)
+++ stable/6/share/zoneinfo/southamerica	Tue Oct 25 22:02:52 2011	(r226755)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)southamerica	8.50
+# @(#)southamerica	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -818,6 +818,19 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # oficial agency about time in Brazil, and she confirmed that the old rule is
 # still in force.
 
+# From Guilherme Bernardes Rodrigues (2011-10-14)
+# It's official, the President signed a decree that includes Bahia in summer
+# time.
+#	 [ and in a second message (same day): ]
+# I found the decree.
+#
+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# Link :
+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+# </a>
+
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
 # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1054,10 +1067,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
 # of America/Salvador.
 Zone America/Bahia	-2:34:04 -	LMT	1914
 			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT
-# as noted above, not yet in operation.
-#			-3:00	-	BRT	2011 Oct 16
-#			-3:00	Brazil	BR%sT
+			-3:00	-	BRT	2011 Oct 16
+			-3:00	Brazil	BR%sT
 #
 # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
 # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),

Modified: stable/6/share/zoneinfo/zone.tab
==============================================================================
--- stable/6/share/zoneinfo/zone.tab	Tue Oct 25 21:59:24 2011	(r226754)
+++ stable/6/share/zoneinfo/zone.tab	Tue Oct 25 22:02:52 2011	(r226755)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)zone.tab	8.49
+# @(#)zone.tab	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -258,6 +258,7 @@ LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
+MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo

From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 25 23:19:57 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6EC41065678;
	Tue, 25 Oct 2011 23:19:57 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C5F08FC13;
	Tue, 25 Oct 2011 23:19: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 p9PNJvFi021276;
	Tue, 25 Oct 2011 23:19:57 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9PNJv5J021272;
	Tue, 25 Oct 2011 23:19:57 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201110252319.p9PNJv5J021272@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 25 Oct 2011 23:19:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226763 - in stable/8/sys: sys vm
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2011 23:19:57 -0000

Author: alc
Date: Tue Oct 25 23:19:57 2011
New Revision: 226763
URL: http://svn.freebsd.org/changeset/base/226763

Log:
  MFC r211937
    Add the MAP_PREFAULT_READ option to mmap(2).

Modified:
  stable/8/sys/sys/mman.h
  stable/8/sys/sys/param.h
  stable/8/sys/vm/vm_mmap.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/sys/mman.h
==============================================================================
--- stable/8/sys/sys/mman.h	Tue Oct 25 23:17:53 2011	(r226762)
+++ stable/8/sys/sys/mman.h	Tue Oct 25 23:19:57 2011	(r226763)
@@ -87,6 +87,7 @@
  * Extended flags
  */
 #define	MAP_NOCORE	 0x00020000 /* dont include these pages in a coredump */
+#define	MAP_PREFAULT_READ 0x00040000 /* prefault mapping for reading */
 #endif /* __BSD_VISIBLE */
 
 #if __POSIX_VISIBLE >= 199309

Modified: stable/8/sys/sys/param.h
==============================================================================
--- stable/8/sys/sys/param.h	Tue Oct 25 23:17:53 2011	(r226762)
+++ stable/8/sys/sys/param.h	Tue Oct 25 23:19:57 2011	(r226763)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 802512	/* Master, propagated to newvers */
+#define __FreeBSD_version 802513	/* Master, propagated to newvers */
 
 #ifdef _KERNEL
 #define	P_OSREL_SIGWAIT		700000

Modified: stable/8/sys/vm/vm_mmap.c
==============================================================================
--- stable/8/sys/vm/vm_mmap.c	Tue Oct 25 23:17:53 2011	(r226762)
+++ stable/8/sys/vm/vm_mmap.c	Tue Oct 25 23:19:57 2011	(r226763)
@@ -1388,9 +1388,10 @@ vm_mmap(vm_map_t map, vm_offset_t *addr,
 		 */
 		if (handle == 0)
 			foff = 0;
-	} else {
+	} else if (flags & MAP_PREFAULT_READ)
+		docow = MAP_PREFAULT;
+	else
 		docow = MAP_PREFAULT_PARTIAL;
-	}
 
 	if ((flags & (MAP_ANON|MAP_SHARED)) == 0)
 		docow |= MAP_COPY_ON_WRITE;

From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 25 23:29:36 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1CA41065673;
	Tue, 25 Oct 2011 23:29:36 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 908E58FC15;
	Tue, 25 Oct 2011 23:29: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 p9PNTagR021715;
	Tue, 25 Oct 2011 23:29:36 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9PNTaEf021713;
	Tue, 25 Oct 2011 23:29:36 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201110252329.p9PNTaEf021713@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 25 Oct 2011 23:29:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226766 - stable/8/lib/libc/sys
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2011 23:29:36 -0000

Author: alc
Date: Tue Oct 25 23:29:36 2011
New Revision: 226766
URL: http://svn.freebsd.org/changeset/base/226766

Log:
  MFC r211937
    Add the MAP_PREFAULT_READ option to mmap(2).

Modified:
  stable/8/lib/libc/sys/mmap.2
Directory Properties:
  stable/8/lib/libc/   (props changed)
  stable/8/lib/libc/stdtime/   (props changed)

Modified: stable/8/lib/libc/sys/mmap.2
==============================================================================
--- stable/8/lib/libc/sys/mmap.2	Tue Oct 25 23:28:16 2011	(r226765)
+++ stable/8/lib/libc/sys/mmap.2	Tue Oct 25 23:29:36 2011	(r226766)
@@ -28,7 +28,7 @@
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
 .\" $FreeBSD$
 .\"
-.Dd July 26, 2009
+.Dd August 28, 2010
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -207,6 +207,19 @@ implements a coherent file system buffer
 However, it may be
 used to associate dirty VM pages with file system buffers and thus cause
 them to be flushed to physical media sooner rather than later.
+.It Dv MAP_PREFAULT_READ
+Immediately update the calling process's lowest-level virtual address
+translation structures, such as its page table, so that every memory
+resident page within the region is mapped for read access.
+Ordinarily these structures are updated lazily.
+The effect of this option is to eliminate any soft faults that would
+otherwise occur on the initial read accesses to the region.
+Although this option does not preclude
+.Fa prot
+from including
+.Dv PROT_WRITE ,
+it does not eliminate soft faults on the initial write accesses to the
+region.
 .It Dv MAP_PRIVATE
 Modifications are private.
 .It Dv MAP_SHARED

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 01:57:47 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9E01D1065686;
	Wed, 26 Oct 2011 01:57:47 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CEF48FC1E;
	Wed, 26 Oct 2011 01:57: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 p9Q1vllI026655;
	Wed, 26 Oct 2011 01:57:47 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q1vlXb026653;
	Wed, 26 Oct 2011 01:57:47 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201110260157.p9Q1vlXb026653@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 26 Oct 2011 01:57:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226772 - stable/8/share/zoneinfo
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 01:57:47 -0000

Author: edwin
Date: Wed Oct 26 01:57:47 2011
New Revision: 226772
URL: http://svn.freebsd.org/changeset/base/226772

Log:
  MFC of r226771
  
  Fix breakage in tzsetup:
  MD      +4700+02850     Europe/Chisinau most locations

Modified:
  stable/8/share/zoneinfo/zone.tab
Directory Properties:
  stable/8/share/zoneinfo/   (props changed)

Modified: stable/8/share/zoneinfo/zone.tab
==============================================================================
--- stable/8/share/zoneinfo/zone.tab	Wed Oct 26 01:56:22 2011	(r226771)
+++ stable/8/share/zoneinfo/zone.tab	Wed Oct 26 01:57:47 2011	(r226772)
@@ -257,7 +257,7 @@ LV	+5657+02406	Europe/Riga
 LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
+MD	+4700+02850	Europe/Chisinau	most locations
 MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 01:58:14 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4823C1065695;
	Wed, 26 Oct 2011 01:58:14 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 371298FC1A;
	Wed, 26 Oct 2011 01:58:14 +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 p9Q1wECe026721;
	Wed, 26 Oct 2011 01:58:14 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q1wEHg026719;
	Wed, 26 Oct 2011 01:58:14 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201110260158.p9Q1wEHg026719@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 26 Oct 2011 01:58:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226773 - stable/7/share/zoneinfo
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 01:58:14 -0000

Author: edwin
Date: Wed Oct 26 01:58:13 2011
New Revision: 226773
URL: http://svn.freebsd.org/changeset/base/226773

Log:
  MFC of r226771
  
  Fix breakage in tzsetup:
  MD      +4700+02850     Europe/Chisinau most locations

Modified:
  stable/7/share/zoneinfo/zone.tab
Directory Properties:
  stable/7/share/zoneinfo/   (props changed)

Modified: stable/7/share/zoneinfo/zone.tab
==============================================================================
--- stable/7/share/zoneinfo/zone.tab	Wed Oct 26 01:57:47 2011	(r226772)
+++ stable/7/share/zoneinfo/zone.tab	Wed Oct 26 01:58:13 2011	(r226773)
@@ -257,7 +257,7 @@ LV	+5657+02406	Europe/Riga
 LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
+MD	+4700+02850	Europe/Chisinau	most locations
 MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 01:58:37 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6137F106568A;
	Wed, 26 Oct 2011 01:58:37 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 503878FC1C;
	Wed, 26 Oct 2011 01:58: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 p9Q1wbGK026779;
	Wed, 26 Oct 2011 01:58:37 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q1wboR026777;
	Wed, 26 Oct 2011 01:58:37 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201110260158.p9Q1wboR026777@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 26 Oct 2011 01:58:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226774 - stable/6/share/zoneinfo
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 01:58:37 -0000

Author: edwin
Date: Wed Oct 26 01:58:36 2011
New Revision: 226774
URL: http://svn.freebsd.org/changeset/base/226774

Log:
  MFC of r226771
  
  Fix breakage in tzsetup:
  MD      +4700+02850     Europe/Chisinau most locations

Modified:
  stable/6/share/zoneinfo/zone.tab
Directory Properties:
  stable/6/share/zoneinfo/   (props changed)

Modified: stable/6/share/zoneinfo/zone.tab
==============================================================================
--- stable/6/share/zoneinfo/zone.tab	Wed Oct 26 01:58:13 2011	(r226773)
+++ stable/6/share/zoneinfo/zone.tab	Wed Oct 26 01:58:36 2011	(r226774)
@@ -257,7 +257,7 @@ LV	+5657+02406	Europe/Riga
 LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
+MD	+4700+02850	Europe/Chisinau	most locations
 MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 04:38:24 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30BB1106564A;
	Wed, 26 Oct 2011 04:38:24 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20EAF8FC1B;
	Wed, 26 Oct 2011 04:38:24 +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 p9Q4cOAP032388;
	Wed, 26 Oct 2011 04:38:24 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q4cNaK032385;
	Wed, 26 Oct 2011 04:38:23 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201110260438.p9Q4cNaK032385@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Wed, 26 Oct 2011 04:38:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226783 - in stable/8: lib/libc/sys sys/sys
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 04:38:24 -0000

Author: alc
Date: Wed Oct 26 04:38:23 2011
New Revision: 226783
URL: http://svn.freebsd.org/changeset/base/226783

Log:
  MFC r198973
    Add MAP_ANONYMOUS.

Modified:
  stable/8/lib/libc/sys/mmap.2
  stable/8/sys/sys/mman.h
Directory Properties:
  stable/8/lib/libc/   (props changed)
  stable/8/lib/libc/stdtime/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/lib/libc/sys/mmap.2
==============================================================================
--- stable/8/lib/libc/sys/mmap.2	Wed Oct 26 03:48:49 2011	(r226782)
+++ stable/8/lib/libc/sys/mmap.2	Wed Oct 26 04:38:23 2011	(r226783)
@@ -108,6 +108,10 @@ The
 argument must be 0.
 .\".It Dv MAP_FILE
 .\"Mapped from a regular file or character-special device memory.
+.It Dv MAP_ANONYMOUS
+This flag is identical to
+.Dv MAP_ANON
+and is provided for compatibility.
 .It Dv MAP_FIXED
 Do not permit the system to select a different address than the one
 specified.

Modified: stable/8/sys/sys/mman.h
==============================================================================
--- stable/8/sys/sys/mman.h	Wed Oct 26 03:48:49 2011	(r226782)
+++ stable/8/sys/sys/mman.h	Wed Oct 26 04:38:23 2011	(r226783)
@@ -82,6 +82,9 @@
  */
 #define	MAP_FILE	 0x0000	/* map from file (default) */
 #define	MAP_ANON	 0x1000	/* allocated from memory, swap space */
+#ifndef _KERNEL
+#define	MAP_ANONYMOUS	 MAP_ANON /* For compatibility. */
+#endif /* !_KERNEL */
 
 /*
  * Extended flags

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 06:50:41 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32A1C106566B;
	Wed, 26 Oct 2011 06:50:41 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1873C8FC12;
	Wed, 26 Oct 2011 06:50: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 p9Q6oev0036838;
	Wed, 26 Oct 2011 06:50:40 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q6oeC9036830;
	Wed, 26 Oct 2011 06:50:40 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201110260650.p9Q6oeC9036830@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 26 Oct 2011 06:50: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: r226784 - stable/9/contrib/tzdata
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 06:50:41 -0000

Author: edwin
Date: Wed Oct 26 06:50:40 2011
New Revision: 226784
URL: http://svn.freebsd.org/changeset/base/226784

Log:
  MFC of r226752, r226771, tzdata2011m
  
  Europe:
  - Pridnestrovian Moldavian Republic (PMR, also known as
    "Pridnestrovie") has abolished seasonal clock change (no transition
    to the Winter Time).
  - The recent change to the Ukranian time zone (Europe/Kiev) to
    introduce permanent daylight saving time (similar to Russia) was
    reverted.
  
  South America:
  - Bahia: The President signed a decree that includes Bahia in summer
    time.
  
  zone.tab:
  - Add Europe/Tiraspol Pridnestrovie
  
  Obtained from:  ftp://ftp.iana.org/tz/releases/
  Approved by:	re (Kostik Belousov)

Modified:
  stable/9/contrib/tzdata/asia
  stable/9/contrib/tzdata/australasia
  stable/9/contrib/tzdata/backward
  stable/9/contrib/tzdata/europe
  stable/9/contrib/tzdata/northamerica
  stable/9/contrib/tzdata/southamerica
  stable/9/contrib/tzdata/zone.tab
Directory Properties:
  stable/9/contrib/tzdata/   (props changed)

Modified: stable/9/contrib/tzdata/asia
==============================================================================
--- stable/9/contrib/tzdata/asia	Wed Oct 26 04:38:23 2011	(r226783)
+++ stable/9/contrib/tzdata/asia	Wed Oct 26 06:50:40 2011	(r226784)
@@ -1,4 +1,4 @@
-# @(#)asia	8.68
+# @(#)asia	8.69
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/9/contrib/tzdata/australasia
==============================================================================
--- stable/9/contrib/tzdata/australasia	Wed Oct 26 04:38:23 2011	(r226783)
+++ stable/9/contrib/tzdata/australasia	Wed Oct 26 06:50:40 2011	(r226784)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)australasia	8.27
+# @(#)australasia	8.28
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/9/contrib/tzdata/backward
==============================================================================
--- stable/9/contrib/tzdata/backward	Wed Oct 26 04:38:23 2011	(r226783)
+++ stable/9/contrib/tzdata/backward	Wed Oct 26 06:50:40 2011	(r226784)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)backward	8.9
+# @(#)backward	8.10
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -67,7 +67,6 @@ Link	America/Havana		Cuba
 Link	Africa/Cairo		Egypt
 Link	Europe/Dublin		Eire
 Link	Europe/London		Europe/Belfast
-Link	Europe/Chisinau		Europe/Tiraspol
 Link	Europe/London		GB
 Link	Europe/London		GB-Eire
 Link	Etc/GMT			GMT+0

Modified: stable/9/contrib/tzdata/europe
==============================================================================
--- stable/9/contrib/tzdata/europe	Wed Oct 26 04:38:23 2011	(r226783)
+++ stable/9/contrib/tzdata/europe	Wed Oct 26 06:50:40 2011	(r226784)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)europe	8.38
+# @(#)europe	8.39
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1655,6 +1655,29 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov
 # But [two people] separately reported via
 # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
 # The Tiraspol entry has therefore been removed for now.
+#
+# From Alexander Krivenyshev (2011-10-17):
+# Pridnestrovian Moldavian Republic (PMR, also known as
+# "Pridnestrovie") has abolished seasonal clock change (no transition
+# to the Winter Time).
+#
+# News (in Russian):
+# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
+# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
+# </a>
+#
+# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
+# http://www.allmoldova.com/moldova-news/1249064116.html
+# </a>
+#
+# The substance of this change (reinstatement of the Tiraspol entry)
+# is from a patch from Petr Machata (2011-10-17)
+#
+# From Tim Parenti (2011-10-19)
+# In addition, being situated at +4651+2938 would give Tiraspol
+# a pre-1880 LMT offset of 1:58:32.
+#
+# (which agrees with the earlier entry that had been removed)
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1671,6 +1694,21 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 # See Romania commentary for the guessed 1997 transition to EU rules.
 			2:00	EU	EE%sT
 
+Zone	Europe/Tiraspol	1:58:32 -	LMT	1880
+			1:55	-	CMT	1918 Feb 15 # Chisinau MT
+			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
+			2:00	Romania	EE%sT	1940 Aug 15
+			2:00	1:00	EEST	1941 Jul 17
+			1:00	C-Eur	CE%sT	1944 Aug 24
+			3:00	Russia	MSK/MSD	1990
+			3:00	-	MSK	1990 May 6
+			2:00	-	EET	1991
+			2:00	Russia	EE%sT	1992
+			2:00	E-Eur	EE%sT	1997
+# See Romania commentary for the guessed 1997 transition to EU rules.
+			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+			3:00	-	FET # Further-eastern European Time
+
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
@@ -2651,6 +2689,28 @@ Link	Europe/Istanbul	Asia/Istanbul	# Ist
 # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
 # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
 # </a>
+#
+# From Philip Pizzey (2011-10-18):
+# Today my Ukrainian colleagues have informed me that the
+# Ukrainian parliament have decided that they will go to winter
+# time this year after all.
+#
+# From Udo Schwedt (2011-10-18):
+# As far as I understand, the recent change to the Ukranian time zone 
+# (Europe/Kiev) to introduce permanent daylight saving time (similar
+# to Russia) was reverted today:
+#
+# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
+# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
+# </a>
+#
+# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
+# The law documents themselves are at
+#
+# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
+# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
+# </a>
+
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Most of Ukraine since 1970 has been like Kiev.
@@ -2665,8 +2725,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
 			3:00	-	MSK	1990 Jul  1 2:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Ruthenia used CET 1990/1991.
 # "Uzhhorod" is the transliteration of the Ukrainian name, but
 # "Uzhgorod" is more common in English.
@@ -2680,8 +2739,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 
 			1:00	-	CET	1991 Mar 31 3:00
 			2:00	-	EET	1992
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
 # "Zaporizhia" is the transliteration of the Ukrainian name, but
 # "Zaporozh'ye" is more common in English.  Use the common English
@@ -2694,8 +2752,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	188
 			1:00	C-Eur	CE%sT	1943 Oct 25
 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
 			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 # Central Crimea used Moscow time 1994/1997.
 Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
@@ -2720,8 +2777,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	188
 # Assume it happened in March by not changing the clocks.
 			3:00	Russia	MSK/MSD	1997
 			3:00	-	MSK	1997 Mar lastSun 1:00u
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
+			2:00	EU	EE%sT
 
 ###############################################################################
 

Modified: stable/9/contrib/tzdata/northamerica
==============================================================================
--- stable/9/contrib/tzdata/northamerica	Wed Oct 26 04:38:23 2011	(r226783)
+++ stable/9/contrib/tzdata/northamerica	Wed Oct 26 06:50:40 2011	(r226784)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)northamerica	8.49
+# @(#)northamerica	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/9/contrib/tzdata/southamerica
==============================================================================
--- stable/9/contrib/tzdata/southamerica	Wed Oct 26 04:38:23 2011	(r226783)
+++ stable/9/contrib/tzdata/southamerica	Wed Oct 26 06:50:40 2011	(r226784)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)southamerica	8.50
+# @(#)southamerica	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -818,6 +818,19 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # oficial agency about time in Brazil, and she confirmed that the old rule is
 # still in force.
 
+# From Guilherme Bernardes Rodrigues (2011-10-14)
+# It's official, the President signed a decree that includes Bahia in summer
+# time.
+#	 [ and in a second message (same day): ]
+# I found the decree.
+#
+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# Link :
+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+# </a>
+
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
 # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1054,10 +1067,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
 # of America/Salvador.
 Zone America/Bahia	-2:34:04 -	LMT	1914
 			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT
-# as noted above, not yet in operation.
-#			-3:00	-	BRT	2011 Oct 16
-#			-3:00	Brazil	BR%sT
+			-3:00	-	BRT	2011 Oct 16
+			-3:00	Brazil	BR%sT
 #
 # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
 # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),

Modified: stable/9/contrib/tzdata/zone.tab
==============================================================================
--- stable/9/contrib/tzdata/zone.tab	Wed Oct 26 04:38:23 2011	(r226783)
+++ stable/9/contrib/tzdata/zone.tab	Wed Oct 26 06:50:40 2011	(r226784)
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)zone.tab	8.49
+# @(#)zone.tab	8.50
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -257,7 +257,8 @@ LV	+5657+02406	Europe/Riga
 LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
+MD	+4700+02850	Europe/Chisinau	most locations
+MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 07:11:52 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1079106564A;
	Wed, 26 Oct 2011 07:11:52 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D5C58FC08;
	Wed, 26 Oct 2011 07:11:51 +0000 (UTC)
Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua
	[212.40.38.100])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id JAA28488;
	Wed, 26 Oct 2011 09:52:18 +0300 (EEST)
	(envelope-from avg@FreeBSD.org)
Received: from localhost ([127.0.0.1])
	by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
	id 1RIxLW-000D7n-84; Wed, 26 Oct 2011 09:52:18 +0300
Message-ID: <4EA7AE21.4030608@FreeBSD.org>
Date: Wed, 26 Oct 2011 09:52:17 +0300
From: Andriy Gapon <avg@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:7.0.1) Gecko/20111002 Thunderbird/7.0.1
MIME-Version: 1.0
To: Sergey Kandaurov <pluknet@FreeBSD.org>, Ken Smith <kensmith@buffalo.edu>
References: <201110152123.p9FLN5Ht031202@svn.freebsd.org>
	<CAJ-Vmo=BTek=WFcEPUM7EdJMeG3Z9LegXw0+HuR=mjbrHAT55A@mail.gmail.com>
	<1318862413.55691.12.camel@bauer.cse.buffalo.edu>
	<CAE-mSOJ8V6cf2x8V_JXXa8_2j+LAtqgOz++Rw-fU5DEVFf+niw@mail.gmail.com>
In-Reply-To: <CAE-mSOJ8V6cf2x8V_JXXa8_2j+LAtqgOz++Rw-fU5DEVFf+niw@mail.gmail.com>
X-Enigmail-Version: undefined
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: svn-src-stable@FreeBSD.org, Adrian Chadd <adrian@FreeBSD.org>,
	src-committers@FreeBSD.org, svn-src-all@FreeBSD.org,
	svn-src-stable-9@FreeBSD.org
Subject: Re: svn commit: r226405 - in stable/9: . etc/defaults
 lib/libc/stdlib
 sys/amd64/conf sys/i386/conf sys/ia64/conf sys/pc98/conf sys/powerpc/conf
 sys/sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 07:11:52 -0000

on 25/10/2011 22:22 Sergey Kandaurov said the following:
> In 8-STABLE (and 8.2) both KDB and KDB_TRACE present in GENERIC
> kernels (added in r214326, I guess they are needed for printing a stack
> trace on panic). Were these options removed intentionally in this commit?
> 

Sergey,

good catch!

Ken,

could you please restore the KDB option and add the KDB_TRACE option to GENERICs
in stable/9?
KDB is not a debugger, but a "debugger support"; that is, it adds a few routines
useful for debugging.  KDB_TRACE provides a nice stack trace on panic.
Please see r214326.

-- 
Andriy Gapon

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 08:34:00 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABBCF1065782;
	Wed, 26 Oct 2011 08:34:00 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9085C8FC12;
	Wed, 26 Oct 2011 08:34: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 p9Q8Y0cT040168;
	Wed, 26 Oct 2011 08:34:00 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q8Y0ar040162;
	Wed, 26 Oct 2011 08:34:00 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201110260834.p9Q8Y0ar040162@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 26 Oct 2011 08:34:00 +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: r226786 - in stable/9: etc/defaults etc/rc.d
	share/man/man5
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 08:34:00 -0000

Author: mm
Date: Wed Oct 26 08:34:00 2011
New Revision: 226786
URL: http://svn.freebsd.org/changeset/base/226786

Log:
  MFC r226654, r226657, r226658:
  
  MFC r226654 [1]:
  Add etc/rc.d/static_ndp, analogous to etc/rc.d/static_arp.
  Make sure that static ARP and NDP bindings are set before NETWORKING.
  
  As static_ndp is based on static_arp, pass copyright to the project with
  permission of the original author (delphij@).
  
  MFC r226657 [2]:
  Correctly reassign copyright of etc/rc.d/static_ndp back to delphij@
  as the project itself is no legal entity
  
  MFC r226658 [3]:
  Add information about static_ndp_pairs to rc.conf(5) manual page
  
  Reviewed by:	Xin Li <delphij@FreeBSD.org> [1]
  Reported by:	Joe Dahl <joel@vnode.se> [2]
  Submitted by:	Sergey Kandaurov <pluknet@FreeBSD.org> [3]
  Approved by:	re (kib)

Added:
  stable/9/etc/rc.d/static_ndp
     - copied, changed from r226654, head/etc/rc.d/static_ndp
Modified:
  stable/9/etc/defaults/rc.conf
  stable/9/etc/rc.d/Makefile
  stable/9/etc/rc.d/NETWORKING
  stable/9/share/man/man5/rc.conf.5
Directory Properties:
  stable/9/etc/   (props changed)
  stable/9/share/man/man5/   (props changed)

Modified: stable/9/etc/defaults/rc.conf
==============================================================================
--- stable/9/etc/defaults/rc.conf	Wed Oct 26 07:49:47 2011	(r226785)
+++ stable/9/etc/defaults/rc.conf	Wed Oct 26 08:34:00 2011	(r226786)
@@ -383,6 +383,7 @@ bsnmpd_flags=""			# Flags for bsnmpd.
 ### Network routing options: ###
 defaultrouter="NO"		# Set to default gateway (or NO).
 static_arp_pairs=""		# Set to static ARP list (or leave empty).
+static_ndp_pairs=""		# Set to static NDP list (or leave empty).
 static_routes=""		# Set to static route list (or leave empty).
 natm_static_routes=""		# Set to static route list for NATM (or leave empty).
 gateway_enable="NO"		# Set to YES if this host will be a gateway.

Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile	Wed Oct 26 07:49:47 2011	(r226785)
+++ stable/9/etc/rc.d/Makefile	Wed Oct 26 08:34:00 2011	(r226786)
@@ -32,7 +32,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	random rarpd rctl resolv rfcomm_pppd_server root \
 	route6d routed routing rpcbind rtadvd rtsold rwho \
 	savecore sdpd securelevel sendmail \
-	serial sppp statd static_arp stf swap1 \
+	serial sppp statd static_arp static_ndp stf swap1 \
 	syscons sysctl syslogd \
 	timed tmp \
 	ugidfw \

Modified: stable/9/etc/rc.d/NETWORKING
==============================================================================
--- stable/9/etc/rc.d/NETWORKING	Wed Oct 26 07:49:47 2011	(r226785)
+++ stable/9/etc/rc.d/NETWORKING	Wed Oct 26 08:34:00 2011	(r226786)
@@ -6,6 +6,7 @@
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netoptions routing ppp ipfw stf faith
 # REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge
+# REQUIRE: static_arp static_ndp
 
 #	This is a dummy dependency, for services which require networking
 #	to be operational before starting.

Copied and modified: stable/9/etc/rc.d/static_ndp (from r226654, head/etc/rc.d/static_ndp)
==============================================================================
--- head/etc/rc.d/static_ndp	Sun Oct 23 09:08:42 2011	(r226654, copy source)
+++ stable/9/etc/rc.d/static_ndp	Wed Oct 26 08:34:00 2011	(r226786)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2011  The FreeBSD Project
+# Copyright (c) 2011  Xin Li <delphij@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: stable/9/share/man/man5/rc.conf.5
==============================================================================
--- stable/9/share/man/man5/rc.conf.5	Wed Oct 26 07:49:47 2011	(r226785)
+++ stable/9/share/man/man5/rc.conf.5	Wed Oct 26 08:34:00 2011	(r226786)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2011
+.Dd October 23, 2011
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -2568,6 +2568,22 @@ For example
 static_arp_pairs="gw"
 static_arp_gw="192.168.1.1 00:01:02:03:04:05"
 .Ed
+.It Va static_ndp_pairs
+.Pq Vt str
+Set to the list of static NDP pairs that are to be added at system
+boot time.
+For each whitespace separated
+.Ar element
+in the value, a
+.Va static_ndp_ Ns Aq Ar element
+variable is assumed to exist whose contents will later be passed to a
+.Dq Nm ndp Cm -s
+operation.
+For example
+.Bd -literal
+static_ndp_pairs="gw"
+static_ndp_gw="2001:db8:3::1 00:01:02:03:04:05"
+.Ed
 .It Va static_routes
 .Pq Vt str
 Set to the list of static routes that are to be added at system

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 08:41:41 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 82C88106564A;
	Wed, 26 Oct 2011 08:41:41 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 67CB68FC14;
	Wed, 26 Oct 2011 08:41: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 p9Q8ffsf040469;
	Wed, 26 Oct 2011 08:41:41 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q8ffxh040463;
	Wed, 26 Oct 2011 08:41:41 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201110260841.p9Q8ffxh040463@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 26 Oct 2011 08:41:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226787 - in stable/8: etc/defaults etc/rc.d
	share/man/man5
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 08:41:41 -0000

Author: mm
Date: Wed Oct 26 08:41:41 2011
New Revision: 226787
URL: http://svn.freebsd.org/changeset/base/226787

Log:
  MFC r226654, r226657, r226658:
  
  MFC r226654 [1]:
  Add etc/rc.d/static_ndp, analogous to etc/rc.d/static_arp.
  Make sure that static ARP and NDP bindings are set before NETWORKING.
  
  As static_ndp is based on static_arp, pass copyright to the project with
  permission of the original author (delphij@).
  
  MFC r226657 [2]:
  Correctly reassign copyright of etc/rc.d/static_ndp back to delphij@
  as the project itself is no legal entity
  
  MFC r226658 [3]:
  Add information about static_ndp_pairs to rc.conf(5) manual page
  
  Reviewed by:	Xin Li <delphij@FreeBSD.org> [1]
  Reported by:	Joe Dahl <joel@vnode.se> [2]
  Submitted by:	Sergey Kandaurov <pluknet@FreeBSD.org> [3]

Added:
  stable/8/etc/rc.d/static_ndp
     - copied, changed from r226654, head/etc/rc.d/static_ndp
Modified:
  stable/8/etc/defaults/rc.conf
  stable/8/etc/rc.d/Makefile
  stable/8/etc/rc.d/NETWORKING
  stable/8/share/man/man5/rc.conf.5
Directory Properties:
  stable/8/etc/   (props changed)
  stable/8/share/man/man5/   (props changed)

Modified: stable/8/etc/defaults/rc.conf
==============================================================================
--- stable/8/etc/defaults/rc.conf	Wed Oct 26 08:34:00 2011	(r226786)
+++ stable/8/etc/defaults/rc.conf	Wed Oct 26 08:41:41 2011	(r226787)
@@ -379,6 +379,7 @@ bsnmpd_flags=""			# Flags for bsnmpd.
 ### Network routing options: ###
 defaultrouter="NO"		# Set to default gateway (or NO).
 static_arp_pairs=""		# Set to static ARP list (or leave empty).
+static_ndp_pairs=""		# Set to static NDP list (or leave empty).
 static_routes=""		# Set to static route list (or leave empty).
 natm_static_routes=""		# Set to static route list for NATM (or leave empty).
 gateway_enable="NO"		# Set to YES if this host will be a gateway.

Modified: stable/8/etc/rc.d/Makefile
==============================================================================
--- stable/8/etc/rc.d/Makefile	Wed Oct 26 08:34:00 2011	(r226786)
+++ stable/8/etc/rc.d/Makefile	Wed Oct 26 08:41:41 2011	(r226787)
@@ -32,7 +32,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	random rarpd resolv rfcomm_pppd_server root \
 	route6d routed routing rpcbind rtadvd rtsold rwho \
 	savecore sdpd securelevel sendmail \
-	serial sppp statd static_arp swap1 \
+	serial sppp statd static_arp static_ndp swap1 \
 	syscons sysctl syslogd \
 	timed tmp \
 	ugidfw \

Modified: stable/8/etc/rc.d/NETWORKING
==============================================================================
--- stable/8/etc/rc.d/NETWORKING	Wed Oct 26 08:34:00 2011	(r226786)
+++ stable/8/etc/rc.d/NETWORKING	Wed Oct 26 08:41:41 2011	(r226787)
@@ -6,6 +6,7 @@
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netoptions routing network_ipv6 ppp ipfw
 # REQUIRE: defaultroute routed mrouted route6d mroute6d resolv
+# REQUIRE: static_arp static_ndp
 
 #	This is a dummy dependency, for services which require networking
 #	to be operational before starting.

Copied and modified: stable/8/etc/rc.d/static_ndp (from r226654, head/etc/rc.d/static_ndp)
==============================================================================
--- head/etc/rc.d/static_ndp	Sun Oct 23 09:08:42 2011	(r226654, copy source)
+++ stable/8/etc/rc.d/static_ndp	Wed Oct 26 08:41:41 2011	(r226787)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2011  The FreeBSD Project
+# Copyright (c) 2011  Xin Li <delphij@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: stable/8/share/man/man5/rc.conf.5
==============================================================================
--- stable/8/share/man/man5/rc.conf.5	Wed Oct 26 08:34:00 2011	(r226786)
+++ stable/8/share/man/man5/rc.conf.5	Wed Oct 26 08:41:41 2011	(r226787)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 19, 2011
+.Dd October 23, 2011
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -2312,6 +2312,22 @@ For example
 static_arp_pairs="gw"
 static_arp_gw="192.168.1.1 00:01:02:03:04:05"
 .Ed
+.It Va static_ndp_pairs
+.Pq Vt str
+Set to the list of static NDP pairs that are to be added at system
+boot time.
+For each whitespace separated
+.Ar element
+in the value, a
+.Va static_ndp_ Ns Aq Ar element
+variable is assumed to exist whose contents will later be passed to a
+.Dq Nm ndp Cm -s
+operation.
+For example
+.Bd -literal
+static_ndp_pairs="gw"
+static_ndp_gw="2001:db8:3::1 00:01:02:03:04:05"
+.Ed
 .It Va static_routes
 .Pq Vt str
 Set to the list of static routes that are to be added at system

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 15:36:49 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67726106566B;
	Wed, 26 Oct 2011 15:36:49 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D8C38FC17;
	Wed, 26 Oct 2011 15:36: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 p9QFansl056460;
	Wed, 26 Oct 2011 15:36:49 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QFanEX056458;
	Wed, 26 Oct 2011 15:36:49 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201110261536.p9QFanEX056458@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 26 Oct 2011 15:36:49 +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: r226796 - stable/9/sys/contrib/pf/net
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 15:36:49 -0000

Author: bz
Date: Wed Oct 26 15:36:48 2011
New Revision: 226796
URL: http://svn.freebsd.org/changeset/base/226796

Log:
  MFC r226527:
  
    Fix indentation in a loop and a tiny maze of #ifdefs for just the
    __FreeBSD__ parts that had it wrong.
  
  MFC r226530:
  
    Fix a bug when NPFSYNC > 0 that on FreeBSD we would always return
    and never remove state.
  
    This fixes the problem some people are seeing that state is removed when pf
    is loaded as a module but not in situations when compiled into the kernel.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/contrib/pf/net/pf.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)

Modified: stable/9/sys/contrib/pf/net/pf.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf.c	Wed Oct 26 15:22:13 2011	(r226795)
+++ stable/9/sys/contrib/pf/net/pf.c	Wed Oct 26 15:36:48 2011	(r226796)
@@ -1342,42 +1342,42 @@ pf_purge_thread(void *v)
 		tsleep(pf_purge_thread, PWAIT, "pftm", 1 * hz);
 
 #ifdef __FreeBSD__
-	sx_slock(&V_pf_consistency_lock);
-	PF_LOCK();
-	locked = 0;
-
-	if (V_pf_end_threads) {
-		PF_UNLOCK();
-		sx_sunlock(&V_pf_consistency_lock);
-		sx_xlock(&V_pf_consistency_lock);
+		sx_slock(&V_pf_consistency_lock);
 		PF_LOCK();
+		locked = 0;
+
+		if (V_pf_end_threads) {
+			PF_UNLOCK();
+			sx_sunlock(&V_pf_consistency_lock);
+			sx_xlock(&V_pf_consistency_lock);
+			PF_LOCK();
 
-		pf_purge_expired_states(V_pf_status.states, 1);
-		pf_purge_expired_fragments();
-		pf_purge_expired_src_nodes(1);
-		V_pf_end_threads++;
+			pf_purge_expired_states(V_pf_status.states, 1);
+			pf_purge_expired_fragments();
+			pf_purge_expired_src_nodes(1);
+			V_pf_end_threads++;
 
-		sx_xunlock(&V_pf_consistency_lock);
-		PF_UNLOCK();
-		wakeup(pf_purge_thread);
-		kproc_exit(0);
-	}
+			sx_xunlock(&V_pf_consistency_lock);
+			PF_UNLOCK();
+			wakeup(pf_purge_thread);
+			kproc_exit(0);
+		}
 #endif
 		s = splsoftnet();
 
 		/* process a fraction of the state table every second */
 #ifdef __FreeBSD__
-	if (!pf_purge_expired_states(1 + (V_pf_status.states /
-	    V_pf_default_rule.timeout[PFTM_INTERVAL]), 0)) {
-		PF_UNLOCK();
-		sx_sunlock(&V_pf_consistency_lock);
-		sx_xlock(&V_pf_consistency_lock);
-		PF_LOCK();
-		locked = 1;
+		if (!pf_purge_expired_states(1 + (V_pf_status.states /
+		    V_pf_default_rule.timeout[PFTM_INTERVAL]), 0)) {
+			PF_UNLOCK();
+			sx_sunlock(&V_pf_consistency_lock);
+			sx_xlock(&V_pf_consistency_lock);
+			PF_LOCK();
+			locked = 1;
 
-		pf_purge_expired_states(1 + (V_pf_status.states /
-		    V_pf_default_rule.timeout[PFTM_INTERVAL]), 1);
-	}
+			pf_purge_expired_states(1 + (V_pf_status.states /
+			    V_pf_default_rule.timeout[PFTM_INTERVAL]), 1);
+		}
 #else
 		pf_purge_expired_states(1 + (pf_status.states
 		    / pf_default_rule.timeout[PFTM_INTERVAL]));
@@ -1626,8 +1626,8 @@ pf_free_state(struct pf_state *cur)
 
 #if NPFSYNC > 0
 #ifdef __FreeBSD__
-	if (pfsync_state_in_use_ptr != NULL)
-		pfsync_state_in_use_ptr(cur);
+	if (pfsync_state_in_use_ptr != NULL &&
+		pfsync_state_in_use_ptr(cur))
 #else
 	if (pfsync_state_in_use(cur))
 #endif

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 17:04:26 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A08F2106564A;
	Wed, 26 Oct 2011 17:04:26 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E55C8FC13;
	Wed, 26 Oct 2011 17:04: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 p9QH4Q8O059361;
	Wed, 26 Oct 2011 17:04:26 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QH4QKU059354;
	Wed, 26 Oct 2011 17:04:26 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <201110261704.p9QH4QKU059354@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Wed, 26 Oct 2011 17: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: r226800 - in stable/9: sbin/atacontrol sys/dev/ata
	usr.sbin/burncd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 17:04:26 -0000

Author: rodrigc
Date: Wed Oct 26 17:04:26 2011
New Revision: 226800
URL: http://svn.freebsd.org/changeset/base/226800

Log:
  Add a "kern.features.ata_cam" sysctl in the kernel when the ATA_CAM kernel
  option is defined.  This sysctl can be queried by feature_present(3).
  
  Query for this feature in /sbin/atacontrol and /usr/sbin/burncd.
  If these utilities detect that ATA_CAM is enabled, then these utilities
  will error out.  These utilities are compatible with the old ATA
  driver, but are incomptible with the new ATA_CAM driver.  By erroring out,
  we give end-users an idea as to what remedies to use, and reduce the need for them
  to file PR's.  For atacontrol, camcontrol must be used instead,
  and for burncd, alternative utilties from the ports collection must be used
  such as sysutils/cdrtools.
  
  In future, maybe someone can re-write burncd to work with ATA_CAM,
  but at least for now, we give a somewhat useful error message to end users.
  
  PR:		160979
  Reviewed by:	jh, Arnaud Lacombe <lacombar at gmail dot com>
  Approved by:	re (kib)
  Reported by:	Joe Barbish <fbsd8 at a1poweruser dot com>

Modified:
  stable/9/sbin/atacontrol/atacontrol.8
  stable/9/sbin/atacontrol/atacontrol.c
  stable/9/sys/dev/ata/ata-all.c
  stable/9/usr.sbin/burncd/burncd.8
  stable/9/usr.sbin/burncd/burncd.c
Directory Properties:
  stable/9/sbin/atacontrol/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/usr.sbin/burncd/   (props changed)

Modified: stable/9/sbin/atacontrol/atacontrol.8
==============================================================================
--- stable/9/sbin/atacontrol/atacontrol.8	Wed Oct 26 16:11:49 2011	(r226799)
+++ stable/9/sbin/atacontrol/atacontrol.8	Wed Oct 26 17:04:26 2011	(r226800)
@@ -25,12 +25,19 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 21, 2009
+.Dd October 9, 2011
 .Dt ATACONTROL 8
 .Os
 .Sh NAME
 .Nm atacontrol
 .Nd ATA device driver control program
+.Pp
+This utility was
+.Em deprecated
+in
+.Fx 9.0 .
+See
+.Sx NOTES .
 .Sh SYNOPSIS
 .Nm
 .Aq Ar command
@@ -361,11 +368,17 @@ or syslog logging on it as the disk will
 up all the time.
 .Sh SEE ALSO
 .Xr ata 4
+.Xr cam 4
+.Xr camcontrol 8
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Fx 4.6 .
+.Pp
+.Nm
+was deprecated in
+.Fx 9.0 .
 .Sh AUTHORS
 .An -nosplit
 The
@@ -377,3 +390,16 @@ utility was written by
 This manual page was written by
 .An S\(/oren Schmidt
 .Aq sos@FreeBSD.org .
+.Sh NOTES
+The
+.Nm
+utility was deprecated in
+.Fx 9.0 .
+When
+.Bd -ragged -offset indent
+.Cd "options ATA_CAM"
+.Ed
+.Pp
+is compiled into the kernel, then
+.Xr camcontrol 8
+must be used instead.

Modified: stable/9/sbin/atacontrol/atacontrol.c
==============================================================================
--- stable/9/sbin/atacontrol/atacontrol.c	Wed Oct 26 16:11:49 2011	(r226799)
+++ stable/9/sbin/atacontrol/atacontrol.c	Wed Oct 26 17:04:26 2011	(r226800)
@@ -378,6 +378,11 @@ main(int argc, char **argv)
 {
 	int fd, mode, channel, array;
 
+	if (feature_present("ata_cam")) {
+		errx(1, "\nATA_CAM option is enabled in kernel.\n"
+		    "Please use camcontrol instead.");
+	}
+
 	if (argc < 2)
 		usage();
 

Modified: stable/9/sys/dev/ata/ata-all.c
==============================================================================
--- stable/9/sys/dev/ata/ata-all.c	Wed Oct 26 16:11:49 2011	(r226799)
+++ stable/9/sys/dev/ata/ata-all.c	Wed Oct 26 17:04:26 2011	(r226800)
@@ -120,6 +120,9 @@ SYSCTL_INT(_hw_ata, OID_AUTO, wc, CTLFLA
 TUNABLE_INT("hw.ata.setmax", &ata_setmax);
 SYSCTL_INT(_hw_ata, OID_AUTO, setmax, CTLFLAG_RDTUN, &ata_setmax, 0,
 	   "ATA disk set max native address");
+#ifdef ATA_CAM
+FEATURE(ata_cam, "ATA devices are accessed through the cam(4) driver");
+#endif
 
 /*
  * newbus device interface related functions

Modified: stable/9/usr.sbin/burncd/burncd.8
==============================================================================
--- stable/9/usr.sbin/burncd/burncd.8	Wed Oct 26 16:11:49 2011	(r226799)
+++ stable/9/usr.sbin/burncd/burncd.8	Wed Oct 26 17:04:26 2011	(r226800)
@@ -27,12 +27,19 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 21, 2009
+.Dd October 9, 2011
 .Dt BURNCD 8
 .Os
 .Sh NAME
 .Nm burncd
 .Nd control the ATAPI CD-R/RW driver
+.Pp
+This utility was
+.Em deprecated
+in
+.Fx 9.0 .
+See
+.Sx NOTES .
 .Sh SYNOPSIS
 .Nm
 .Op Fl deFlmnpqtv
@@ -211,6 +218,10 @@ The
 .Nm
 utility appeared in
 .Fx 4.0 .
+.Pp
+.Nm
+was deprecated in
+.Fx 9.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -220,3 +231,19 @@ Denmark
 .Aq sos@FreeBSD.org .
 .Sh BUGS
 Probably, please report when found.
+.Sh NOTES
+When
+.Bd -ragged -offset indent
+.Cd "options ATA_CAM"
+.Ed
+.Pp
+is compiled into the kernel, then
+.Xr cdrecord 1 ,
+available in the
+.Fx
+Ports Collection as part of the
+.Pa sysutils/cdrtools
+port, must be used instead.
+Refer to:
+.Pp
+http://www.freebsd.org/doc/handbook/creating-cds.html#CDRECORD

Modified: stable/9/usr.sbin/burncd/burncd.c
==============================================================================
--- stable/9/usr.sbin/burncd/burncd.c	Wed Oct 26 16:11:49 2011	(r226799)
+++ stable/9/usr.sbin/burncd/burncd.c	Wed Oct 26 17:04:26 2011	(r226800)
@@ -82,6 +82,13 @@ main(int argc, char **argv)
 	int block_size = 0, block_type = 0, cdopen = 0, dvdrw = 0;
 	const char *dev, *env_speed;
 
+	if (feature_present("ata_cam")) {
+		errx(1, "\nATA_CAM option is enabled in kernel.\n"
+		    "Install the sysutils/cdrtools port and use cdrecord instead.\n\n"
+		    "Please refer to:\n"
+		    "http://www.freebsd.org/doc/handbook/creating-cds.html#CDRECORD");
+	}
+
 	if ((dev = getenv("CDROM")) == NULL)
 		dev = "/dev/acd0";
 

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 17:09:10 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 58A651065674;
	Wed, 26 Oct 2011 17:09:10 +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 46ACC8FC16;
	Wed, 26 Oct 2011 17:09:10 +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 p9QH9AJQ059557;
	Wed, 26 Oct 2011 17:09:10 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QH9AKo059551;
	Wed, 26 Oct 2011 17:09:10 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201110261709.p9QH9AKo059551@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 26 Oct 2011 17:09:10 +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: r226801 - stable/9/sys/contrib/pf/net
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 17:09:10 -0000

Author: glebius
Date: Wed Oct 26 17:09:09 2011
New Revision: 226801
URL: http://svn.freebsd.org/changeset/base/226801

Log:
  Sync pf(4) and pfsync(4) with head, merging lots of important bugfixes
  required for normal operation of pfsync(4). Revisions merged:
  
    r226531 | bz | 2011-10-19 13:34:40 +0400 (ср, 19 окт 2011) | 4 lines
  
    Fix an obvious locking bug where we would lock again rather than unlock.
  
    r226532 | bz | 2011-10-19 14:04:24 +0400 (ср, 19 окт 2011) | 12 lines
  
    Pseudo interfaces should go at SI_SUB_PSEUDO.  However at least
    pfsync also depends on pf to be initialized already so pf goes at
    FIRST and the interfaces go at ANY.
    Then the (VNET_)SYSINIT startups for pf stays at SI_SUB_PROTO_BEGIN
    and for pfsync we move to the later SI_SUB_PROTO_IF.
  
    This is not ideal either but at least an order that should work for
    the moment and can be re-fined with the VIMAGE merge, once this will
    actually work with more than one network stack.
  
    r226533 | bz | 2011-10-19 14:08:58 +0400 (ср, 19 окт 2011) | 4 lines
  
    In the non-FreeBSD case we do not expect PF_LOCK and friends to do anything.
  
    r226535 | bz | 2011-10-19 14:16:42 +0400 (ср, 19 окт 2011) | 5 lines
  
    Adjust the PF_ASSERT() macro to what we usually use in the network stack:
    PF_LOCK_ASSERT() and PF_UNLOCK_ASSERT().
  
    r226536 | bz | 2011-10-19 15:04:49 +0400 (ср, 19 окт 2011) | 8 lines
  
    De-virtualize the pf_task_mtx lock.  At the current state of pf locking
    and virtualization it is not helpful but complicates things.
  
    Current state of art is to not virtualize these kinds of locks -
    inp_group/hash/info/.. are all not virtualized either.
  
    r226544 | bz | 2011-10-19 17:13:56 +0400 (ср, 19 окт 2011) | 12 lines
  
    Fix recursive pf locking leading to panics.  Splatter PF_LOCK_ASSERT()s
    to document where we are expecting to be called with a lock held to
    more easily catch unnoticed code paths.
    This does not neccessarily improve locking in pfsync, it just tries
    to avoid the panics reported.
  
    PR:		kern/159390, kern/158873
    Submitted by:	pluknet (at least something that partly resembles
    		my patch ignoring other cleanup, which I only saw
    		too late on the 2nd PR)
  
    r226609 | glebius | 2011-10-21 15:11:18 +0400 (пт, 21 окт 2011) | 4 lines
  
    In FreeBSD ip_output() expects ip_len and ip_off in host byte order
  
    PR:		kern/159029
  
    r226623 | glebius | 2011-10-22 02:28:15 +0400 (сб, 22 окт 2011) | 5 lines
  
    Fix a race: we should update sc_len before dropping the pf lock, otherwise a
    number of packets can be queued on sc, while we are in ip_output(), and then
    we wipe the accumulated sc_len. On next pfsync_sendout() that would lead to
    writing beyond our mbuf cluster.
  
    r226655 | glebius | 2011-10-23 14:05:25 +0400 (вс, 23 окт 2011) | 5 lines
  
    Correct flag for uma_zalloc() is M_WAITOK. M_WAIT is an old and
    deprecated flag from historical mbuf(9) allocator.
  
    This is style only change.
  
    r226656 | glebius | 2011-10-23 14:13:20 +0400 (вс, 23 окт 2011) | 5 lines
  
    Absense of M_WAITOK in malloc flags for UMA doesn't
    equals presense of M_NOWAIT. Specify M_NOWAIT explicitly.
  
    This fixes sleeping with PF_LOCK().
  
    r226660 | glebius | 2011-10-23 18:59:54 +0400 (вс, 23 окт 2011) | 22 lines
  
    Fix from r226623 is not sufficient to close all races in pfsync(4).
  
    The root of problem is re-locking at the end of pfsync_sendout().
    Several functions are calling pfsync_sendout() holding pointers
    to pf data on stack, and these functions expect this data to be
    consistent.
  
    To fix this, the following approach was taken:
  
    - The pfsync_sendout() doesn't call ip_output() directly, but
      enqueues the mbuf on sc->sc_ifp's interfaces queue, that
      is currently unused. Then pfsync netisr is scheduled. PF_LOCK
      isn't dropped in pfsync_sendout().
    - The netisr runs through queue and ip_output()s packets
      on it.
  
    Apart from fixing race, this also decouples stack, fixing
    potential issues, that may happen, when sending pfsync(4)
    packets on input path.
  
    Reviewed by:	eri (a quick review)
  
    r226661 | glebius | 2011-10-23 19:08:18 +0400 (вс, 23 окт 2011) | 13 lines
  
    - Fix a bad typo (FreeBSD specific) in pfsync_bulk_update(). Instead
      of scheduling next run pfsync_bulk_update(), pfsync_bulk_fail()
      was scheduled.
      This lead to instant 100% state leak after first bulk update
      request.
    - After above fix, it appeared that pfsync_bulk_update() lacks
      locking. To fix this, sc_bulk_tmo callout was converted to an
      mtx one. Eventually, all pf/pfsync callouts should be converted
      to mtx version, since it isn't possible to stop or drain a
      non-mtx callout without risk of race.
    - Add comment that callout_stop() in pfsync_clone_destroy() lacks
      locking. Since pfsync0 can't be destroyed (yet), let it be here.
  
    r226662 | glebius | 2011-10-23 19:10:15 +0400 (вс, 23 окт 2011) | 2 lines
  
    Fix indentation, no code changed.
  
    r226663 | glebius | 2011-10-23 19:15:17 +0400 (вс, 23 окт 2011) | 4 lines
  
    Merge several fixes to bulk update processing from OpenBSD. Merged
    revisions: 1.148, 1.149, 1.150. This makes number of states on
    master/slave to be of a sane value.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/contrib/pf/net/if_pflog.c
  stable/9/sys/contrib/pf/net/if_pfsync.c
  stable/9/sys/contrib/pf/net/pf_ioctl.c
  stable/9/sys/contrib/pf/net/pf_table.c
  stable/9/sys/contrib/pf/net/pfvar.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)

Modified: stable/9/sys/contrib/pf/net/if_pflog.c
==============================================================================
--- stable/9/sys/contrib/pf/net/if_pflog.c	Wed Oct 26 17:04:26 2011	(r226800)
+++ stable/9/sys/contrib/pf/net/if_pflog.c	Wed Oct 26 17:09:09 2011	(r226801)
@@ -429,7 +429,7 @@ static moduledata_t pflog_mod = { "pflog
 
 #define PFLOG_MODVER 1
 
-DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
+DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
 MODULE_VERSION(pflog, PFLOG_MODVER);
 MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER);
 #endif /* __FreeBSD__ */

Modified: stable/9/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- stable/9/sys/contrib/pf/net/if_pfsync.c	Wed Oct 26 17:04:26 2011	(r226800)
+++ stable/9/sys/contrib/pf/net/if_pfsync.c	Wed Oct 26 17:09:09 2011	(r226801)
@@ -493,7 +493,7 @@ pfsync_clone_create(struct if_clone *ifc
 	ifp->if_mtu = 1500; /* XXX */
 #ifdef __FreeBSD__
 	callout_init(&sc->sc_tmo, CALLOUT_MPSAFE);
-	callout_init(&sc->sc_bulk_tmo, CALLOUT_MPSAFE);
+	callout_init_mtx(&sc->sc_bulk_tmo, &pf_task_mtx, 0);
 	callout_init(&sc->sc_bulkfail_tmo, CALLOUT_MPSAFE);
 #else
 	ifp->if_hardmtu = MCLBYTES; /* XXX */
@@ -540,7 +540,7 @@ pfsync_clone_destroy(struct ifnet *ifp)
 #ifdef __FreeBSD__
 	EVENTHANDLER_DEREGISTER(ifnet_departure_event, sc->sc_detachtag);
 #endif
-	timeout_del(&sc->sc_bulk_tmo);
+	timeout_del(&sc->sc_bulk_tmo);	/* XXX: need PF_LOCK() before */
 	timeout_del(&sc->sc_tmo);
 #if NCARP > 0
 #ifdef notyet
@@ -714,6 +714,8 @@ pfsync_state_import(struct pfsync_state 
 	int pool_flags;
 	int error;
 
+	PF_LOCK_ASSERT();
+
 #ifdef __FreeBSD__
 	if (sp->creatorid == 0 && V_pf_status.debug >= PF_DEBUG_MISC) {
 #else
@@ -760,7 +762,7 @@ pfsync_state_import(struct pfsync_state 
 	if (flags & PFSYNC_SI_IOCTL)
 		pool_flags = PR_WAITOK | PR_ZERO;
 	else
-		pool_flags = PR_ZERO;
+		pool_flags = PR_NOWAIT | PR_ZERO;
 
 	if ((st = pool_get(&V_pf_state_pl, pool_flags)) == NULL)
 		goto cleanup;
@@ -854,7 +856,11 @@ pfsync_state_import(struct pfsync_state 
 		CLR(st->state_flags, PFSTATE_NOSYNC);
 		if (ISSET(st->state_flags, PFSTATE_ACK)) {
 			pfsync_q_ins(st, PFSYNC_S_IACK);
+#ifdef __FreeBSD__
+			pfsync_sendout();
+#else
 			schednetisr(NETISR_PFSYNC);
+#endif
 		}
 	}
 	CLR(st->state_flags, PFSTATE_ACK);
@@ -1310,7 +1316,11 @@ pfsync_in_upd(struct pfsync_pkt *pkt, st
 			V_pfsyncstats.pfsyncs_stale++;
 
 			pfsync_update_state(st);
+#ifdef __FreeBSD__
+			pfsync_sendout();
+#else
 			schednetisr(NETISR_PFSYNC);
+#endif
 			continue;
 		}
 		pfsync_alloc_scrub_memory(&sp->dst, &st->dst);
@@ -1416,7 +1426,11 @@ pfsync_in_upd_c(struct pfsync_pkt *pkt, 
 			V_pfsyncstats.pfsyncs_stale++;
 
 			pfsync_update_state(st);
+#ifdef __FreeBSD__
+			pfsync_sendout();
+#else
 			schednetisr(NETISR_PFSYNC);
+#endif
 			continue;
 		}
 		pfsync_alloc_scrub_memory(&up->dst, &st->dst);
@@ -1469,7 +1483,9 @@ pfsync_in_ureq(struct pfsync_pkt *pkt, s
 			if (ISSET(st->state_flags, PFSTATE_NOSYNC))
 				continue;
 
+			PF_LOCK();
 			pfsync_update_state_req(st);
+			PF_UNLOCK();
 		}
 	}
 
@@ -1558,7 +1574,7 @@ pfsync_in_del_c(struct pfsync_pkt *pkt, 
 		pf_unlink_state(st);
 	}
 #ifdef __FreeBSD__
-	PF_LOCK();
+	PF_UNLOCK();
 #endif
 	splx(s);
 
@@ -1955,7 +1971,11 @@ pfsyncioctl(struct ifnet *ifp, u_long cm
 		ip->ip_hl = sizeof(sc->sc_template) >> 2;
 		ip->ip_tos = IPTOS_LOWDELAY;
 		/* len and id are set later */
+#ifdef __FreeBSD__
+		ip->ip_off = IP_DF;
+#else
 		ip->ip_off = htons(IP_DF);
+#endif
 		ip->ip_ttl = PFSYNC_DFLTTL;
 		ip->ip_p = IPPROTO_PFSYNC;
 		ip->ip_src.s_addr = INADDR_ANY;
@@ -1986,8 +2006,8 @@ pfsyncioctl(struct ifnet *ifp, u_long cm
 #endif
 				printf("pfsync: requesting bulk update\n");
 #ifdef __FreeBSD__
-				callout_reset(&sc->sc_bulkfail_tmo, 5 * hz,
-				    pfsync_bulk_fail, V_pfsyncif);
+			callout_reset(&sc->sc_bulkfail_tmo, 5 * hz,
+			    pfsync_bulk_fail, V_pfsyncif);
 #else
 			timeout_add_sec(&sc->sc_bulkfail_tmo, 5);
 #endif
@@ -2138,12 +2158,13 @@ pfsync_sendout(void)
 #endif
 #ifdef __FreeBSD__
 	size_t pktlen;
+	int dummy_error;
 #endif
 	int offset;
 	int q, count = 0;
 
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #else
 	splassert(IPL_NET);
 #endif
@@ -2207,7 +2228,11 @@ pfsync_sendout(void)
 	bcopy(&sc->sc_template, ip, sizeof(*ip));
 	offset = sizeof(*ip);
 
+#ifdef __FreeBSD__
+	ip->ip_len = m->m_pkthdr.len;
+#else
 	ip->ip_len = htons(m->m_pkthdr.len);
+#endif
 	ip->ip_id = htons(ip_randomid());
 
 	/* build the pfsync header */
@@ -2337,35 +2362,22 @@ pfsync_sendout(void)
 #ifdef __FreeBSD__
 	sc->sc_ifp->if_opackets++;
 	sc->sc_ifp->if_obytes += m->m_pkthdr.len;
+	sc->sc_len = PFSYNC_MINPKT;
+
+	IFQ_ENQUEUE(&sc->sc_ifp->if_snd, m, dummy_error);
+	schednetisr(NETISR_PFSYNC);
 #else
 	sc->sc_if.if_opackets++;
 	sc->sc_if.if_obytes += m->m_pkthdr.len;
-#endif
 
-#ifdef __FreeBSD__
-	PF_UNLOCK();
-#endif
 	if (ip_output(m, NULL, NULL, IP_RAWOUTPUT, &sc->sc_imo, NULL) == 0)
-#ifdef __FreeBSD__
-	{
-		PF_LOCK();
-#endif
-		V_pfsyncstats.pfsyncs_opackets++;
-#ifdef __FreeBSD__
-	}
-#endif
+		pfsyncstats.pfsyncs_opackets++;
 	else
-#ifdef __FreeBSD__
-	{
-		PF_LOCK();
-#endif
-		V_pfsyncstats.pfsyncs_oerrors++;
-#ifdef __FreeBSD__
-	}
-#endif
+		pfsyncstats.pfsyncs_oerrors++;
 
 	/* start again */
 	sc->sc_len = PFSYNC_MINPKT;
+#endif
 }
 
 void
@@ -2378,7 +2390,7 @@ pfsync_insert_state(struct pf_state *st)
 #endif
 
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #else
 	splassert(IPL_SOFTNET);
 #endif
@@ -2412,7 +2424,11 @@ pfsync_insert_state(struct pf_state *st)
 	pfsync_q_ins(st, PFSYNC_S_INS);
 
 	if (ISSET(st->state_flags, PFSTATE_ACK))
+#ifdef __FreeBSD__
+		pfsync_sendout();
+#else
 		schednetisr(NETISR_PFSYNC);
+#endif
 	else
 		st->sync_updates = 0;
 }
@@ -2430,7 +2446,7 @@ pfsync_defer(struct pf_state *st, struct
 	struct pfsync_deferral *pd;
 
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #else
 	splassert(IPL_SOFTNET);
 #endif
@@ -2477,7 +2493,7 @@ pfsync_undefer(struct pfsync_deferral *p
 	int s;
 
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #else
 	splassert(IPL_SOFTNET);
 #endif
@@ -2560,7 +2576,7 @@ pfsync_update_state(struct pf_state *st)
 	int sync = 0;
 
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #else
 	splassert(IPL_SOFTNET);
 #endif
@@ -2609,7 +2625,11 @@ pfsync_update_state(struct pf_state *st)
 
 	if (sync || (time_second - st->pfsync_time) < 2) {
 		pfsync_upds++;
+#ifdef __FreeBSD__
+		pfsync_sendout();
+#else
 		schednetisr(NETISR_PFSYNC);
+#endif
 	}
 }
 
@@ -2625,6 +2645,8 @@ pfsync_request_update(u_int32_t creatori
 	size_t nlen = sizeof(struct pfsync_upd_req);
 	int s;
 
+	PF_LOCK_ASSERT();
+
 	/*
 	 * this code does nothing to prevent multiple update requests for the
 	 * same state being generated.
@@ -2658,7 +2680,11 @@ pfsync_request_update(u_int32_t creatori
 	TAILQ_INSERT_TAIL(&sc->sc_upd_req_list, item, ur_entry);
 	sc->sc_len += nlen;
 
+#ifdef __FreeBSD__
+	pfsync_sendout();
+#else
 	schednetisr(NETISR_PFSYNC);
+#endif
 }
 
 void
@@ -2670,6 +2696,8 @@ pfsync_update_state_req(struct pf_state 
 	struct pfsync_softc *sc = pfsyncif;
 #endif
 
+	PF_LOCK_ASSERT();
+
 	if (sc == NULL)
 		panic("pfsync_update_state_req: nonexistant instance");
 
@@ -2685,7 +2713,11 @@ pfsync_update_state_req(struct pf_state 
 		pfsync_q_del(st);
 	case PFSYNC_S_NONE:
 		pfsync_q_ins(st, PFSYNC_S_UPD);
+#ifdef __FreeBSD__
+		pfsync_sendout();
+#else
 		schednetisr(NETISR_PFSYNC);
+#endif
 		return;
 
 	case PFSYNC_S_INS:
@@ -2710,7 +2742,7 @@ pfsync_delete_state(struct pf_state *st)
 #endif
 
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #else
 	splassert(IPL_SOFTNET);
 #endif
@@ -2771,7 +2803,7 @@ pfsync_clear_states(u_int32_t creatorid,
 #endif
 
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #else
 	splassert(IPL_SOFTNET);
 #endif
@@ -2801,6 +2833,8 @@ pfsync_q_ins(struct pf_state *st, int q)
 	size_t nlen = pfsync_qs[q].len;
 	int s;
 
+	PF_LOCK_ASSERT();
+
 #ifdef __FreeBSD__
 	KASSERT(st->sync_state == PFSYNC_S_NONE,
 		("%s: st->sync_state == PFSYNC_S_NONE", __FUNCTION__));
@@ -2825,13 +2859,7 @@ pfsync_q_ins(struct pf_state *st, int q)
 	if (sc->sc_len + nlen > sc->sc_if.if_mtu) {
 #endif
 		s = splnet();
-#ifdef __FreeBSD__
-		PF_LOCK();
-#endif
 		pfsync_sendout();
-#ifdef __FreeBSD__
-		PF_UNLOCK();
-#endif
 		splx(s);
 
 		nlen = sizeof(struct pfsync_subheader) + pfsync_qs[q].len;
@@ -2888,7 +2916,9 @@ pfsync_update_tdb(struct tdb *t, int out
 
 		if (sc->sc_len + nlen > sc->sc_if.if_mtu) {
 			s = splnet();
+			PF_LOCK();
 			pfsync_sendout();
+			PF_UNLOCK();
 			splx(s);
 
 			nlen = sizeof(struct pfsync_subheader) +
@@ -2974,25 +3004,37 @@ pfsync_bulk_start(void)
 	struct pfsync_softc *sc = pfsyncif;
 #endif
 
-	sc->sc_ureq_received = time_uptime;
-
-	if (sc->sc_bulk_next == NULL)
 #ifdef __FreeBSD__
-		sc->sc_bulk_next = TAILQ_FIRST(&V_state_list);
+	if (V_pf_status.debug >= PF_DEBUG_MISC)
 #else
-		sc->sc_bulk_next = TAILQ_FIRST(&state_list);
+	if (pf_status.debug >= PF_DEBUG_MISC)
 #endif
-	sc->sc_bulk_last = sc->sc_bulk_next;
+		printf("pfsync: received bulk update request\n");
 
 #ifdef __FreeBSD__
-	if (V_pf_status.debug >= PF_DEBUG_MISC)
+	PF_LOCK();
+	if (TAILQ_EMPTY(&V_state_list))
 #else
-	if (pf_status.debug >= PF_DEBUG_MISC)
+	if (TAILQ_EMPTY(&state_list))
 #endif
-		printf("pfsync: received bulk update request\n");
+		pfsync_bulk_status(PFSYNC_BUS_END);
+	else {
+		sc->sc_ureq_received = time_uptime;
+		if (sc->sc_bulk_next == NULL)
+#ifdef __FreeBSD__
+			sc->sc_bulk_next = TAILQ_FIRST(&V_state_list);
+#else
+			sc->sc_bulk_next = TAILQ_FIRST(&state_list);
+#endif
+			sc->sc_bulk_last = sc->sc_bulk_next;
 
-	pfsync_bulk_status(PFSYNC_BUS_START);
-	pfsync_bulk_update(sc);
+			pfsync_bulk_status(PFSYNC_BUS_START);
+			callout_reset(&sc->sc_bulk_tmo, 1,
+			    pfsync_bulk_update, sc);
+	}
+#ifdef __FreeBSD__
+	PF_UNLOCK();
+#endif
 }
 
 void
@@ -3003,12 +3045,13 @@ pfsync_bulk_update(void *arg)
 	int i = 0;
 	int s;
 
+	PF_LOCK_ASSERT();
+
 	s = splsoftnet();
 #ifdef __FreeBSD__
 	CURVNET_SET(sc->sc_ifp->if_vnet);
-	PF_LOCK();
 #endif
-	do {
+	for (;;) {
 		if (st->sync_state == PFSYNC_S_NONE &&
 		    st->timeout < PFTM_MAX &&
 		    st->pfsync_time <= sc->sc_ureq_received) {
@@ -3024,26 +3067,33 @@ pfsync_bulk_update(void *arg)
 			st = TAILQ_FIRST(&state_list);
 #endif
 
-		if (i > 0 && TAILQ_EMPTY(&sc->sc_qs[PFSYNC_S_UPD])) {
+		if (st == sc->sc_bulk_last) {
+			/* we're done */
+			sc->sc_bulk_next = NULL;
+			sc->sc_bulk_last = NULL;
+			pfsync_bulk_status(PFSYNC_BUS_END);
+			break;
+		}
+
+#ifdef __FreeBSD__
+		if (i > 1 && (sc->sc_ifp->if_mtu - sc->sc_len) <
+#else
+		if (i > 1 && (sc->sc_if.if_mtu - sc->sc_len) <
+#endif
+		    sizeof(struct pfsync_state)) {
+			/* we've filled a packet */
 			sc->sc_bulk_next = st;
 #ifdef __FreeBSD__
 			callout_reset(&sc->sc_bulk_tmo, 1,
-			    pfsync_bulk_fail, sc);
+			    pfsync_bulk_update, sc);
 #else
 			timeout_add(&sc->sc_bulk_tmo, 1);
 #endif
-			goto out;
+			break;
 		}
-	} while (st != sc->sc_bulk_last);
-
-	/* we're done */
-	sc->sc_bulk_next = NULL;
-	sc->sc_bulk_last = NULL;
-	pfsync_bulk_status(PFSYNC_BUS_END);
+	}
 
-out:
 #ifdef __FreeBSD__
-	PF_UNLOCK();
 	CURVNET_RESTORE();
 #endif
 	splx(s);
@@ -3063,6 +3113,8 @@ pfsync_bulk_status(u_int8_t status)
 	struct pfsync_softc *sc = pfsyncif;
 #endif
 
+	PF_LOCK_ASSERT();
+
 	bzero(&r, sizeof(r));
 
 	r.subh.action = PFSYNC_ACT_BUS;
@@ -3096,7 +3148,9 @@ pfsync_bulk_fail(void *arg)
 #else
 		timeout_add_sec(&sc->sc_bulkfail_tmo, 5);
 #endif
+		PF_LOCK();
 		pfsync_request_update(0, 0);
+		PF_UNLOCK();
 	} else {
 		/* Pretend like the transfer was ok */
 		sc->sc_ureq_sent = 0;
@@ -3139,19 +3193,15 @@ pfsync_send_plus(void *plus, size_t plus
 #endif
 	int s;
 
+	PF_LOCK_ASSERT();
+
 #ifdef __FreeBSD__
 	if (sc->sc_len + pluslen > sc->sc_ifp->if_mtu) {
 #else
 	if (sc->sc_len + pluslen > sc->sc_if.if_mtu) {
 #endif
 		s = splnet();
-#ifdef __FreeBSD__
-		PF_LOCK();
-#endif
 		pfsync_sendout();
-#ifdef __FreeBSD__
-		PF_UNLOCK();
-#endif
 		splx(s);
 	}
 
@@ -3159,13 +3209,7 @@ pfsync_send_plus(void *plus, size_t plus
 	sc->sc_len += (sc->sc_pluslen = pluslen);
 
 	s = splnet();
-#ifdef __FreeBSD__
-	PF_LOCK();
-#endif
 	pfsync_sendout();
-#ifdef __FreeBSD__
-	PF_UNLOCK();
-#endif
 	splx(s);
 }
 
@@ -3200,13 +3244,12 @@ pfsync_state_in_use(struct pf_state *st)
 	if (sc == NULL)
 		return (0);
 
-	if (st->sync_state != PFSYNC_S_NONE)
+	if (st->sync_state != PFSYNC_S_NONE ||
+	    st == sc->sc_bulk_next ||
+	    st == sc->sc_bulk_last)
 		return (1);
 
-	if (sc->sc_bulk_next == NULL && sc->sc_bulk_last == NULL)
-		return (0);
-
-	return (1);
+	return (0);
 }
 
 u_int pfsync_ints;
@@ -3245,37 +3288,38 @@ pfsync_timeout(void *arg)
 void
 #ifdef __FreeBSD__
 pfsyncintr(void *arg)
+{
+	struct pfsync_softc *sc = arg;
+	struct mbuf *m;
+
+	CURVNET_SET(sc->sc_ifp->if_vnet);
+	pfsync_ints++;
+
+	for (;;) {
+		IF_DEQUEUE(&sc->sc_ifp->if_snd, m);
+		if (m == 0)
+			break;
+
+		if (ip_output(m, NULL, NULL, IP_RAWOUTPUT, &sc->sc_imo, NULL)
+		    == 0)
+			V_pfsyncstats.pfsyncs_opackets++;
+		else
+			V_pfsyncstats.pfsyncs_oerrors++;
+	}
+	CURVNET_RESTORE();
+}
 #else
 pfsyncintr(void)
-#endif
 {
-#ifdef __FreeBSD__
-	struct pfsync_softc *sc = arg;
-#endif
 	int s;
 
-#ifdef __FreeBSD__
-	if (sc == NULL)
-		return;
-
-	CURVNET_SET(sc->sc_ifp->if_vnet);
-#endif
 	pfsync_ints++;
 
 	s = splnet();
-#ifdef __FreeBSD__
-	PF_LOCK();
-#endif
 	pfsync_sendout();
-#ifdef __FreeBSD__
-	PF_UNLOCK();
-#endif
 	splx(s);
-
-#ifdef __FreeBSD__
-	CURVNET_RESTORE();
-#endif
 }
+#endif
 
 int
 pfsync_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
@@ -3380,7 +3424,7 @@ vnet_pfsync_uninit(const void *unused)
 }
 
 /* Define startup order. */
-#define	PFSYNC_SYSINIT_ORDER	SI_SUB_PROTO_BEGIN
+#define	PFSYNC_SYSINIT_ORDER	SI_SUB_PROTO_IF
 #define	PFSYNC_MODEVENT_ORDER	(SI_ORDER_FIRST) /* On boot slot in here. */
 #define	PFSYNC_VNET_ORDER	(PFSYNC_MODEVENT_ORDER + 2) /* Later still. */
 
@@ -3430,7 +3474,7 @@ static moduledata_t pfsync_mod = {
 
 #define PFSYNC_MODVER 1
 
-DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
+DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
 MODULE_VERSION(pfsync, PFSYNC_MODVER);
 MODULE_DEPEND(pfsync, pf, PF_MODVER, PF_MODVER, PF_MODVER);
 #endif /* __FreeBSD__ */

Modified: stable/9/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf_ioctl.c	Wed Oct 26 17:04:26 2011	(r226800)
+++ stable/9/sys/contrib/pf/net/pf_ioctl.c	Wed Oct 26 17:09:09 2011	(r226801)
@@ -266,7 +266,7 @@ static struct cdevsw pf_cdevsw = {
 static volatile VNET_DEFINE(int, pf_pfil_hooked);
 #define V_pf_pfil_hooked	VNET(pf_pfil_hooked)
 VNET_DEFINE(int,		pf_end_threads);
-VNET_DEFINE(struct mtx,		pf_task_mtx);
+struct mtx			pf_task_mtx;
 
 /* pfsync */
 pfsync_state_import_t 		*pfsync_state_import_ptr = NULL;
@@ -287,18 +287,18 @@ SYSCTL_VNET_INT(_debug, OID_AUTO, pfugid
 	&VNET_NAME(debug_pfugidhack), 0,
 	"Enable/disable pf user/group rules mpsafe hack");
 
-void
+static void
 init_pf_mutex(void)
 {
 
-	mtx_init(&V_pf_task_mtx, "pf task mtx", NULL, MTX_DEF);
+	mtx_init(&pf_task_mtx, "pf task mtx", NULL, MTX_DEF);
 }
 
-void
+static void
 destroy_pf_mutex(void)
 {
 
-	mtx_destroy(&V_pf_task_mtx);
+	mtx_destroy(&pf_task_mtx);
 }
 void
 init_zone_var(void)
@@ -4259,7 +4259,7 @@ hook_pf(void)
 	struct pfil_head *pfh_inet6;
 #endif
 
-	PF_ASSERT(MA_NOTOWNED);
+	PF_UNLOCK_ASSERT();
 
 	if (V_pf_pfil_hooked)
 		return (0); 
@@ -4300,7 +4300,7 @@ dehook_pf(void)
 	struct pfil_head *pfh_inet6;
 #endif
 
-	PF_ASSERT(MA_NOTOWNED);
+	PF_UNLOCK_ASSERT();
 
 	if (V_pf_pfil_hooked == 0)
 		return (0);
@@ -4381,11 +4381,8 @@ pf_load(void)
 
 	init_zone_var();
 	sx_init(&V_pf_consistency_lock, "pf_statetbl_lock");
-	init_pf_mutex();
-	if (pfattach() < 0) {
-		destroy_pf_mutex();
+	if (pfattach() < 0)
 		return (ENOMEM);
-	}
 
 	return (0);
 }
@@ -4413,14 +4410,13 @@ pf_unload(void)
 	V_pf_end_threads = 1;
 	while (V_pf_end_threads < 2) {
 		wakeup_one(pf_purge_thread);
-		msleep(pf_purge_thread, &V_pf_task_mtx, 0, "pftmo", hz);
+		msleep(pf_purge_thread, &pf_task_mtx, 0, "pftmo", hz);
 	}
 	pfi_cleanup();
 	pf_osfp_flush();
 	pf_osfp_cleanup();
 	cleanup_pf_zone();
 	PF_UNLOCK();
-	destroy_pf_mutex();
 	sx_destroy(&V_pf_consistency_lock);
 	return error;
 }
@@ -4432,10 +4428,12 @@ pf_modevent(module_t mod, int type, void
 
 	switch(type) {
 	case MOD_LOAD:
+		init_pf_mutex();
 		pf_dev = make_dev(&pf_cdevsw, 0, 0, 0, 0600, PF_NAME);
 		break;
 	case MOD_UNLOAD:
 		destroy_dev(pf_dev);
+		destroy_pf_mutex();
 		break;
 	default:
 		error = EINVAL;
@@ -4450,6 +4448,6 @@ static moduledata_t pf_mod = {
 	0
 };
 
-DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST);
+DECLARE_MODULE(pf, pf_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST);
 MODULE_VERSION(pf, PF_MODVER);
 #endif /* __FreeBSD__ */

Modified: stable/9/sys/contrib/pf/net/pf_table.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf_table.c	Wed Oct 26 17:04:26 2011	(r226800)
+++ stable/9/sys/contrib/pf/net/pf_table.c	Wed Oct 26 17:09:09 2011	(r226801)
@@ -906,7 +906,7 @@ pfr_lookup_addr(struct pfr_ktable *kt, s
 		pfr_prepare_network(&mask, ad->pfra_af, ad->pfra_net);
 		s = splsoftnet(); /* rn_lookup makes use of globals */
 #ifdef __FreeBSD__
-		PF_ASSERT(MA_OWNED);
+		PF_LOCK_ASSERT();
 #endif
 		ke = (struct pfr_kentry *)rn_lookup(&sa, &mask, head);
 		splx(s);
@@ -1127,7 +1127,7 @@ pfr_route_kentry(struct pfr_ktable *kt, 
 
 	s = splsoftnet();
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #endif
 	if (KENTRY_NETWORK(ke)) {
 		pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net);
@@ -1166,7 +1166,7 @@ pfr_unroute_kentry(struct pfr_ktable *kt
 
 	s = splsoftnet();
 #ifdef __FreeBSD__
-	PF_ASSERT(MA_OWNED);
+	PF_LOCK_ASSERT();
 #endif
 	if (KENTRY_NETWORK(ke)) {
 		pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net);

Modified: stable/9/sys/contrib/pf/net/pfvar.h
==============================================================================
--- stable/9/sys/contrib/pf/net/pfvar.h	Wed Oct 26 17:04:26 2011	(r226800)
+++ stable/9/sys/contrib/pf/net/pfvar.h	Wed Oct 26 17:09:09 2011	(r226801)
@@ -222,7 +222,7 @@ struct pfi_dynaddr {
 #define	PF_NAME		"pf"
 
 #define	PR_NOWAIT	M_NOWAIT
-#define	PR_WAITOK	M_WAIT
+#define	PR_WAITOK	M_WAITOK
 #define	PR_ZERO		M_ZERO
 #define	pool_get(p, f)	uma_zalloc(*(p), (f))
 #define	pool_put(p, o)	uma_zfree(*(p), (o))
@@ -237,33 +237,25 @@ struct pfi_dynaddr {
 		uma_zdestroy(var)
 
 #ifdef __FreeBSD__
-VNET_DECLARE(struct mtx,	 pf_task_mtx);
-#define	V_pf_task_mtx		 VNET(pf_task_mtx)
-
-#define	PF_ASSERT(h)	mtx_assert(&V_pf_task_mtx, (h))
-
-#define	PF_LOCK()	do {				\
-	PF_ASSERT(MA_NOTOWNED);				\
-	mtx_lock(&V_pf_task_mtx);			\
-} while(0)
-#define	PF_UNLOCK()	do {				\
-	PF_ASSERT(MA_OWNED);				\
-	mtx_unlock(&V_pf_task_mtx);			\
-} while(0)
-#else
 extern struct mtx pf_task_mtx;
 
-#define	PF_ASSERT(h)	mtx_assert(&pf_task_mtx, (h))
+#define	PF_LOCK_ASSERT()	mtx_assert(&pf_task_mtx, MA_OWNED)
+#define	PF_UNLOCK_ASSERT()	mtx_assert(&pf_task_mtx, MA_NOTOWNED)
 
 #define	PF_LOCK()	do {				\
-	PF_ASSERT(MA_NOTOWNED);				\
+	PF_UNLOCK_ASSERT();				\
 	mtx_lock(&pf_task_mtx);				\
 } while(0)
 #define	PF_UNLOCK()	do {				\
-	PF_ASSERT(MA_OWNED);				\
+	PF_LOCK_ASSERT();				\
 	mtx_unlock(&pf_task_mtx);			\
 } while(0)
-#endif
+#else
+#define	PF_LOCK_ASSERT()
+#define	PF_UNLOCK_ASSERT()
+#define	PF_LOCK()
+#define	PF_UNLOCK()
+#endif /* __FreeBSD__ */
 
 #define	PF_COPYIN(uaddr, kaddr, len, r)		do {	\
 	PF_UNLOCK();					\
@@ -277,9 +269,6 @@ extern struct mtx pf_task_mtx;
 	PF_LOCK();					\
 } while(0)
 
-extern void init_pf_mutex(void);
-extern void destroy_pf_mutex(void);
-
 #define	PF_MODVER	1
 #define	PFLOG_MODVER	1
 #define	PFSYNC_MODVER	1

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 19:45:21 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4213C1065670;
	Wed, 26 Oct 2011 19:45:21 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 283C78FC08;
	Wed, 26 Oct 2011 19:45:21 +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 p9QJjLAI064698;
	Wed, 26 Oct 2011 19:45:21 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QJjKq6064692;
	Wed, 26 Oct 2011 19:45:20 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <201110261945.p9QJjKq6064692@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Wed, 26 Oct 2011 19:45: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: r226809 - in stable/9/sys: amd64/conf i386/conf
	ia64/conf powerpc/conf sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 19:45:21 -0000

Author: kensmith
Date: Wed Oct 26 19:45:20 2011
New Revision: 226809
URL: http://svn.freebsd.org/changeset/base/226809

Log:
  MFC r226510,r226547:
  Comment out sbp(4) because it appears to cause boot failure on some
  systems.  Add comment explaining why sbp(4) is commented out.
  
  It was a mistake on my part to omit powerpc's GENERIC for r226510.
  But when I noticed the mistake I checked with the powerpc maintainer
  to see if I should correct the mistake Marcel said he'd prefer it be
  left as-is.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/amd64/conf/GENERIC
  stable/9/sys/i386/conf/GENERIC
  stable/9/sys/ia64/conf/GENERIC
  stable/9/sys/powerpc/conf/GENERIC
  stable/9/sys/sparc64/conf/GENERIC
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)

Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC	Wed Oct 26 19:07:36 2011	(r226808)
+++ stable/9/sys/amd64/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
@@ -320,7 +320,8 @@ device		zyd		# ZyDAS zd1211/zd1211b wire
 
 # FireWire support
 device		firewire	# FireWire bus code
-device		sbp		# SCSI over FireWire (Requires scbus and da)
+# sbp(4) works for some systems but causes boot failure on others
+#device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 device		fwip		# IP over FireWire (RFC 2734,3146)
 device		dcons		# Dumb console driver

Modified: stable/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC	Wed Oct 26 19:07:36 2011	(r226808)
+++ stable/9/sys/i386/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
@@ -333,7 +333,8 @@ device		zyd		# ZyDAS zd1211/zd1211b wire
 
 # FireWire support
 device		firewire	# FireWire bus code
-device		sbp		# SCSI over FireWire (Requires scbus and da)
+# sbp(4) works for some systems but causes boot failure on others
+#device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 device		fwip		# IP over FireWire (RFC 2734,3146)
 device		dcons		# Dumb console driver

Modified: stable/9/sys/ia64/conf/GENERIC
==============================================================================
--- stable/9/sys/ia64/conf/GENERIC	Wed Oct 26 19:07:36 2011	(r226808)
+++ stable/9/sys/ia64/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
@@ -166,7 +166,8 @@ device		uvscom		# USB serial support for
 
 # FireWire support
 device		fwip		# IP over FireWire (RFC 2734,3146)
-device		sbp		# SCSI over FireWire (need scbus & da)
+# sbp(4) works for some systems but causes boot failure on others
+#device		sbp		# SCSI over FireWire (need scbus & da)
 
 # Various (pseudo) devices
 device		ether		# Ethernet support

Modified: stable/9/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/9/sys/powerpc/conf/GENERIC	Wed Oct 26 19:07:36 2011	(r226808)
+++ stable/9/sys/powerpc/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
@@ -161,6 +161,7 @@ device		kue		# Kawasaki LSI USB Ethernet
 
 # FireWire support
 device		firewire	# FireWire bus code
+# sbp(4) works for some systems but causes boot failure on others
 device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 

Modified: stable/9/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/9/sys/sparc64/conf/GENERIC	Wed Oct 26 19:07:36 2011	(r226808)
+++ stable/9/sys/sparc64/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
@@ -250,7 +250,8 @@ device		zyd		# ZyDAS zd1211/zd1211b wire
 
 # FireWire support
 device		firewire	# FireWire bus code
-device		sbp		# SCSI over FireWire (Requires scbus and da)
+# sbp(4) works for some systems but causes boot failure on others
+#device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 device		fwip		# IP over FireWire (RFC 2734,3146)
 device		dcons		# Dumb console driver

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 19:59:07 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B80A106566B;
	Wed, 26 Oct 2011 19:59:07 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A0ED8FC14;
	Wed, 26 Oct 2011 19:59: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 p9QJx7gl065197;
	Wed, 26 Oct 2011 19:59:07 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QJx7ci065190;
	Wed, 26 Oct 2011 19:59:07 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <201110261959.p9QJx7ci065190@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Wed, 26 Oct 2011 19:59:07 +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: r226810 - in stable/9/sys: amd64/conf i386/conf
	ia64/conf pc98/conf powerpc/conf sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 19:59:07 -0000

Author: kensmith
Date: Wed Oct 26 19:59:06 2011
New Revision: 226810
URL: http://svn.freebsd.org/changeset/base/226810

Log:
  I forgot we now leave KDB and KDB_TRACE options in stable kernel config
  files to help provide stack traces during a panic.
  
  Submitted by:	Sergey Kandaurov <pluknet at freebsd dot org>
  Approved by:	re (implicit)

Modified:
  stable/9/sys/amd64/conf/GENERIC
  stable/9/sys/i386/conf/GENERIC
  stable/9/sys/ia64/conf/GENERIC
  stable/9/sys/pc98/conf/GENERIC
  stable/9/sys/powerpc/conf/GENERIC
  stable/9/sys/sparc64/conf/GENERIC

Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
+++ stable/9/sys/amd64/conf/GENERIC	Wed Oct 26 19:59:06 2011	(r226810)
@@ -64,6 +64,8 @@ options 	MAC			# TrustedBSD MAC Framewor
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+options		KDB			# Kernel debugger related code
+options		KDB_TRACE		# Print a stack trace for a panic
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
+++ stable/9/sys/i386/conf/GENERIC	Wed Oct 26 19:59:06 2011	(r226810)
@@ -64,6 +64,8 @@ options 	AUDIT			# Security event auditi
 options 	MAC			# TrustedBSD MAC Framework
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+options		KDB			# Kernel debugger related code
+options		KDB_TRACE		# Print a stack trace for a panic
 
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/ia64/conf/GENERIC
==============================================================================
--- stable/9/sys/ia64/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
+++ stable/9/sys/ia64/conf/GENERIC	Wed Oct 26 19:59:06 2011	(r226810)
@@ -59,6 +59,8 @@ options 	UFS_ACL		# Support for access c
 options 	UFS_DIRHASH	# Hash-based directory lookup scheme
 options 	UFS_GJOURNAL	# Enable gjournal-based UFS journaling
 options 	_KPOSIX_PRIORITY_SCHEDULING	# Posix P1003_1B RT extensions
+options		KDB		# Kernel debugger related code
+options		KDB_TRACE	# Print a stack trace for a panic
 
 # Various "busses"
 device		firewire	# FireWire bus code

Modified: stable/9/sys/pc98/conf/GENERIC
==============================================================================
--- stable/9/sys/pc98/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
+++ stable/9/sys/pc98/conf/GENERIC	Wed Oct 26 19:59:06 2011	(r226810)
@@ -65,6 +65,8 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+options		KDB			# Kernel debugger related code
+options		KDB_TRACE		# Print a stack trace for a panic
 
 # To make an SMP kernel, the next two lines are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/9/sys/powerpc/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
+++ stable/9/sys/powerpc/conf/GENERIC	Wed Oct 26 19:59:06 2011	(r226810)
@@ -66,6 +66,8 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+options		KDB			# Kernel debugger related code
+options		KDB_TRACE		# Print a stack trace for a panic
 
 # To make an SMP kernel, the next line is needed
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/9/sys/sparc64/conf/GENERIC	Wed Oct 26 19:45:20 2011	(r226809)
+++ stable/9/sys/sparc64/conf/GENERIC	Wed Oct 26 19:59:06 2011	(r226810)
@@ -62,6 +62,8 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
+options		KDB			# Kernel debugger related code
+options		KDB_TRACE		# Print a stack trace for a panic
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 20:01:43 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5E4C106564A;
	Wed, 26 Oct 2011 20:01:43 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D4E8B8FC12;
	Wed, 26 Oct 2011 20:01: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 p9QK1hqe065363;
	Wed, 26 Oct 2011 20:01:43 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QK1h19065361;
	Wed, 26 Oct 2011 20:01:43 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201110262001.p9QK1h19065361@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 26 Oct 2011 20: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: r226811 - stable/9/usr.sbin/freebsd-update
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 20:01:44 -0000

Author: cperciva
Date: Wed Oct 26 20:01:43 2011
New Revision: 226811
URL: http://svn.freebsd.org/changeset/base/226811

Log:
  MFC r226650: Make freebsd-update work with FreeBSD 9.0.
  
  Approved by:	re (kib)

Modified:
  stable/9/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/9/usr.sbin/freebsd-update/   (props changed)

Modified: stable/9/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/9/usr.sbin/freebsd-update/freebsd-update.sh	Wed Oct 26 19:59:06 2011	(r226810)
+++ stable/9/usr.sbin/freebsd-update/freebsd-update.sh	Wed Oct 26 20:01:43 2011	(r226811)
@@ -1200,7 +1200,7 @@ fetch_metadata_sanity () {
 	# Some aliases to save space later: ${P} is a character which can
 	# appear in a path; ${M} is the four numeric metadata fields; and
 	# ${H} is a sha256 hash.
-	P="[-+./:=_[[:alnum:]]"
+	P="[-+./:=%@_[[:alnum:]]"
 	M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
 	H="[0-9a-f]{64}"
 

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 20:06:28 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11BA9106564A;
	Wed, 26 Oct 2011 20:06:28 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 00D9E8FC15;
	Wed, 26 Oct 2011 20:06: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 p9QK6RCr065534;
	Wed, 26 Oct 2011 20:06:27 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QK6RkZ065532;
	Wed, 26 Oct 2011 20:06:27 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201110262006.p9QK6RkZ065532@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 26 Oct 2011 20:06:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226812 - stable/8/usr.sbin/freebsd-update
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 20:06:28 -0000

Author: cperciva
Date: Wed Oct 26 20:06:27 2011
New Revision: 226812
URL: http://svn.freebsd.org/changeset/base/226812

Log:
  MFC r226650: Make freebsd-update work with FreeBSD 9.0.  (In particular,
  this will simplify upgrading from 8.3-RELEASE to 9.x.)

Modified:
  stable/8/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/8/usr.sbin/freebsd-update/   (props changed)

Modified: stable/8/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/8/usr.sbin/freebsd-update/freebsd-update.sh	Wed Oct 26 20:01:43 2011	(r226811)
+++ stable/8/usr.sbin/freebsd-update/freebsd-update.sh	Wed Oct 26 20:06:27 2011	(r226812)
@@ -1185,7 +1185,7 @@ fetch_metadata_sanity () {
 	# Some aliases to save space later: ${P} is a character which can
 	# appear in a path; ${M} is the four numeric metadata fields; and
 	# ${H} is a sha256 hash.
-	P="[-+./:=_[[:alnum:]]"
+	P="[-+./:=%@_[[:alnum:]]"
 	M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
 	H="[0-9a-f]{64}"
 

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 20:07:59 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40728106566B;
	Wed, 26 Oct 2011 20:07:59 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F9E28FC08;
	Wed, 26 Oct 2011 20:07: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 p9QK7xd4065617;
	Wed, 26 Oct 2011 20:07:59 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QK7xer065615;
	Wed, 26 Oct 2011 20:07:59 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201110262007.p9QK7xer065615@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 26 Oct 2011 20:07:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226813 - stable/7/usr.sbin/freebsd-update
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 20:07:59 -0000

Author: cperciva
Date: Wed Oct 26 20:07:58 2011
New Revision: 226813
URL: http://svn.freebsd.org/changeset/base/226813

Log:
  MFC r226650: Make freebsd-update work with FreeBSD 9.0.  (In the unlikely
  event that a 7.5-RELEASE happens, this should simplify upgrading from that
  to 9.x.)

Modified:
  stable/7/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/7/usr.sbin/freebsd-update/   (props changed)

Modified: stable/7/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/7/usr.sbin/freebsd-update/freebsd-update.sh	Wed Oct 26 20:06:27 2011	(r226812)
+++ stable/7/usr.sbin/freebsd-update/freebsd-update.sh	Wed Oct 26 20:07:58 2011	(r226813)
@@ -1110,7 +1110,7 @@ fetch_metadata_sanity () {
 	# Some aliases to save space later: ${P} is a character which can
 	# appear in a path; ${M} is the four numeric metadata fields; and
 	# ${H} is a sha256 hash.
-	P="[-+./:=_[[:alnum:]]"
+	P="[-+./:=%@_[[:alnum:]]"
 	M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
 	H="[0-9a-f]{64}"
 

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 20:15:30 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5DF66106564A;
	Wed, 26 Oct 2011 20:15:30 +0000 (UTC)
	(envelope-from kensmith@buffalo.edu)
Received: from localmailA.acsu.buffalo.edu (localmail.buffalo.edu
	[128.205.5.196])
	by mx1.freebsd.org (Postfix) with ESMTP id DF3948FC12;
	Wed, 26 Oct 2011 20:15:29 +0000 (UTC)
Received: from localmailA.acsu.buffalo.edu (localhost [127.0.0.1])
	by localhost (Postfix) with SMTP id 79362F3BA;
	Wed, 26 Oct 2011 16:05:43 -0400 (EDT)
Received: from localmailA.acsu.buffalo.edu (localhost [127.0.0.1])
	by localmailA.acsu.buffalo.edu (Postfix) with ESMTP id D46BDF62E;
	Wed, 26 Oct 2011 16:05:42 -0400 (EDT)
Received: from smtp1.acsu.buffalo.edu (smtp1.acsu.buffalo.edu [128.205.5.253])
	by localmailA.acsu.buffalo.edu (Prefixe) with ESMTP id CA406F3BA;
	Wed, 26 Oct 2011 16:05:42 -0400 (EDT)
Received: from [128.205.32.76] (bauer.cse.buffalo.edu [128.205.32.76])
	(Authenticated sender: kensmith@buffalo.edu)
	by smtp1.acsu.buffalo.edu (Postfix) with ESMTPSA id B6E7D462B0;
	Wed, 26 Oct 2011 16:05:42 -0400 (EDT)
From: Ken Smith <kensmith@buffalo.edu>
To: Sergey Kandaurov <pluknet@freebsd.org>
In-Reply-To: <CAE-mSOJ8V6cf2x8V_JXXa8_2j+LAtqgOz++Rw-fU5DEVFf+niw@mail.gmail.com>
References: <201110152123.p9FLN5Ht031202@svn.freebsd.org>
	<CAJ-Vmo=BTek=WFcEPUM7EdJMeG3Z9LegXw0+HuR=mjbrHAT55A@mail.gmail.com>
	<1318862413.55691.12.camel@bauer.cse.buffalo.edu>
	<CAE-mSOJ8V6cf2x8V_JXXa8_2j+LAtqgOz++Rw-fU5DEVFf+niw@mail.gmail.com>
Content-Type: multipart/signed; micalg="pgp-sha1";
	protocol="application/pgp-signature";
	boundary="=-gVj8WlcTKdXe0vnKnn/z"
Date: Wed, 26 Oct 2011 16:05:40 -0400
Message-ID: <1319659540.37575.22.camel@bauer.cse.buffalo.edu>
Mime-Version: 1.0
X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port 
X-PM-EL-Spam-Prob: : 8%
Cc: svn-src-stable@freebsd.org, Adrian Chadd <adrian@freebsd.org>,
	src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r226405 - in stable/9: . etc/defaults
 lib/libc/stdlib sys/amd64/conf sys/i386/conf sys/ia64/conf sys/pc98/conf
 sys/powerpc/conf sys/sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 20:15:30 -0000


--=-gVj8WlcTKdXe0vnKnn/z
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

On Tue, 2011-10-25 at 23:22 +0400, Sergey Kandaurov wrote:
> In 8-STABLE (and 8.2) both KDB and KDB_TRACE present in GENERIC
> kernels (added in r214326, I guess they are needed for printing a stack
> trace on panic). Were these options removed intentionally in this commit?=
=20

Depends on what you mean by intentionally.  I forgot about the panic
stack trace thing.  So KDB and KDB_TRACE sitting in the section of
stuff that's normally removed didn't trigger a warning bell as I was
doing r226405.

I've fixed stable/9.  And I'll adjust head shortly to try and avoid
having this happen again for 10.0 by moving them out of the chunk of
stuff that's supposed to be removed...

--=20
                                                Ken Smith
- From there to here, from here to      |       kensmith@buffalo.edu
  there, funny things are everywhere.   |
                      - Theodor Geisel  |

--=-gVj8WlcTKdXe0vnKnn/z
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)

iEYEABECAAYFAk6oaBQACgkQ/G14VSmup/YVeACdF4u7LRtTMQS/xF0HWGVQlu1Q
MmAAnjP5InC8i1r4qsvI3JCfW1AzJG00
=o569
-----END PGP SIGNATURE-----

--=-gVj8WlcTKdXe0vnKnn/z--


From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 22:12:31 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 66040106566B;
	Wed, 26 Oct 2011 22:12:31 +0000 (UTC)
	(envelope-from pluknet@gmail.com)
Received: from mail-vx0-f182.google.com (mail-vx0-f182.google.com
	[209.85.220.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 8441A8FC0C;
	Wed, 26 Oct 2011 22:12:30 +0000 (UTC)
Received: by vcbfo13 with SMTP id fo13so2913655vcb.13
	for <multiple recipients>; Wed, 26 Oct 2011 15:12:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=mime-version:sender:in-reply-to:references:date
	:x-google-sender-auth:message-id:subject:from:to:cc:content-type
	:content-transfer-encoding;
	bh=Wmd6HY02bOPIBey371LrDAQ1NF9HEJiEqV1o8Izq+OM=;
	b=KSzZRlK3FU0n9vGwRoSv1Oxbkd8+XTn4kKYVgw91msGZ8Hq4QyvlomsmfdJz6Xhu+K
	XR/5hkMasX3FySM0ls3YWpxXTzeTRAaORp6ZNoJlvaSVDAOYbzzYGt8whCazIjqPJhSD
	Q6OvJAhgtbDj/0n2gRJph61hp1IrfpPw1Lb3g=
MIME-Version: 1.0
Received: by 10.182.17.103 with SMTP id n7mr5772696obd.68.1319667149484; Wed,
	26 Oct 2011 15:12:29 -0700 (PDT)
Sender: pluknet@gmail.com
Received: by 10.182.160.97 with HTTP; Wed, 26 Oct 2011 15:12:29 -0700 (PDT)
In-Reply-To: <1319659540.37575.22.camel@bauer.cse.buffalo.edu>
References: <201110152123.p9FLN5Ht031202@svn.freebsd.org>
	<CAJ-Vmo=BTek=WFcEPUM7EdJMeG3Z9LegXw0+HuR=mjbrHAT55A@mail.gmail.com>
	<1318862413.55691.12.camel@bauer.cse.buffalo.edu>
	<CAE-mSOJ8V6cf2x8V_JXXa8_2j+LAtqgOz++Rw-fU5DEVFf+niw@mail.gmail.com>
	<1319659540.37575.22.camel@bauer.cse.buffalo.edu>
Date: Thu, 27 Oct 2011 02:12:29 +0400
X-Google-Sender-Auth: orHR3Gz_mUsUXoSCKYMO6_wB1Bc
Message-ID: <CAE-mSOKBA0akH26zgOSnpY=7Rf85JeidgxLswN4AHwSHrR+aHg@mail.gmail.com>
From: Sergey Kandaurov <pluknet@freebsd.org>
To: Ken Smith <kensmith@buffalo.edu>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: svn-src-stable@freebsd.org, Adrian Chadd <adrian@freebsd.org>,
	src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r226405 - in stable/9: . etc/defaults
 lib/libc/stdlib
 sys/amd64/conf sys/i386/conf sys/ia64/conf sys/pc98/conf sys/powerpc/conf
 sys/sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 22:12:31 -0000

On 27 October 2011 00:05, Ken Smith <kensmith@buffalo.edu> wrote:
> On Tue, 2011-10-25 at 23:22 +0400, Sergey Kandaurov wrote:
>> In 8-STABLE (and 8.2) both KDB and KDB_TRACE present in GENERIC
>> kernels (added in r214326, I guess they are needed for printing a stack
>> trace on panic). Were these options removed intentionally in this commit=
?
>
> Depends on what you mean by intentionally. =A0I forgot about the panic
> stack trace thing. =A0So KDB and KDB_TRACE sitting in the section of
> stuff that's normally removed didn't trigger a warning bell as I was
> doing r226405.

Err.. Sorry, should be rather read as "unintentionally" in my email.

> I've fixed stable/9. =A0And I'll adjust head shortly to try and avoid
> having this happen again for 10.0 by moving them out of the chunk of
> stuff that's supposed to be removed...

Thank you very much.

--=20
wbr,
pluknet

From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 22:23:01 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 091B4106566C;
	Wed, 26 Oct 2011 22:23:01 +0000 (UTC)
	(envelope-from kensmith@buffalo.edu)
Received: from localmailB.acsu.buffalo.edu (localmailb.acsu.buffalo.edu
	[128.205.5.200])
	by mx1.freebsd.org (Postfix) with ESMTP id C03328FC08;
	Wed, 26 Oct 2011 22:23:00 +0000 (UTC)
Received: from localmailB.acsu.buffalo.edu (localhost [127.0.0.1])
	by localhost (Postfix) with SMTP id 15CA62FFBA;
	Wed, 26 Oct 2011 18:23:00 -0400 (EDT)
Received: from localmailB.acsu.buffalo.edu (localhost [127.0.0.1])
	by localmailB.acsu.buffalo.edu (Postfix) with ESMTP id 6461B5E835;
	Wed, 26 Oct 2011 18:22:59 -0400 (EDT)
Received: from smtp3.acsu.buffalo.edu (smtp3.acsu.buffalo.edu [128.205.5.226])
	by localmailB.acsu.buffalo.edu (Prefixe) with ESMTP id 589235E831;
	Wed, 26 Oct 2011 18:22:59 -0400 (EDT)
Received: from [128.205.32.76] (bauer.cse.buffalo.edu [128.205.32.76])
	(Authenticated sender: kensmith@buffalo.edu)
	by smtp3.acsu.buffalo.edu (Postfix) with ESMTPSA id 2FDAD4694D;
	Wed, 26 Oct 2011 18:22:59 -0400 (EDT)
From: Ken Smith <kensmith@buffalo.edu>
To: Sergey Kandaurov <pluknet@freebsd.org>
In-Reply-To: <CAE-mSOKBA0akH26zgOSnpY=7Rf85JeidgxLswN4AHwSHrR+aHg@mail.gmail.com>
References: <201110152123.p9FLN5Ht031202@svn.freebsd.org>
	<CAJ-Vmo=BTek=WFcEPUM7EdJMeG3Z9LegXw0+HuR=mjbrHAT55A@mail.gmail.com>
	<1318862413.55691.12.camel@bauer.cse.buffalo.edu>
	<CAE-mSOJ8V6cf2x8V_JXXa8_2j+LAtqgOz++Rw-fU5DEVFf+niw@mail.gmail.com>
	<1319659540.37575.22.camel@bauer.cse.buffalo.edu>
	<CAE-mSOKBA0akH26zgOSnpY=7Rf85JeidgxLswN4AHwSHrR+aHg@mail.gmail.com>
Content-Type: multipart/signed; micalg="pgp-sha1";
	protocol="application/pgp-signature";
	boundary="=-RqOdu87YknNcG/joHoBM"
Date: Wed, 26 Oct 2011 18:22:53 -0400
Message-ID: <1319667773.37575.24.camel@bauer.cse.buffalo.edu>
Mime-Version: 1.0
X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port 
X-PM-EL-Spam-Prob: : 8%
Cc: svn-src-stable@freebsd.org, Adrian Chadd <adrian@freebsd.org>,
	src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r226405 - in stable/9: . etc/defaults
 lib/libc/stdlib sys/amd64/conf sys/i386/conf sys/ia64/conf sys/pc98/conf
 sys/powerpc/conf sys/sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 22:23:01 -0000


--=-RqOdu87YknNcG/joHoBM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

On Thu, 2011-10-27 at 02:12 +0400, Sergey Kandaurov wrote:
> On 27 October 2011 00:05, Ken Smith <kensmith@buffalo.edu> wrote:
> > On Tue, 2011-10-25 at 23:22 +0400, Sergey Kandaurov wrote:
> >> In 8-STABLE (and 8.2) both KDB and KDB_TRACE present in GENERIC
> >> kernels (added in r214326, I guess they are needed for printing a stac=
k
> >> trace on panic). Were these options removed intentionally in this comm=
it?
> >
> > Depends on what you mean by intentionally.  I forgot about the panic
> > stack trace thing.  So KDB and KDB_TRACE sitting in the section of
> > stuff that's normally removed didn't trigger a warning bell as I was
> > doing r226405.
>=20
> Err.. Sorry, should be rather read as "unintentionally" in my email.

My turn to say sorry.  I should have had a smiley after the first
sentence in my reply.  :-)

--=20
                                                Ken Smith
- From there to here, from here to      |       kensmith@buffalo.edu
  there, funny things are everywhere.   |
                      - Theodor Geisel  |

--=-RqOdu87YknNcG/joHoBM
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)

iEYEABECAAYFAk6oiD0ACgkQ/G14VSmup/YZTQCfVsbCghufHNoPlVPXTuxpP9+i
A3kAn1HjSWXXymyuwEMkq55HLrahPGSw
=4OMG
-----END PGP SIGNATURE-----

--=-RqOdu87YknNcG/joHoBM--


From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 26 23:06:00 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11B71106566B;
	Wed, 26 Oct 2011 23:06:00 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0013A8FC15;
	Wed, 26 Oct 2011 23:05: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 p9QN5xPN072094;
	Wed, 26 Oct 2011 23:05:59 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QN5xWL072087;
	Wed, 26 Oct 2011 23:05:59 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <201110262305.p9QN5xWL072087@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Wed, 26 Oct 2011 23:05: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: r226819 - in stable/9/sys: amd64/conf i386/conf
	ia64/conf pc98/conf powerpc/conf sparc64/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 23:06:00 -0000

Author: kensmith
Date: Wed Oct 26 23:05:59 2011
New Revision: 226819
URL: http://svn.freebsd.org/changeset/base/226819

Log:
  Fix whitespace nit.  "options<space><tab>", not "options<tab><tab>".
  
  Submitted by:	Matthew Fleming <mdf at freebsd dot org>
  Pointy hat:	me
  Approved by:	re (implicit)

Modified:
  stable/9/sys/amd64/conf/GENERIC
  stable/9/sys/i386/conf/GENERIC
  stable/9/sys/ia64/conf/GENERIC
  stable/9/sys/pc98/conf/GENERIC
  stable/9/sys/powerpc/conf/GENERIC
  stable/9/sys/sparc64/conf/GENERIC

Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC	Wed Oct 26 22:28:28 2011	(r226818)
+++ stable/9/sys/amd64/conf/GENERIC	Wed Oct 26 23:05:59 2011	(r226819)
@@ -64,8 +64,8 @@ options 	MAC			# TrustedBSD MAC Framewor
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options		KDB			# Kernel debugger related code
-options		KDB_TRACE		# Print a stack trace for a panic
+options 	KDB			# Kernel debugger related code
+options 	KDB_TRACE		# Print a stack trace for a panic
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC	Wed Oct 26 22:28:28 2011	(r226818)
+++ stable/9/sys/i386/conf/GENERIC	Wed Oct 26 23:05:59 2011	(r226819)
@@ -64,8 +64,8 @@ options 	AUDIT			# Security event auditi
 options 	MAC			# TrustedBSD MAC Framework
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options		KDB			# Kernel debugger related code
-options		KDB_TRACE		# Print a stack trace for a panic
+options 	KDB			# Kernel debugger related code
+options 	KDB_TRACE		# Print a stack trace for a panic
 
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/ia64/conf/GENERIC
==============================================================================
--- stable/9/sys/ia64/conf/GENERIC	Wed Oct 26 22:28:28 2011	(r226818)
+++ stable/9/sys/ia64/conf/GENERIC	Wed Oct 26 23:05:59 2011	(r226819)
@@ -59,8 +59,8 @@ options 	UFS_ACL		# Support for access c
 options 	UFS_DIRHASH	# Hash-based directory lookup scheme
 options 	UFS_GJOURNAL	# Enable gjournal-based UFS journaling
 options 	_KPOSIX_PRIORITY_SCHEDULING	# Posix P1003_1B RT extensions
-options		KDB		# Kernel debugger related code
-options		KDB_TRACE	# Print a stack trace for a panic
+options 	KDB		# Kernel debugger related code
+options 	KDB_TRACE	# Print a stack trace for a panic
 
 # Various "busses"
 device		firewire	# FireWire bus code

Modified: stable/9/sys/pc98/conf/GENERIC
==============================================================================
--- stable/9/sys/pc98/conf/GENERIC	Wed Oct 26 22:28:28 2011	(r226818)
+++ stable/9/sys/pc98/conf/GENERIC	Wed Oct 26 23:05:59 2011	(r226819)
@@ -65,8 +65,8 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options		KDB			# Kernel debugger related code
-options		KDB_TRACE		# Print a stack trace for a panic
+options 	KDB			# Kernel debugger related code
+options 	KDB_TRACE		# Print a stack trace for a panic
 
 # To make an SMP kernel, the next two lines are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/9/sys/powerpc/conf/GENERIC	Wed Oct 26 22:28:28 2011	(r226818)
+++ stable/9/sys/powerpc/conf/GENERIC	Wed Oct 26 23:05:59 2011	(r226819)
@@ -66,8 +66,8 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options		KDB			# Kernel debugger related code
-options		KDB_TRACE		# Print a stack trace for a panic
+options 	KDB			# Kernel debugger related code
+options 	KDB_TRACE		# Print a stack trace for a panic
 
 # To make an SMP kernel, the next line is needed
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/9/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/9/sys/sparc64/conf/GENERIC	Wed Oct 26 22:28:28 2011	(r226818)
+++ stable/9/sys/sparc64/conf/GENERIC	Wed Oct 26 23:05:59 2011	(r226819)
@@ -62,8 +62,8 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
-options		KDB			# Kernel debugger related code
-options		KDB_TRACE		# Print a stack trace for a panic
+options 	KDB			# Kernel debugger related code
+options 	KDB_TRACE		# Print a stack trace for a panic
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 27 02:36:13 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7CC69106567F;
	Thu, 27 Oct 2011 02:36:13 +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 529FA8FC14;
	Thu, 27 Oct 2011 02:36:13 +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 p9R2aD35079466;
	Thu, 27 Oct 2011 02:36:13 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9R2aD0u079464;
	Thu, 27 Oct 2011 02:36:13 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201110270236.p9R2aD0u079464@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Thu, 27 Oct 2011 02:36:13 +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: r226822 - stable/9/sys/dev/dc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 02:36:13 -0000

Author: yongari
Date: Thu Oct 27 02:36:13 2011
New Revision: 226822
URL: http://svn.freebsd.org/changeset/base/226822

Log:
  MFC r226695-226696:
  r226695:
    Fix a regression introduced in r218832. For TX status check, driver
    should use a TX list DMA tag.
  
  r226696:
    Add missing bus_dmamap_sync() in setup frame transmit.
  
  Approved by:	re (kensmith)

Modified:
  stable/9/sys/dev/dc/if_dc.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)

Modified: stable/9/sys/dev/dc/if_dc.c
==============================================================================
--- stable/9/sys/dev/dc/if_dc.c	Wed Oct 26 23:52:02 2011	(r226821)
+++ stable/9/sys/dev/dc/if_dc.c	Thu Oct 27 02:36:13 2011	(r226822)
@@ -1136,6 +1136,8 @@ dc_setfilt_21143(struct dc_softc *sc)
 	sp[41] = DC_SP_MAC(eaddr[2]);
 
 	sframe->dc_status = htole32(DC_TXSTAT_OWN);
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+	    BUS_DMASYNC_PREWRITE);
 	bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
 	CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -1342,6 +1344,8 @@ dc_setfilt_xircom(struct dc_softc *sc)
 	DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_TX_ON);
 	DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_RX_ON);
 	sframe->dc_status = htole32(DC_TXSTAT_OWN);
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+	    BUS_DMASYNC_PREWRITE);
 	bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
 	CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -2970,7 +2974,7 @@ dc_txeof(struct dc_softc *sc)
 	 * Go through our tx list and free mbufs for those
 	 * frames that have been transmitted.
 	 */
-	bus_dmamap_sync(sc->dc_rx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
 	    BUS_DMASYNC_POSTWRITE);
 	setup = 0;
 	for (idx = sc->dc_cdata.dc_tx_cons; idx != sc->dc_cdata.dc_tx_prod;

From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 27 12:26:16 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9462B106566B;
	Thu, 27 Oct 2011 12:26:16 +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 7DF3F8FC13;
	Thu, 27 Oct 2011 12:26:16 +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 p9RCQG0J006260;
	Thu, 27 Oct 2011 12:26:16 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9RCQGwu006257;
	Thu, 27 Oct 2011 12:26:16 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201110271226.p9RCQGwu006257@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 27 Oct 2011 12:26:16 +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: r226834 - stable/9/usr.bin/csup
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 12:26:16 -0000

Author: kib
Date: Thu Oct 27 12:26:16 2011
New Revision: 226834
URL: http://svn.freebsd.org/changeset/base/226834

Log:
  MFC r225979:
  Update the comment.
  
  MFC r225980:
  Handle the situation where fixups_close() has been called but more fixups
  are still available on the queue.
  
  Approved by:	re (kensmith)

Modified:
  stable/9/usr.bin/csup/fixups.c
  stable/9/usr.bin/csup/updater.c
Directory Properties:
  stable/9/usr.bin/csup/   (props changed)

Modified: stable/9/usr.bin/csup/fixups.c
==============================================================================
--- stable/9/usr.bin/csup/fixups.c	Thu Oct 27 10:25:11 2011	(r226833)
+++ stable/9/usr.bin/csup/fixups.c	Thu Oct 27 12:26:16 2011	(r226834)
@@ -141,7 +141,7 @@ fixups_get(struct fixups *f)
 	fixups_lock(f);
 	while (f->size == 0 && !f->closed)
 		pthread_cond_wait(&f->cond, &f->lock);
-	if (f->closed) {
+	if (f->closed && f->size == 0) {
 		fixups_unlock(f);
 		return (NULL);
 	}

Modified: stable/9/usr.bin/csup/updater.c
==============================================================================
--- stable/9/usr.bin/csup/updater.c	Thu Oct 27 10:25:11 2011	(r226833)
+++ stable/9/usr.bin/csup/updater.c	Thu Oct 27 12:26:16 2011	(r226834)
@@ -238,7 +238,7 @@ updater(void *arg)
 
 	/*
 	 * Make sure to close the fixups even in case of an error,
-	 * so that the lister thread doesn't block indefinitely.
+	 * so that the detailer thread doesn't block indefinitely.
 	 */
 	fixups_close(up->config->fixups);
 	if (!error)

From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 27 14:11:19 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3C4C1065676;
	Thu, 27 Oct 2011 14:11:19 +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 A2EEA8FC16;
	Thu, 27 Oct 2011 14:11:19 +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 p9REBJcG010137;
	Thu, 27 Oct 2011 14:11:19 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9REBJQQ010134;
	Thu, 27 Oct 2011 14:11:19 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201110271411.p9REBJQQ010134@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 27 Oct 2011 14:11:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226838 - stable/8/contrib/csup
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 14:11:19 -0000

Author: kib
Date: Thu Oct 27 14:11:19 2011
New Revision: 226838
URL: http://svn.freebsd.org/changeset/base/226838

Log:
  MFC r225979:
  Update the comment.
  
  MFC r225980:
  Handle the situation where fixups_close() has been called but more fixups
  are still available on the queue.

Modified:
  stable/8/contrib/csup/fixups.c
  stable/8/contrib/csup/updater.c
Directory Properties:
  stable/8/contrib/csup/   (props changed)

Modified: stable/8/contrib/csup/fixups.c
==============================================================================
--- stable/8/contrib/csup/fixups.c	Thu Oct 27 14:07:57 2011	(r226837)
+++ stable/8/contrib/csup/fixups.c	Thu Oct 27 14:11:19 2011	(r226838)
@@ -141,7 +141,7 @@ fixups_get(struct fixups *f)
 	fixups_lock(f);
 	while (f->size == 0 && !f->closed)
 		pthread_cond_wait(&f->cond, &f->lock);
-	if (f->closed) {
+	if (f->closed && f->size == 0) {
 		fixups_unlock(f);
 		return (NULL);
 	}

Modified: stable/8/contrib/csup/updater.c
==============================================================================
--- stable/8/contrib/csup/updater.c	Thu Oct 27 14:07:57 2011	(r226837)
+++ stable/8/contrib/csup/updater.c	Thu Oct 27 14:11:19 2011	(r226838)
@@ -238,7 +238,7 @@ updater(void *arg)
 
 	/*
 	 * Make sure to close the fixups even in case of an error,
-	 * so that the lister thread doesn't block indefinitely.
+	 * so that the detailer thread doesn't block indefinitely.
 	 */
 	fixups_close(up->config->fixups);
 	if (!error)

From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 27 16:47:09 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B83211065673;
	Thu, 27 Oct 2011 16:47:09 +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 8DCBC8FC0A;
	Thu, 27 Oct 2011 16:47: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 p9RGl9Kk015641;
	Thu, 27 Oct 2011 16:47:09 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9RGl9uS015639;
	Thu, 27 Oct 2011 16:47:09 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201110271647.p9RGl9uS015639@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Thu, 27 Oct 2011 16:47:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226844 - stable/8/sys/dev/dc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 16:47:09 -0000

Author: yongari
Date: Thu Oct 27 16:47:09 2011
New Revision: 226844
URL: http://svn.freebsd.org/changeset/base/226844

Log:
  MFC r226695-226696:
  r226695:
    Fix a regression introduced in r218832. For TX status check, driver
    should use a TX list DMA tag.
  
  r226696:
    Add missing bus_dmamap_sync() in setup frame transmit.

Modified:
  stable/8/sys/dev/dc/if_dc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/dc/if_dc.c
==============================================================================
--- stable/8/sys/dev/dc/if_dc.c	Thu Oct 27 16:39:17 2011	(r226843)
+++ stable/8/sys/dev/dc/if_dc.c	Thu Oct 27 16:47:09 2011	(r226844)
@@ -1136,6 +1136,8 @@ dc_setfilt_21143(struct dc_softc *sc)
 	sp[41] = DC_SP_MAC(eaddr[2]);
 
 	sframe->dc_status = htole32(DC_TXSTAT_OWN);
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+	    BUS_DMASYNC_PREWRITE);
 	bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
 	CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -1342,6 +1344,8 @@ dc_setfilt_xircom(struct dc_softc *sc)
 	DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_TX_ON);
 	DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_RX_ON);
 	sframe->dc_status = htole32(DC_TXSTAT_OWN);
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+	    BUS_DMASYNC_PREWRITE);
 	bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
 	CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -2970,7 +2974,7 @@ dc_txeof(struct dc_softc *sc)
 	 * Go through our tx list and free mbufs for those
 	 * frames that have been transmitted.
 	 */
-	bus_dmamap_sync(sc->dc_rx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
 	    BUS_DMASYNC_POSTWRITE);
 	setup = 0;
 	for (idx = sc->dc_cdata.dc_tx_cons; idx != sc->dc_cdata.dc_tx_prod;

From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 27 16:48:20 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E364106567C;
	Thu, 27 Oct 2011 16:48:20 +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 D7CE58FC08;
	Thu, 27 Oct 2011 16:48:19 +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 p9RGmJc4015720;
	Thu, 27 Oct 2011 16:48:19 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9RGmJ1q015718;
	Thu, 27 Oct 2011 16:48:19 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201110271648.p9RGmJ1q015718@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Thu, 27 Oct 2011 16:48:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226845 - stable/7/sys/dev/dc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 16:48:20 -0000

Author: yongari
Date: Thu Oct 27 16:48:19 2011
New Revision: 226845
URL: http://svn.freebsd.org/changeset/base/226845

Log:
  MFC r226695-226696:
  r226695:
    Fix a regression introduced in r218832. For TX status check, driver
    should use a TX list DMA tag.
  
  r226696:
    Add missing bus_dmamap_sync() in setup frame transmit.

Modified:
  stable/7/sys/dev/dc/if_dc.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/dc/if_dc.c
==============================================================================
--- stable/7/sys/dev/dc/if_dc.c	Thu Oct 27 16:47:09 2011	(r226844)
+++ stable/7/sys/dev/dc/if_dc.c	Thu Oct 27 16:48:19 2011	(r226845)
@@ -1137,6 +1137,8 @@ dc_setfilt_21143(struct dc_softc *sc)
 	sp[41] = DC_SP_MAC(eaddr[2]);
 
 	sframe->dc_status = htole32(DC_TXSTAT_OWN);
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+	    BUS_DMASYNC_PREWRITE);
 	bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
 	CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -1343,6 +1345,8 @@ dc_setfilt_xircom(struct dc_softc *sc)
 	DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_TX_ON);
 	DC_SETBIT(sc, DC_NETCFG, DC_NETCFG_RX_ON);
 	sframe->dc_status = htole32(DC_TXSTAT_OWN);
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_PREREAD |
+	    BUS_DMASYNC_PREWRITE);
 	bus_dmamap_sync(sc->dc_stag, sc->dc_smap, BUS_DMASYNC_PREWRITE);
 	CSR_WRITE_4(sc, DC_TXSTART, 0xFFFFFFFF);
 
@@ -2971,7 +2975,7 @@ dc_txeof(struct dc_softc *sc)
 	 * Go through our tx list and free mbufs for those
 	 * frames that have been transmitted.
 	 */
-	bus_dmamap_sync(sc->dc_rx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
+	bus_dmamap_sync(sc->dc_tx_ltag, sc->dc_tx_lmap, BUS_DMASYNC_POSTREAD |
 	    BUS_DMASYNC_POSTWRITE);
 	setup = 0;
 	for (idx = sc->dc_cdata.dc_tx_cons; idx != sc->dc_cdata.dc_tx_prod;

From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 27 19:18:54 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C651A1065675;
	Thu, 27 Oct 2011 19:18:54 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B58658FC15;
	Thu, 27 Oct 2011 19:18: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 p9RJIsU6021122;
	Thu, 27 Oct 2011 19:18:54 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9RJIsQ8021120;
	Thu, 27 Oct 2011 19:18:54 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201110271918.p9RJIsQ8021120@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 27 Oct 2011 19:18:54 +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: r226853 - stable/9/usr.bin/grep
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 19:18:54 -0000

Author: gabor
Date: Thu Oct 27 19:18:54 2011
New Revision: 226853
URL: http://svn.freebsd.org/changeset/base/226853

Log:
  MFC r226664:
  - Install BSD grep properly, based on the value of WITH_BSD_GREP
  
  Approved by:	re (kib)

Modified:
  stable/9/usr.bin/grep/Makefile
Directory Properties:
  stable/9/usr.bin/grep/   (props changed)

Modified: stable/9/usr.bin/grep/Makefile
==============================================================================
--- stable/9/usr.bin/grep/Makefile	Thu Oct 27 18:49:16 2011	(r226852)
+++ stable/9/usr.bin/grep/Makefile	Thu Oct 27 19:18:54 2011	(r226853)
@@ -53,12 +53,14 @@ DPADD=	${LIBZ} ${LIBLZMA}
 LDADD+=	-lbz2
 DPADD+=	${LIBBZ2}
 
+.if ${MK_BSD_GREP} == "yes"
 LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
 	${BINDIR}/grep ${BINDIR}/bzegrep \
 	${BINDIR}/grep ${BINDIR}/bzfgrep
 MLINKS+= grep.1 bzgrep.1 \
 	 grep.1 bzegrep.1 \
 	 grep.1 bzfgrep.1
+.endif
 .else
 CFLAGS+= -DWITHOUT_BZIP2
 .endif

From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 27 20:23:03 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF8841065670;
	Thu, 27 Oct 2011 20:23:03 +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 BECD68FC08;
	Thu, 27 Oct 2011 20:23: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 p9RKN3qf023661;
	Thu, 27 Oct 2011 20:23:03 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9RKN3ad023659;
	Thu, 27 Oct 2011 20:23:03 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201110272023.p9RKN3ad023659@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 27 Oct 2011 20:23:03 +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: r226858 - stable/9/usr.sbin/boot0cfg
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 20:23:03 -0000

Author: ae
Date: Thu Oct 27 20:23:03 2011
New Revision: 226858
URL: http://svn.freebsd.org/changeset/base/226858

Log:
  MFC r226714:
    Fix argument name. This fixes EINVAL when boot0cfg uses GEOM_PART'
    control interface.
  
  Approved by:	re (kib)

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

Modified: stable/9/usr.sbin/boot0cfg/boot0cfg.c
==============================================================================
--- stable/9/usr.sbin/boot0cfg/boot0cfg.c	Thu Oct 27 20:15:37 2011	(r226857)
+++ stable/9/usr.sbin/boot0cfg/boot0cfg.c	Thu Oct 27 20:23:03 2011	(r226858)
@@ -378,7 +378,7 @@ write_mbr(const char *fname, int flags, 
     }
     grq = gctl_get_handle();
     gctl_ro_param(grq, "class", -1, "PART");
-    gctl_ro_param(grq, "geom", -1, pname);
+    gctl_ro_param(grq, "arg0", -1, pname);
     gctl_ro_param(grq, "verb", -1, "bootcode");
     gctl_ro_param(grq, "bootcode", mbr_size, mbr);
     gctl_ro_param(grq, "flags", -1, "C");

From owner-svn-src-stable@FreeBSD.ORG  Fri Oct 28 03:58:33 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 917FD106564A;
	Fri, 28 Oct 2011 03:58:33 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 80AB58FC12;
	Fri, 28 Oct 2011 03:58: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 p9S3wXsO040657;
	Fri, 28 Oct 2011 03:58:33 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9S3wXYm040655;
	Fri, 28 Oct 2011 03:58:33 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <201110280358.p9S3wXYm040655@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Fri, 28 Oct 2011 03:58:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226877 - stable/8/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Oct 2011 03:58:33 -0000

Author: qingli
Date: Fri Oct 28 03:58:33 2011
New Revision: 226877
URL: http://svn.freebsd.org/changeset/base/226877

Log:
  MFC 226713
  
  Exclude host routes when checking for prefix coverage on multiple
  interfaces. A host route has a NULL mask so check for that condition.
  I have also been told by developers who customize the packet output
  path with direct manipulation of the route entry (or the outgoing
  interface to be specific). This patch checks for the route mask
  explicitly to make sure custom code will not panic.
  
  PR:		kern/161805

Modified:
  stable/8/sys/netinet/in.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet/in.c
==============================================================================
--- stable/8/sys/netinet/in.c	Fri Oct 28 03:42:41 2011	(r226876)
+++ stable/8/sys/netinet/in.c	Fri Oct 28 03:58:33 2011	(r226877)
@@ -1449,12 +1449,21 @@ in_lltable_rtcheck(struct ifnet *ifp, u_
 	 * on one interface and the corresponding outgoing packet leaves
 	 * another interface.
 	 */
-	if (rt->rt_ifp != ifp) {
+	if (!(rt->rt_flags & RTF_HOST) && rt->rt_ifp != ifp) {
 		const char *sa, *mask, *addr, *lim;
 		int len;
 
-		sa = (const char *)rt_key(rt);
 		mask = (const char *)rt_mask(rt);
+		/*
+		 * Just being extra cautious to avoid some custom
+		 * code getting into trouble.
+		 */
+		if (mask == NULL) {
+			RTFREE_LOCKED(rt);
+			return (EINVAL);
+		}
+
+		sa = (const char *)rt_key(rt);
 		addr = (const char *)l3addr;
 		len = ((const struct sockaddr_in *)l3addr)->sin_len;
 		lim = addr + len;

From owner-svn-src-stable@FreeBSD.ORG  Fri Oct 28 04:04:22 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29F951065675;
	Fri, 28 Oct 2011 04:04:22 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 194C48FC0C;
	Fri, 28 Oct 2011 04:04:22 +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 p9S44Ljl040932;
	Fri, 28 Oct 2011 04:04:21 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9S44L19040930;
	Fri, 28 Oct 2011 04:04:21 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <201110280404.p9S44L19040930@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Fri, 28 Oct 2011 04:04:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226878 - stable/8/sys/netinet6
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Oct 2011 04:04:22 -0000

Author: qingli
Date: Fri Oct 28 04:04:21 2011
New Revision: 226878
URL: http://svn.freebsd.org/changeset/base/226878

Log:
  MFC 226451
  
  The IPv6 code was influx at the time of r196865 due to the L2/L3
  separation rewrite changes. r196865 was committed to fix a scope
  violation problem in the following test scenario:
  
    box-1# ifconfig em0 inet6 2001:db8:1:: prefixlen 64 anycast
    box-1# ifconfig em1 inet6 2001:db8:2::1 prefixlen 64
  
    box-2# ifconfig re0 inet6 2001:db8:1::6 prefixlen 64
  
    em0 and re0 are on the same link.
  
    box-2# ping6 2001:db8:1::
    PING6(56=40+8+8 bytes) 2001:db8:1::6 --> 2001:db8:1::
  
  the ICMPv6 response should have a source address of em1, which
  is 2001:db8:2::1, not the link-local address of em0.
  
  That code is no longer necessary and breaks the IPv6-Ready logo
  testing, so revert it now.
  
  Reviewed by:	hrs

Modified:
  stable/8/sys/netinet6/icmp6.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet6/icmp6.c
==============================================================================
--- stable/8/sys/netinet6/icmp6.c	Fri Oct 28 03:58:33 2011	(r226877)
+++ stable/8/sys/netinet6/icmp6.c	Fri Oct 28 04:04:21 2011	(r226878)
@@ -2161,10 +2161,6 @@ icmp6_reflect(struct mbuf *m, size_t off
 		}
 	}
 
-	if ((srcp != NULL) && 
-	    (in6_addrscope(srcp) != in6_addrscope(&ip6->ip6_src)))
-		srcp = NULL;
-
 	if (srcp == NULL) {
 		int e;
 		struct sockaddr_in6 sin6;

From owner-svn-src-stable@FreeBSD.ORG  Fri Oct 28 21:08:41 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FA53106566C;
	Fri, 28 Oct 2011 21:08:41 +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 18B168FC1C;
	Fri, 28 Oct 2011 21:08: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 p9SL8emZ077945;
	Fri, 28 Oct 2011 21:08:40 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9SL8eRJ077928;
	Fri, 28 Oct 2011 21:08:40 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201110282108.p9SL8eRJ077928@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 28 Oct 2011 21:08: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: r226890 - in stable/9: . contrib/llvm/include/llvm
	contrib/llvm/include/llvm-c contrib/llvm/include/llvm-c/Transforms
	contrib/llvm/include/llvm/ADT
	contrib/llvm/include/llvm/Analysis co...
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Oct 2011 21:08:41 -0000

Author: dim
Date: Fri Oct 28 21:08:39 2011
New Revision: 226890
URL: http://svn.freebsd.org/changeset/base/226890

Log:
  MFC r226633:
  
  Upgrade our copy of llvm/clang to r142614, from upstream's release_30
  branch.  This brings us very close to the 3.0 release, which is expected
  November 16, 2011.
  
  Approved by:	re (kib)

Added:
  stable/9/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h
  stable/9/contrib/llvm/include/llvm/ADT/TinyPtrVector.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/ADT/TinyPtrVector.h
  stable/9/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfo.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Analysis/BlockFrequencyInfo.h
  stable/9/contrib/llvm/include/llvm/Analysis/LoopIterator.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Analysis/LoopIterator.h
  stable/9/contrib/llvm/include/llvm/CodeGen/LexicalScopes.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/CodeGen/LexicalScopes.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequencyInfo.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequencyInfo.h
  stable/9/contrib/llvm/include/llvm/DebugInfo/
     - copied from r226633, head/contrib/llvm/include/llvm/DebugInfo/
  stable/9/contrib/llvm/include/llvm/MC/MCAsmBackend.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCAsmBackend.h
  stable/9/contrib/llvm/include/llvm/MC/MCAtom.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCAtom.h
  stable/9/contrib/llvm/include/llvm/MC/MCCodeGenInfo.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCCodeGenInfo.h
  stable/9/contrib/llvm/include/llvm/MC/MCInstrAnalysis.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCInstrAnalysis.h
  stable/9/contrib/llvm/include/llvm/MC/MCModule.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCModule.h
  stable/9/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h
  stable/9/contrib/llvm/include/llvm/MC/MCTargetAsmLexer.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCTargetAsmLexer.h
  stable/9/contrib/llvm/include/llvm/MC/MCTargetAsmParser.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MCTargetAsmParser.h
  stable/9/contrib/llvm/include/llvm/MC/MachineLocation.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/MC/MachineLocation.h
  stable/9/contrib/llvm/include/llvm/Object/Archive.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Object/Archive.h
  stable/9/contrib/llvm/include/llvm/Object/MachO.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Object/MachO.h
  stable/9/contrib/llvm/include/llvm/Support/BlockFrequency.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Support/BlockFrequency.h
  stable/9/contrib/llvm/include/llvm/Support/Capacity.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Support/Capacity.h
  stable/9/contrib/llvm/include/llvm/Support/CodeGen.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Support/CodeGen.h
  stable/9/contrib/llvm/include/llvm/Support/DataExtractor.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Support/DataExtractor.h
  stable/9/contrib/llvm/include/llvm/Support/GCOV.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Support/GCOV.h
  stable/9/contrib/llvm/include/llvm/Support/TargetRegistry.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Support/TargetRegistry.h
  stable/9/contrib/llvm/include/llvm/Support/TargetSelect.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Support/TargetSelect.h
  stable/9/contrib/llvm/include/llvm/TableGen/
     - copied from r226633, head/contrib/llvm/include/llvm/TableGen/
  stable/9/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
  stable/9/contrib/llvm/include/llvm/Transforms/Utils/SimplifyIndVar.h
     - copied unchanged from r226633, head/contrib/llvm/include/llvm/Transforms/Utils/SimplifyIndVar.h
  stable/9/contrib/llvm/lib/Analysis/BlockFrequencyInfo.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Analysis/BlockFrequencyInfo.cpp
  stable/9/contrib/llvm/lib/CodeGen/ExecutionDepsFix.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/CodeGen/ExecutionDepsFix.cpp
  stable/9/contrib/llvm/lib/CodeGen/ExpandPostRAPseudos.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/CodeGen/ExpandPostRAPseudos.cpp
  stable/9/contrib/llvm/lib/CodeGen/LexicalScopes.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/CodeGen/LexicalScopes.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveRangeCalc.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/CodeGen/LiveRangeCalc.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveRangeCalc.h
     - copied unchanged from r226633, head/contrib/llvm/lib/CodeGen/LiveRangeCalc.h
  stable/9/contrib/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp
  stable/9/contrib/llvm/lib/DebugInfo/
     - copied from r226633, head/contrib/llvm/lib/DebugInfo/
  stable/9/contrib/llvm/lib/MC/MCAsmBackend.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCAsmBackend.cpp
  stable/9/contrib/llvm/lib/MC/MCAtom.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCAtom.cpp
  stable/9/contrib/llvm/lib/MC/MCCodeGenInfo.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCCodeGenInfo.cpp
  stable/9/contrib/llvm/lib/MC/MCInstrAnalysis.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCInstrAnalysis.cpp
  stable/9/contrib/llvm/lib/MC/MCModule.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCModule.cpp
  stable/9/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
  stable/9/contrib/llvm/lib/MC/MCParser/MCTargetAsmParser.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCParser/MCTargetAsmParser.cpp
  stable/9/contrib/llvm/lib/MC/MCTargetAsmLexer.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/MC/MCTargetAsmLexer.cpp
  stable/9/contrib/llvm/lib/Object/Archive.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Object/Archive.cpp
  stable/9/contrib/llvm/lib/Support/BlockFrequency.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Support/BlockFrequency.cpp
  stable/9/contrib/llvm/lib/Support/DataExtractor.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Support/DataExtractor.cpp
  stable/9/contrib/llvm/lib/TableGen/
     - copied from r226633, head/contrib/llvm/lib/TableGen/
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAddressingModes.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAddressingModes.h
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMBaseInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMBaseInfo.h
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMFixupKinds.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMFixupKinds.h
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.cpp
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.h
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeAsmBackend.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeAsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeBaseInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeBaseInfo.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCCodeEmitter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsJITInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MipsJITInfo.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsRelocations.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/Mips/MipsRelocations.h
  stable/9/contrib/llvm/lib/Target/PTX/InstPrinter/
     - copied from r226633, head/contrib/llvm/lib/Target/PTX/InstPrinter/
  stable/9/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXBaseInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXBaseInfo.h
  stable/9/contrib/llvm/lib/Target/PTX/PTXAsmPrinter.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXAsmPrinter.h
  stable/9/contrib/llvm/lib/Target/PTX/PTXFPRoundingModePass.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXFPRoundingModePass.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXInstrLoadStore.td
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXInstrLoadStore.td
  stable/9/contrib/llvm/lib/Target/PTX/PTXMCInstLower.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXMCInstLower.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXParamManager.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXParamManager.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXParamManager.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXParamManager.h
  stable/9/contrib/llvm/lib/Target/PTX/PTXRegAlloc.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXRegAlloc.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXSelectionDAGInfo.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXSelectionDAGInfo.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXSelectionDAGInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PTX/PTXSelectionDAGInfo.h
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCBaseInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCBaseInfo.h
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86FixupKinds.h
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86FixupKinds.h
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86VZeroUpper.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Target/X86/X86VZeroUpper.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
  stable/9/contrib/llvm/lib/VMCore/GCOV.cpp
     - copied unchanged from r226633, head/contrib/llvm/lib/VMCore/GCOV.cpp
  stable/9/contrib/llvm/tools/clang/include/clang/AST/BaseSubobject.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/AST/BaseSubobject.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/SelectorLocationsKind.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/AST/SelectorLocationsKind.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/VTTBuilder.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/AST/VTTBuilder.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/VTableBuilder.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/AST/VTableBuilder.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafety.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafety.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/LLVM.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Basic/LLVM.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/ChainedDiagnosticConsumer.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Frontend/ChainedDiagnosticConsumer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticConsumer.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticConsumer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/ModuleLoader.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Lex/ModuleLoader.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/MultiInitializer.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Sema/MultiInitializer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/SemaFixItUtils.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Sema/SemaFixItUtils.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Weak.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Sema/Weak.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ContinuousRangeMap.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Serialization/ContinuousRangeMap.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/Module.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Serialization/Module.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ModuleManager.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/Serialization/ModuleManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerRegistry.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerRegistry.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/PlistReporter.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/ARCMigrate/PlistReporter.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransAPIUses.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/ARCMigrate/TransAPIUses.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/SelectorLocationsKind.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/AST/SelectorLocationsKind.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/VTTBuilder.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/AST/VTTBuilder.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/VTableBuilder.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/AST/VTableBuilder.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/ProgramPoint.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Analysis/ProgramPoint.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/LangOptions.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Basic/LangOptions.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCUDANV.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/CodeGen/CGCUDANV.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCUDARuntime.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/CodeGen/CGCUDARuntime.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCUDARuntime.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/CodeGen/CGCUDARuntime.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGOpenCLRuntime.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenCLRuntime.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGOpenCLRuntime.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/CodeGen/CGOpenCLRuntime.h
  stable/9/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Headers/stdalign.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Headers/stdalign.h
  stable/9/contrib/llvm/tools/clang/lib/Sema/MultiInitializer.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Sema/MultiInitializer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaFixItUtils.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Sema/SemaFixItUtils.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderInternals.h
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderInternals.h
  stable/9/contrib/llvm/tools/clang/lib/Serialization/Module.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Serialization/Module.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ModuleManager.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/Serialization/ModuleManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ClangCheckers.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ClangCheckers.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocOverflowSecurityChecker.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocOverflowSecurityChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Checker.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Checker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerRegistry.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerRegistry.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
     - copied unchanged from r226633, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
  stable/9/contrib/llvm/tools/clang/utils/
     - copied from r226633, head/contrib/llvm/tools/clang/utils/
  stable/9/lib/clang/include/ARMGenDisassemblerTables.inc
     - copied unchanged from r226633, head/lib/clang/include/ARMGenDisassemblerTables.inc
  stable/9/lib/clang/include/clang/Parse/
     - copied from r226633, head/lib/clang/include/clang/Parse/
  stable/9/lib/clang/libllvmtablegen/
     - copied from r226633, head/lib/clang/libllvmtablegen/
  stable/9/usr.bin/clang/clang-tblgen/
     - copied from r226633, head/usr.bin/clang/clang-tblgen/
Deleted:
  stable/9/contrib/llvm/include/llvm/Analysis/BlockFrequency.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequency.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineLocation.h
  stable/9/contrib/llvm/include/llvm/CompilerDriver/
  stable/9/contrib/llvm/include/llvm/Support/PassManagerBuilder.h
  stable/9/contrib/llvm/include/llvm/Target/TargetAsmBackend.h
  stable/9/contrib/llvm/include/llvm/Target/TargetAsmInfo.h
  stable/9/contrib/llvm/include/llvm/Target/TargetAsmLexer.h
  stable/9/contrib/llvm/include/llvm/Target/TargetAsmParser.h
  stable/9/contrib/llvm/include/llvm/Target/TargetRegistry.h
  stable/9/contrib/llvm/include/llvm/Target/TargetSelect.h
  stable/9/contrib/llvm/lib/Analysis/BlockFrequency.cpp
  stable/9/contrib/llvm/lib/CodeGen/LowerSubregs.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineBlockFrequency.cpp
  stable/9/contrib/llvm/lib/CompilerDriver/
  stable/9/contrib/llvm/lib/ExecutionEngine/MCJIT/CMakeLists.txt
  stable/9/contrib/llvm/lib/ExecutionEngine/MCJIT/Makefile
  stable/9/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
  stable/9/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/Makefile
  stable/9/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp
  stable/9/contrib/llvm/lib/MC/TargetAsmBackend.cpp
  stable/9/contrib/llvm/lib/Object/CMakeLists.txt
  stable/9/contrib/llvm/lib/Object/Makefile
  stable/9/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMAsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMBaseInfo.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMFixupKinds.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMMCExpr.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMMCExpr.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMMachObjectWriter.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.h
  stable/9/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h
  stable/9/contrib/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h
  stable/9/contrib/llvm/lib/Target/ARM/InstPrinter/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/ARM/InstPrinter/Makefile
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/ARM/NEONMoveFix.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/Alpha/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/Blackfin/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/MBlaze/AsmParser/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/MBlaze/AsmParser/Makefile
  stable/9/contrib/llvm/lib/Target/MBlaze/Disassembler/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/MBlaze/Disassembler/Makefile
  stable/9/contrib/llvm/lib/Target/MBlaze/InstPrinter/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/MBlaze/InstPrinter/Makefile
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeMCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/MSP430/InstPrinter/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/MSP430/InstPrinter/Makefile
  stable/9/contrib/llvm/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/MSP430/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/Mips/InstPrinter/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/Mips/InstPrinter/Makefile
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/PTX/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/PTX/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/PTX/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/PTX/PTXCallingConv.td
  stable/9/contrib/llvm/lib/Target/PTX/TargetInfo/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/PTX/TargetInfo/Makefile
  stable/9/contrib/llvm/lib/Target/PTX/generate-register-td.py
  stable/9/contrib/llvm/lib/Target/PowerPC/InstPrinter/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/PowerPC/InstPrinter/Makefile
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCAsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCFixupKinds.h
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCMCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCPredicates.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCPredicates.h
  stable/9/contrib/llvm/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/Sparc/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/TargetAsmInfo.cpp
  stable/9/contrib/llvm/lib/Target/TargetAsmLexer.cpp
  stable/9/contrib/llvm/lib/Target/X86/InstPrinter/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/X86/InstPrinter/Makefile
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Target/X86/SSEDomainFix.cpp
  stable/9/contrib/llvm/lib/Target/X86/Utils/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/X86/Utils/Makefile
  stable/9/contrib/llvm/lib/Target/X86/X86AsmBackend.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86FixupKinds.h
  stable/9/contrib/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86MachObjectWriter.cpp
  stable/9/contrib/llvm/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
  stable/9/contrib/llvm/lib/Target/XCore/MCTargetDesc/Makefile
  stable/9/contrib/llvm/lib/Transforms/IPO/LowerSetJmp.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/TailDuplication.cpp
  stable/9/contrib/llvm/tools/clang/include/clang/Config/
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/ChainedDiagnosticClient.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticsClient.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ASTSerializationListener.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerProvider.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/GRStateTrait.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/TransferFuncs.h
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/CMakeLists.txt
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/Makefile
  stable/9/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticsClient.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaCXXCast.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/CMakeLists.txt
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.h
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/Makefile
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicStore.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CFRefCount.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CMakeLists.txt
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CXXExprEngine.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/FlatStore.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/GRState.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Makefile
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/Makefile
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Makefile
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/README.txt
  stable/9/contrib/llvm/utils/TableGen/ClangASTNodesEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/ClangASTNodesEmitter.h
  stable/9/contrib/llvm/utils/TableGen/ClangAttrEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/ClangAttrEmitter.h
  stable/9/contrib/llvm/utils/TableGen/ClangDiagnosticsEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/ClangDiagnosticsEmitter.h
  stable/9/contrib/llvm/utils/TableGen/ClangSACheckersEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/ClangSACheckersEmitter.h
  stable/9/contrib/llvm/utils/TableGen/Error.cpp
  stable/9/contrib/llvm/utils/TableGen/Error.h
  stable/9/contrib/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/LLVMCConfigurationEmitter.h
  stable/9/contrib/llvm/utils/TableGen/NeonEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/NeonEmitter.h
  stable/9/contrib/llvm/utils/TableGen/OptParserEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/OptParserEmitter.h
  stable/9/contrib/llvm/utils/TableGen/Record.cpp
  stable/9/contrib/llvm/utils/TableGen/Record.h
  stable/9/contrib/llvm/utils/TableGen/TGLexer.cpp
  stable/9/contrib/llvm/utils/TableGen/TGLexer.h
  stable/9/contrib/llvm/utils/TableGen/TGParser.cpp
  stable/9/contrib/llvm/utils/TableGen/TGParser.h
  stable/9/contrib/llvm/utils/TableGen/TableGenBackend.cpp
  stable/9/contrib/llvm/utils/TableGen/TableGenBackend.h
  stable/9/lib/clang/include/ARMGenDecoderTables.inc
Modified:
  stable/9/Makefile.inc1   (contents, props changed)
  stable/9/contrib/llvm/include/llvm-c/Core.h
  stable/9/contrib/llvm/include/llvm-c/Disassembler.h
  stable/9/contrib/llvm/include/llvm-c/Object.h
  stable/9/contrib/llvm/include/llvm-c/Target.h
  stable/9/contrib/llvm/include/llvm-c/Transforms/IPO.h
  stable/9/contrib/llvm/include/llvm-c/Transforms/Scalar.h
  stable/9/contrib/llvm/include/llvm/ADT/APInt.h
  stable/9/contrib/llvm/include/llvm/ADT/ArrayRef.h
  stable/9/contrib/llvm/include/llvm/ADT/DenseMap.h
  stable/9/contrib/llvm/include/llvm/ADT/DenseMapInfo.h
  stable/9/contrib/llvm/include/llvm/ADT/DenseSet.h
  stable/9/contrib/llvm/include/llvm/ADT/ImmutableMap.h
  stable/9/contrib/llvm/include/llvm/ADT/ImmutableSet.h
  stable/9/contrib/llvm/include/llvm/ADT/IntervalMap.h
  stable/9/contrib/llvm/include/llvm/ADT/PointerUnion.h
  stable/9/contrib/llvm/include/llvm/ADT/PostOrderIterator.h
  stable/9/contrib/llvm/include/llvm/ADT/SCCIterator.h
  stable/9/contrib/llvm/include/llvm/ADT/STLExtras.h
  stable/9/contrib/llvm/include/llvm/ADT/SmallVector.h
  stable/9/contrib/llvm/include/llvm/ADT/Statistic.h
  stable/9/contrib/llvm/include/llvm/ADT/StringExtras.h
  stable/9/contrib/llvm/include/llvm/ADT/Triple.h
  stable/9/contrib/llvm/include/llvm/ADT/Twine.h
  stable/9/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h
  stable/9/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h
  stable/9/contrib/llvm/include/llvm/Analysis/BlockFrequencyImpl.h
  stable/9/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h
  stable/9/contrib/llvm/include/llvm/Analysis/CodeMetrics.h
  stable/9/contrib/llvm/include/llvm/Analysis/ConstantFolding.h
  stable/9/contrib/llvm/include/llvm/Analysis/DIBuilder.h
  stable/9/contrib/llvm/include/llvm/Analysis/DebugInfo.h
  stable/9/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h
  stable/9/contrib/llvm/include/llvm/Analysis/IVUsers.h
  stable/9/contrib/llvm/include/llvm/Analysis/InlineCost.h
  stable/9/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h
  stable/9/contrib/llvm/include/llvm/Analysis/LoopInfo.h
  stable/9/contrib/llvm/include/llvm/Analysis/LoopPass.h
  stable/9/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h
  stable/9/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h
  stable/9/contrib/llvm/include/llvm/Analysis/RegionPass.h
  stable/9/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h
  stable/9/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h
  stable/9/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
  stable/9/contrib/llvm/include/llvm/Argument.h
  stable/9/contrib/llvm/include/llvm/Attributes.h
  stable/9/contrib/llvm/include/llvm/AutoUpgrade.h
  stable/9/contrib/llvm/include/llvm/BasicBlock.h
  stable/9/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h
  stable/9/contrib/llvm/include/llvm/CodeGen/Analysis.h
  stable/9/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h
  stable/9/contrib/llvm/include/llvm/CodeGen/FastISel.h
  stable/9/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h
  stable/9/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h
  stable/9/contrib/llvm/include/llvm/CodeGen/LiveInterval.h
  stable/9/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h
  stable/9/contrib/llvm/include/llvm/CodeGen/LiveVariables.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineInstr.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineOperand.h
  stable/9/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h
  stable/9/contrib/llvm/include/llvm/CodeGen/Passes.h
  stable/9/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h
  stable/9/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h
  stable/9/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h
  stable/9/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
  stable/9/contrib/llvm/include/llvm/CodeGen/ValueTypes.h
  stable/9/contrib/llvm/include/llvm/Constant.h
  stable/9/contrib/llvm/include/llvm/Constants.h
  stable/9/contrib/llvm/include/llvm/DerivedTypes.h
  stable/9/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h
  stable/9/contrib/llvm/include/llvm/Function.h
  stable/9/contrib/llvm/include/llvm/GlobalAlias.h
  stable/9/contrib/llvm/include/llvm/GlobalValue.h
  stable/9/contrib/llvm/include/llvm/GlobalVariable.h
  stable/9/contrib/llvm/include/llvm/InitializePasses.h
  stable/9/contrib/llvm/include/llvm/InlineAsm.h
  stable/9/contrib/llvm/include/llvm/InstrTypes.h
  stable/9/contrib/llvm/include/llvm/Instruction.def
  stable/9/contrib/llvm/include/llvm/Instruction.h
  stable/9/contrib/llvm/include/llvm/Instructions.h
  stable/9/contrib/llvm/include/llvm/IntrinsicInst.h
  stable/9/contrib/llvm/include/llvm/Intrinsics.h
  stable/9/contrib/llvm/include/llvm/Intrinsics.td
  stable/9/contrib/llvm/include/llvm/IntrinsicsXCore.td
  stable/9/contrib/llvm/include/llvm/LinkAllPasses.h
  stable/9/contrib/llvm/include/llvm/Linker.h
  stable/9/contrib/llvm/include/llvm/MC/EDInstInfo.h
  stable/9/contrib/llvm/include/llvm/MC/MCAsmInfo.h
  stable/9/contrib/llvm/include/llvm/MC/MCAsmInfoDarwin.h
  stable/9/contrib/llvm/include/llvm/MC/MCAssembler.h
  stable/9/contrib/llvm/include/llvm/MC/MCContext.h
  stable/9/contrib/llvm/include/llvm/MC/MCDirectives.h
  stable/9/contrib/llvm/include/llvm/MC/MCDisassembler.h
  stable/9/contrib/llvm/include/llvm/MC/MCDwarf.h
  stable/9/contrib/llvm/include/llvm/MC/MCInst.h
  stable/9/contrib/llvm/include/llvm/MC/MCInstPrinter.h
  stable/9/contrib/llvm/include/llvm/MC/MCInstrDesc.h
  stable/9/contrib/llvm/include/llvm/MC/MCObjectStreamer.h
  stable/9/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h
  stable/9/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h
  stable/9/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h
  stable/9/contrib/llvm/include/llvm/MC/MCRegisterInfo.h
  stable/9/contrib/llvm/include/llvm/MC/MCStreamer.h
  stable/9/contrib/llvm/include/llvm/MC/MCValue.h
  stable/9/contrib/llvm/include/llvm/Module.h
  stable/9/contrib/llvm/include/llvm/Object/COFF.h
  stable/9/contrib/llvm/include/llvm/Object/MachOFormat.h
  stable/9/contrib/llvm/include/llvm/Object/MachOObject.h
  stable/9/contrib/llvm/include/llvm/Object/ObjectFile.h
  stable/9/contrib/llvm/include/llvm/OperandTraits.h
  stable/9/contrib/llvm/include/llvm/Operator.h
  stable/9/contrib/llvm/include/llvm/PassManagers.h
  stable/9/contrib/llvm/include/llvm/Support/BranchProbability.h
  stable/9/contrib/llvm/include/llvm/Support/CallSite.h
  stable/9/contrib/llvm/include/llvm/Support/CommandLine.h
  stable/9/contrib/llvm/include/llvm/Support/ConstantFolder.h
  stable/9/contrib/llvm/include/llvm/Support/DataTypes.h.in
  stable/9/contrib/llvm/include/llvm/Support/Dwarf.h
  stable/9/contrib/llvm/include/llvm/Support/DynamicLibrary.h
  stable/9/contrib/llvm/include/llvm/Support/ELF.h
  stable/9/contrib/llvm/include/llvm/Support/FileSystem.h
  stable/9/contrib/llvm/include/llvm/Support/Format.h
  stable/9/contrib/llvm/include/llvm/Support/GetElementPtrTypeIterator.h
  stable/9/contrib/llvm/include/llvm/Support/IRBuilder.h
  stable/9/contrib/llvm/include/llvm/Support/InstVisitor.h
  stable/9/contrib/llvm/include/llvm/Support/MachO.h
  stable/9/contrib/llvm/include/llvm/Support/MemoryBuffer.h
  stable/9/contrib/llvm/include/llvm/Support/NoFolder.h
  stable/9/contrib/llvm/include/llvm/Support/PathV1.h
  stable/9/contrib/llvm/include/llvm/Support/PathV2.h
  stable/9/contrib/llvm/include/llvm/Support/Process.h
  stable/9/contrib/llvm/include/llvm/Support/SMLoc.h
  stable/9/contrib/llvm/include/llvm/Support/SourceMgr.h
  stable/9/contrib/llvm/include/llvm/Support/TargetFolder.h
  stable/9/contrib/llvm/include/llvm/Support/TypeBuilder.h
  stable/9/contrib/llvm/include/llvm/Target/Target.td
  stable/9/contrib/llvm/include/llvm/Target/TargetData.h
  stable/9/contrib/llvm/include/llvm/Target/TargetFrameLowering.h
  stable/9/contrib/llvm/include/llvm/Target/TargetInstrInfo.h
  stable/9/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h
  stable/9/contrib/llvm/include/llvm/Target/TargetLowering.h
  stable/9/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h
  stable/9/contrib/llvm/include/llvm/Target/TargetMachine.h
  stable/9/contrib/llvm/include/llvm/Target/TargetOptions.h
  stable/9/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h
  stable/9/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td
  stable/9/contrib/llvm/include/llvm/Transforms/IPO.h
  stable/9/contrib/llvm/include/llvm/Transforms/Scalar.h
  stable/9/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h
  stable/9/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
  stable/9/contrib/llvm/include/llvm/Transforms/Utils/FunctionUtils.h
  stable/9/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h
  stable/9/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h
  stable/9/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h
  stable/9/contrib/llvm/include/llvm/Type.h
  stable/9/contrib/llvm/include/llvm/User.h
  stable/9/contrib/llvm/include/llvm/Value.h
  stable/9/contrib/llvm/lib/Analysis/AliasAnalysis.cpp
  stable/9/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
  stable/9/contrib/llvm/lib/Analysis/AliasSetTracker.cpp
  stable/9/contrib/llvm/lib/Analysis/Analysis.cpp
  stable/9/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp
  stable/9/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp
  stable/9/contrib/llvm/lib/Analysis/ConstantFolding.cpp
  stable/9/contrib/llvm/lib/Analysis/DIBuilder.cpp
  stable/9/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp
  stable/9/contrib/llvm/lib/Analysis/DebugInfo.cpp
  stable/9/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
  stable/9/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp
  stable/9/contrib/llvm/lib/Analysis/IVUsers.cpp
  stable/9/contrib/llvm/lib/Analysis/InlineCost.cpp
  stable/9/contrib/llvm/lib/Analysis/InstructionSimplify.cpp
  stable/9/contrib/llvm/lib/Analysis/LazyValueInfo.cpp
  stable/9/contrib/llvm/lib/Analysis/Lint.cpp
  stable/9/contrib/llvm/lib/Analysis/Loads.cpp
  stable/9/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp
  stable/9/contrib/llvm/lib/Analysis/LoopInfo.cpp
  stable/9/contrib/llvm/lib/Analysis/LoopPass.cpp
  stable/9/contrib/llvm/lib/Analysis/MemDepPrinter.cpp
  stable/9/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp
  stable/9/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
  stable/9/contrib/llvm/lib/Analysis/PHITransAddr.cpp
  stable/9/contrib/llvm/lib/Analysis/PathNumbering.cpp
  stable/9/contrib/llvm/lib/Analysis/RegionPass.cpp
  stable/9/contrib/llvm/lib/Analysis/ScalarEvolution.cpp
  stable/9/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
  stable/9/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp
  stable/9/contrib/llvm/lib/Analysis/ValueTracking.cpp
  stable/9/contrib/llvm/lib/AsmParser/LLLexer.cpp
  stable/9/contrib/llvm/lib/AsmParser/LLParser.cpp
  stable/9/contrib/llvm/lib/AsmParser/LLParser.h
  stable/9/contrib/llvm/lib/AsmParser/LLToken.h
  stable/9/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
  stable/9/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h
  stable/9/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
  stable/9/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp
  stable/9/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h
  stable/9/contrib/llvm/lib/CodeGen/Analysis.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp
  stable/9/contrib/llvm/lib/CodeGen/BranchFolding.cpp
  stable/9/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp
  stable/9/contrib/llvm/lib/CodeGen/CodeGen.cpp
  stable/9/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp
  stable/9/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp
  stable/9/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h
  stable/9/contrib/llvm/lib/CodeGen/ELFWriter.cpp
  stable/9/contrib/llvm/lib/CodeGen/IfConversion.cpp
  stable/9/contrib/llvm/lib/CodeGen/InlineSpiller.cpp
  stable/9/contrib/llvm/lib/CodeGen/InterferenceCache.cpp
  stable/9/contrib/llvm/lib/CodeGen/InterferenceCache.h
  stable/9/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp
  stable/9/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveInterval.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h
  stable/9/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveRangeEdit.h
  stable/9/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp
  stable/9/contrib/llvm/lib/CodeGen/LiveVariables.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineCSE.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineFunction.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineInstr.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineLICM.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineSink.cpp
  stable/9/contrib/llvm/lib/CodeGen/MachineVerifier.cpp
  stable/9/contrib/llvm/lib/CodeGen/PHIElimination.cpp
  stable/9/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp
  stable/9/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp
  stable/9/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp
  stable/9/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp
  stable/9/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp
  stable/9/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp
  stable/9/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp
  stable/9/contrib/llvm/lib/CodeGen/RegisterClassInfo.cpp
  stable/9/contrib/llvm/lib/CodeGen/RegisterClassInfo.h
  stable/9/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp
  stable/9/contrib/llvm/lib/CodeGen/RegisterCoalescer.h
  stable/9/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp
  stable/9/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp
  stable/9/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp
  stable/9/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h
  stable/9/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
  stable/9/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp
  stable/9/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp
  stable/9/contrib/llvm/lib/CodeGen/SpillPlacement.cpp
  stable/9/contrib/llvm/lib/CodeGen/SpillPlacement.h
  stable/9/contrib/llvm/lib/CodeGen/SplitKit.cpp
  stable/9/contrib/llvm/lib/CodeGen/SplitKit.h
  stable/9/contrib/llvm/lib/CodeGen/Splitter.cpp
  stable/9/contrib/llvm/lib/CodeGen/StackProtector.cpp
  stable/9/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp
  stable/9/contrib/llvm/lib/CodeGen/TailDuplication.cpp
  stable/9/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp
  stable/9/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
  stable/9/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
  stable/9/contrib/llvm/lib/CodeGen/VirtRegMap.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
  stable/9/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h
  stable/9/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h
  stable/9/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/MCJIT/Intercept.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp
  stable/9/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
  stable/9/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp
  stable/9/contrib/llvm/lib/Linker/LinkModules.cpp
  stable/9/contrib/llvm/lib/Linker/Linker.cpp
  stable/9/contrib/llvm/lib/MC/ELFObjectWriter.cpp
  stable/9/contrib/llvm/lib/MC/ELFObjectWriter.h
  stable/9/contrib/llvm/lib/MC/MCAsmInfo.cpp
  stable/9/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp
  stable/9/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp
  stable/9/contrib/llvm/lib/MC/MCAsmStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCAssembler.cpp
  stable/9/contrib/llvm/lib/MC/MCContext.cpp
  stable/9/contrib/llvm/lib/MC/MCDisassembler/Disassembler.cpp
  stable/9/contrib/llvm/lib/MC/MCDisassembler/Disassembler.h
  stable/9/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
  stable/9/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h
  stable/9/contrib/llvm/lib/MC/MCDisassembler/EDInst.h
  stable/9/contrib/llvm/lib/MC/MCDisassembler/EDToken.cpp
  stable/9/contrib/llvm/lib/MC/MCDisassembler/EDToken.h
  stable/9/contrib/llvm/lib/MC/MCDwarf.cpp
  stable/9/contrib/llvm/lib/MC/MCELF.cpp
  stable/9/contrib/llvm/lib/MC/MCELFStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCELFStreamer.h
  stable/9/contrib/llvm/lib/MC/MCExpr.cpp
  stable/9/contrib/llvm/lib/MC/MCInstPrinter.cpp
  stable/9/contrib/llvm/lib/MC/MCLoggingStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCMachOStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCNullStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCObjectStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp
  stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
  stable/9/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp
  stable/9/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp
  stable/9/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp
  stable/9/contrib/llvm/lib/MC/MCPureStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCStreamer.cpp
  stable/9/contrib/llvm/lib/MC/MCWin64EH.cpp
  stable/9/contrib/llvm/lib/MC/MachObjectWriter.cpp
  stable/9/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp
  stable/9/contrib/llvm/lib/MC/WinCOFFStreamer.cpp
  stable/9/contrib/llvm/lib/Object/Binary.cpp
  stable/9/contrib/llvm/lib/Object/COFFObjectFile.cpp
  stable/9/contrib/llvm/lib/Object/ELFObjectFile.cpp
  stable/9/contrib/llvm/lib/Object/MachOObject.cpp
  stable/9/contrib/llvm/lib/Object/MachOObjectFile.cpp
  stable/9/contrib/llvm/lib/Object/Object.cpp
  stable/9/contrib/llvm/lib/Object/ObjectFile.cpp
  stable/9/contrib/llvm/lib/Support/APFloat.cpp
  stable/9/contrib/llvm/lib/Support/APInt.cpp
  stable/9/contrib/llvm/lib/Support/Atomic.cpp
  stable/9/contrib/llvm/lib/Support/BranchProbability.cpp
  stable/9/contrib/llvm/lib/Support/CommandLine.cpp
  stable/9/contrib/llvm/lib/Support/ConstantRange.cpp
  stable/9/contrib/llvm/lib/Support/CrashRecoveryContext.cpp
  stable/9/contrib/llvm/lib/Support/Disassembler.cpp
  stable/9/contrib/llvm/lib/Support/Dwarf.cpp
  stable/9/contrib/llvm/lib/Support/DynamicLibrary.cpp
  stable/9/contrib/llvm/lib/Support/FoldingSet.cpp
  stable/9/contrib/llvm/lib/Support/Host.cpp
  stable/9/contrib/llvm/lib/Support/IncludeFile.cpp
  stable/9/contrib/llvm/lib/Support/Memory.cpp
  stable/9/contrib/llvm/lib/Support/MemoryBuffer.cpp
  stable/9/contrib/llvm/lib/Support/MemoryObject.cpp
  stable/9/contrib/llvm/lib/Support/Mutex.cpp
  stable/9/contrib/llvm/lib/Support/Path.cpp
  stable/9/contrib/llvm/lib/Support/PathV2.cpp
  stable/9/contrib/llvm/lib/Support/PrettyStackTrace.cpp
  stable/9/contrib/llvm/lib/Support/RWMutex.cpp
  stable/9/contrib/llvm/lib/Support/SearchForAddressOfSpecialSymbol.cpp
  stable/9/contrib/llvm/lib/Support/StringExtras.cpp
  stable/9/contrib/llvm/lib/Support/StringRef.cpp
  stable/9/contrib/llvm/lib/Support/TargetRegistry.cpp
  stable/9/contrib/llvm/lib/Support/ThreadLocal.cpp
  stable/9/contrib/llvm/lib/Support/Threading.cpp
  stable/9/contrib/llvm/lib/Support/Triple.cpp
  stable/9/contrib/llvm/lib/Support/Twine.cpp
  stable/9/contrib/llvm/lib/Support/Unix/Host.inc
  stable/9/contrib/llvm/lib/Support/Unix/Path.inc
  stable/9/contrib/llvm/lib/Support/Unix/PathV2.inc
  stable/9/contrib/llvm/lib/Support/Unix/Process.inc
  stable/9/contrib/llvm/lib/Support/Windows/DynamicLibrary.inc
  stable/9/contrib/llvm/lib/Support/Windows/Memory.inc
  stable/9/contrib/llvm/lib/Support/Windows/PathV2.inc
  stable/9/contrib/llvm/lib/Support/Windows/Process.inc
  stable/9/contrib/llvm/lib/Support/Windows/RWMutex.inc
  stable/9/contrib/llvm/lib/Support/Windows/Signals.inc
  stable/9/contrib/llvm/lib/Support/Windows/Windows.h
  stable/9/contrib/llvm/lib/Support/raw_ostream.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARM.h
  stable/9/contrib/llvm/lib/Target/ARM/ARM.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMGlobalMerge.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMISelLowering.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMMCInstLower.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMSubtarget.h
  stable/9/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h
  stable/9/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmLexer.cpp
  stable/9/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
  stable/9/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
  stable/9/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h
  stable/9/contrib/llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.h
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.td
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/AlphaTargetMachine.h
  stable/9/contrib/llvm/lib/Target/Alpha/MCTargetDesc/AlphaMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/Alpha/TargetInfo/AlphaTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinFrameLowering.h
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.h
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinIntrinsicInfo.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinIntrinsicInfo.h
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/BlackfinTargetMachine.h
  stable/9/contrib/llvm/lib/Target/Blackfin/MCTargetDesc/BlackfinMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/Blackfin/TargetInfo/BlackfinTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/CBackend/CBackend.cpp
  stable/9/contrib/llvm/lib/Target/CBackend/CTargetMachine.h
  stable/9/contrib/llvm/lib/Target/CBackend/TargetInfo/CBackendTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/SPUMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/MCTargetDesc/SPUMCTargetDesc.h
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.h
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.h
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.td
  stable/9/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.h
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.h
  stable/9/contrib/llvm/lib/Target/CellSPU/TargetInfo/CellSPUTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp
  stable/9/contrib/llvm/lib/Target/CppBackend/CPPTargetMachine.h
  stable/9/contrib/llvm/lib/Target/CppBackend/TargetInfo/CppBackendTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/AsmParser/MBlazeAsmLexer.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/Disassembler/MBlazeDisassembler.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/Disassembler/MBlazeDisassembler.h
  stable/9/contrib/llvm/lib/Target/MBlaze/InstPrinter/MBlazeInstPrinter.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/InstPrinter/MBlazeInstPrinter.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlaze.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.td
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsicInfo.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.h
  stable/9/contrib/llvm/lib/Target/MBlaze/MBlazeTargetObjectFile.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCTargetDesc.h
  stable/9/contrib/llvm/lib/Target/MBlaze/TargetInfo/MBlazeTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h
  stable/9/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.h
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.h
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430Subtarget.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.h
  stable/9/contrib/llvm/lib/Target/MSP430/TargetInfo/MSP430TargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/Mangler.cpp
  stable/9/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
  stable/9/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.h
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.h
  stable/9/contrib/llvm/lib/Target/Mips/Mips.h
  stable/9/contrib/llvm/lib/Target/Mips/Mips.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsCallingConv.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsFrameLowering.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsMCInstLower.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsMCSymbolRefExpr.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsMCSymbolRefExpr.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsMachineFunction.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsSubtarget.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h
  stable/9/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
  stable/9/contrib/llvm/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTX.h
  stable/9/contrib/llvm/lib/Target/PTX/PTX.td
  stable/9/contrib/llvm/lib/Target/PTX/PTXAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXISelDAGToDAG.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXISelLowering.h
  stable/9/contrib/llvm/lib/Target/PTX/PTXInstrFormats.td
  stable/9/contrib/llvm/lib/Target/PTX/PTXInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXInstrInfo.td
  stable/9/contrib/llvm/lib/Target/PTX/PTXIntrinsicInstrInfo.td
  stable/9/contrib/llvm/lib/Target/PTX/PTXMCAsmStreamer.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXMFInfoExtract.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXMachineFunctionInfo.h
  stable/9/contrib/llvm/lib/Target/PTX/PTXRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/PTX/PTXRegisterInfo.td
  stable/9/contrib/llvm/lib/Target/PTX/PTXSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXSubtarget.h
  stable/9/contrib/llvm/lib/Target/PTX/PTXTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/PTX/PTXTargetMachine.h
  stable/9/contrib/llvm/lib/Target/PTX/TargetInfo/PTXTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.h
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h
  stable/9/contrib/llvm/lib/Target/PowerPC/PPC.h
  stable/9/contrib/llvm/lib/Target/PowerPC/PPC.td
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.h
  stable/9/contrib/llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/Sparc/SparcSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.h
  stable/9/contrib/llvm/lib/Target/Sparc/TargetInfo/SparcTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.td
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.h
  stable/9/contrib/llvm/lib/Target/SystemZ/TargetInfo/SystemZTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/Target.cpp
  stable/9/contrib/llvm/lib/Target/TargetData.cpp
  stable/9/contrib/llvm/lib/Target/TargetFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp
  stable/9/contrib/llvm/lib/Target/TargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/TargetRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/X86/AsmParser/X86AsmLexer.cpp
  stable/9/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
  stable/9/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
  stable/9/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.h
  stable/9/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
  stable/9/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h
  stable/9/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp
  stable/9/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h
  stable/9/contrib/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp
  stable/9/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp
  stable/9/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
  stable/9/contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.cpp
  stable/9/contrib/llvm/lib/Target/X86/Utils/X86ShuffleDecode.h
  stable/9/contrib/llvm/lib/Target/X86/X86.h
  stable/9/contrib/llvm/lib/Target/X86/X86.td
  stable/9/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86FastISel.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86FrameLowering.h
  stable/9/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.h
  stable/9/contrib/llvm/lib/Target/X86/X86InstrArithmetic.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrCompiler.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrExtension.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrFormats.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86InstrInfo.h
  stable/9/contrib/llvm/lib/Target/X86/X86InstrInfo.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrSSE.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrSystem.td
  stable/9/contrib/llvm/lib/Target/X86/X86InstrVMX.td
  stable/9/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86MachineFunctionInfo.h
  stable/9/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86RegisterInfo.h
  stable/9/contrib/llvm/lib/Target/X86/X86RegisterInfo.td
  stable/9/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86Subtarget.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86Subtarget.h
  stable/9/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86TargetMachine.h
  stable/9/contrib/llvm/lib/Target/X86/X86TargetObjectFile.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86TargetObjectFile.h
  stable/9/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp
  stable/9/contrib/llvm/lib/Target/XCore/TargetInfo/XCoreTargetInfo.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.h
  stable/9/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h
  stable/9/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h
  stable/9/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td
  stable/9/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.h
  stable/9/contrib/llvm/lib/Target/XCore/XCoreSubtarget.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp
  stable/9/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.h
  stable/9/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/FunctionAttrs.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/IPO.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/InlineAlways.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/InlineSimple.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/Inliner.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/LoopExtractor.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp
  stable/9/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
  stable/9/contrib/llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp
  stable/9/contrib/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
  stable/9/contrib/llvm/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp
  stable/9/contrib/llvm/lib/Transforms/Instrumentation/PathProfiling.cpp
  stable/9/contrib/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/ADCE.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/LICM.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/LowerAtomic.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/ObjCARC.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/Scalar.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp
  stable/9/contrib/llvm/lib/Transforms/Scalar/Sink.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/AddrModeMatcher.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/CodeExtractor.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/Local.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/LowerExpectIntrinsic.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/LowerSwitch.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/SSAUpdater.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
  stable/9/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp
  stable/9/contrib/llvm/lib/VMCore/AsmWriter.cpp
  stable/9/contrib/llvm/lib/VMCore/Attributes.cpp
  stable/9/contrib/llvm/lib/VMCore/AutoUpgrade.cpp
  stable/9/contrib/llvm/lib/VMCore/BasicBlock.cpp
  stable/9/contrib/llvm/lib/VMCore/ConstantFold.cpp
  stable/9/contrib/llvm/lib/VMCore/ConstantFold.h
  stable/9/contrib/llvm/lib/VMCore/Constants.cpp
  stable/9/contrib/llvm/lib/VMCore/ConstantsContext.h
  stable/9/contrib/llvm/lib/VMCore/Core.cpp
  stable/9/contrib/llvm/lib/VMCore/DebugLoc.cpp
  stable/9/contrib/llvm/lib/VMCore/Function.cpp
  stable/9/contrib/llvm/lib/VMCore/Globals.cpp
  stable/9/contrib/llvm/lib/VMCore/IRBuilder.cpp
  stable/9/contrib/llvm/lib/VMCore/InlineAsm.cpp
  stable/9/contrib/llvm/lib/VMCore/Instruction.cpp
  stable/9/contrib/llvm/lib/VMCore/Instructions.cpp
  stable/9/contrib/llvm/lib/VMCore/LLVMContextImpl.h
  stable/9/contrib/llvm/lib/VMCore/Module.cpp
  stable/9/contrib/llvm/lib/VMCore/PassManager.cpp
  stable/9/contrib/llvm/lib/VMCore/PassRegistry.cpp
  stable/9/contrib/llvm/lib/VMCore/Type.cpp
  stable/9/contrib/llvm/lib/VMCore/Value.cpp
  stable/9/contrib/llvm/lib/VMCore/ValueTypes.cpp
  stable/9/contrib/llvm/lib/VMCore/Verifier.cpp
  stable/9/contrib/llvm/tools/clang/include/clang-c/Index.h
  stable/9/contrib/llvm/tools/clang/include/clang/ARCMigrate/ARCMT.h
  stable/9/contrib/llvm/tools/clang/include/clang/ARCMigrate/ARCMTActions.h
  stable/9/contrib/llvm/tools/clang/include/clang/ARCMigrate/FileRemapper.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/APValue.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTImporter.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTMutationListener.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/Attr.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/CXXInheritance.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/CharUnits.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/Decl.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/DeclContextInternals.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/DeclVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/DeclarationName.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/Expr.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/Mangle.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/NestedNameSpecifier.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/OperationKinds.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ParentMap.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/PrettyPrinter.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/RecordLayout.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/Stmt.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/StmtVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/TemplateName.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/Type.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def
  stable/9/contrib/llvm/tools/clang/include/clang/AST/TypeVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/AST/UnresolvedSet.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/LiveVariables.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ReachableCode.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/UninitializedValues.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisContext.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/CFG.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/DomainSpecific/CocoaConventions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/FlowSensitive/DataflowValues.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/ProgramPoint.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Support/BlkExprDeclBitVector.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGStmtVisitor.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Attr.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DelayedCleanupPool.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticIDs.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/MacroBuilder.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/OpenCLExtensions.def
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/PartialDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/PrettyStackTrace.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/SourceManagerInternals.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/VersionTuple.h
  stable/9/contrib/llvm/tools/clang/include/clang/CodeGen/BackendUtil.h
  stable/9/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h
  stable/9/contrib/llvm/tools/clang/include/clang/CodeGen/ModuleBuilder.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Action.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Arg.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Compilation.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Driver.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/DriverDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Job.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/OptTable.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Option.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Options.td
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Tool.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Types.def
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/Util.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/ASTConsumers.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/ASTUnit.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/Analyses.def
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/AnalyzerOptions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CommandLineSourceLoc.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticOptions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/FrontendDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/HeaderSearchOptions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/LangStandard.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/LangStandards.def
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/LogDiagnosticPrinter.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOptions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticBuffer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h
  stable/9/contrib/llvm/tools/clang/include/clang/Index/ASTLocation.h
  stable/9/contrib/llvm/tools/clang/include/clang/Index/CallGraph.h
  stable/9/contrib/llvm/tools/clang/include/clang/Index/Entity.h
  stable/9/contrib/llvm/tools/clang/include/clang/Index/Handlers.h
  stable/9/contrib/llvm/tools/clang/include/clang/Index/TranslationUnit.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/CodeCompletionHandler.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/DirectoryLookup.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/HeaderMap.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearch.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/LexDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/Lexer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/LiteralSupport.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/MacroInfo.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/PTHManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/Pragma.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorLexer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/Token.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/TokenConcatenation.h
  stable/9/contrib/llvm/tools/clang/include/clang/Lex/TokenLexer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Parse/ParseAST.h
  stable/9/contrib/llvm/tools/clang/include/clang/Parse/ParseDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Parse/Parser.h
  stable/9/contrib/llvm/tools/clang/include/clang/Rewrite/ASTConsumers.h
  stable/9/contrib/llvm/tools/clang/include/clang/Rewrite/FixItRewriter.h
  stable/9/contrib/llvm/tools/clang/include/clang/Rewrite/FrontendActions.h
  stable/9/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriter.h
  stable/9/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriters.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/AnalysisBasedWarnings.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/CXXFieldCollector.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/DelayedDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Designator.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/IdentifierResolver.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Lookup.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Overload.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/ParsedTemplate.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/PrettyDeclStackTrace.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Scope.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Sema.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/SemaDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/Template.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h
  stable/9/contrib/llvm/tools/clang/include/clang/Sema/TypoCorrection.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ASTDeserializationListener.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ChainedIncludesSource.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Checker.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngineBuilders.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
  stable/9/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMT.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMTActions.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/FileRemapper.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/Internals.h
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransARCAssign.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransAutoreleasePool.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransBlockObjCVariable.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransEmptyStatementsAndDealloc.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransProperties.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransUnbridgedCasts.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransUnusedInitDelegate.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransZeroOutPropsInDealloc.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/TransformActions.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.cpp
  stable/9/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.h
  stable/9/contrib/llvm/tools/clang/lib/AST/APValue.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/Decl.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/DeclarationName.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/Expr.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ExternalASTSource.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/InheritViz.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ItaniumCXXABI.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/Mangle.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/MicrosoftCXXABI.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/NestedNameSpecifier.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/ParentMap.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/RecordLayout.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/Stmt.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/StmtDumper.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/TemplateName.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/Type.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/TypeLoc.cpp
  stable/9/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/AnalysisContext.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/CFGReachabilityAnalysis.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/CFGStmtMap.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/CocoaConventions.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/PseudoConstantAnalysis.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/ReachableCode.cpp
  stable/9/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/Builtins.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/DiagnosticIDs.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/SourceLocation.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  stable/9/contrib/llvm/tools/clang/lib/Basic/VersionTuple.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCall.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGException.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayout.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGVTT.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGValue.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.h
  stable/9/contrib/llvm/tools/clang/lib/Driver/Action.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/Job.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/OptTable.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/Option.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/Phases.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
  stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.h
  stable/9/contrib/llvm/tools/clang/lib/Driver/Types.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/CacheTokens.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/DependencyFile.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/FrontendOptions.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/LangStandards.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/LogDiagnosticPrinter.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/MultiplexConsumer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticBuffer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/Warnings.cpp
  stable/9/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
  stable/9/contrib/llvm/tools/clang/lib/Headers/avxintrin.h
  stable/9/contrib/llvm/tools/clang/lib/Headers/emmintrin.h
  stable/9/contrib/llvm/tools/clang/lib/Headers/float.h
  stable/9/contrib/llvm/tools/clang/lib/Headers/mm_malloc.h
  stable/9/contrib/llvm/tools/clang/lib/Headers/pmmintrin.h
  stable/9/contrib/llvm/tools/clang/lib/Headers/tgmath.h
  stable/9/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h
  stable/9/contrib/llvm/tools/clang/lib/Index/ASTLocation.cpp
  stable/9/contrib/llvm/tools/clang/lib/Index/CallGraph.cpp
  stable/9/contrib/llvm/tools/clang/lib/Index/Entity.cpp
  stable/9/contrib/llvm/tools/clang/lib/Index/EntityImpl.h
  stable/9/contrib/llvm/tools/clang/lib/Index/GlobalSelector.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/HeaderMap.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/HeaderSearch.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/MacroArgs.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/MacroArgs.h
  stable/9/contrib/llvm/tools/clang/lib/Lex/MacroInfo.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PPCaching.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PTHLexer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/PreprocessorLexer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/ScratchBuffer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/TokenConcatenation.cpp
  stable/9/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseAST.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/Parser.cpp
  stable/9/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/DeltaTree.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/FixItRewriter.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/FrontendActions.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/HTMLPrint.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/HTMLRewrite.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/RewriteMacros.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/RewriteObjC.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/RewriteRope.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/RewriteTest.cpp
  stable/9/contrib/llvm/tools/clang/lib/Rewrite/Rewriter.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/CodeCompleteConsumer.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/DelayedDiagnostic.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/JumpDiagnostics.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaAttr.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExprMember.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/TargetAttributesSema.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ChainedIncludesSource.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/GeneratePCH.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AdjustedReturnValueChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AttrNonNullChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastSizeChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastToStructChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSizeofPointer.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/Checkers.td
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ClangSACheckers.h
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DeadStoresChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DebugCheckers.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DereferenceChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/FixedAddressChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IteratorsChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/OSAtomicChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCUnusedIVarsChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerArithChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerSubChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefResultChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AggExprVisitor.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AnalysisManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicConstraintManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BlockCounter.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerContext.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Environment.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ObjCMessage.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SVals.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.h
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Store.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SymbolManager.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.h
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp
  stable/9/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/FrontendActions.cpp
  stable/9/contrib/llvm/tools/clang/tools/driver/cc1_main.cpp
  stable/9/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp
  stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp
  stable/9/contrib/llvm/utils/TableGen/ARMDecoderEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/ARMDecoderEmitter.h
  stable/9/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/AsmMatcherEmitter.h
  stable/9/contrib/llvm/utils/TableGen/AsmWriterEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/AsmWriterEmitter.h
  stable/9/contrib/llvm/utils/TableGen/AsmWriterInst.cpp
  stable/9/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/CallingConvEmitter.h
  stable/9/contrib/llvm/utils/TableGen/CodeEmitterGen.cpp
  stable/9/contrib/llvm/utils/TableGen/CodeEmitterGen.h
  stable/9/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
  stable/9/contrib/llvm/utils/TableGen/CodeGenInstruction.cpp
  stable/9/contrib/llvm/utils/TableGen/CodeGenInstruction.h
  stable/9/contrib/llvm/utils/TableGen/CodeGenRegisters.cpp
  stable/9/contrib/llvm/utils/TableGen/CodeGenRegisters.h
  stable/9/contrib/llvm/utils/TableGen/CodeGenTarget.cpp
  stable/9/contrib/llvm/utils/TableGen/CodeGenTarget.h
  stable/9/contrib/llvm/utils/TableGen/DAGISelEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/DAGISelEmitter.h
  stable/9/contrib/llvm/utils/TableGen/DAGISelMatcher.cpp
  stable/9/contrib/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/DAGISelMatcherGen.cpp
  stable/9/contrib/llvm/utils/TableGen/DisassemblerEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/DisassemblerEmitter.h
  stable/9/contrib/llvm/utils/TableGen/EDEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/EDEmitter.h
  stable/9/contrib/llvm/utils/TableGen/FastISelEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/FastISelEmitter.h
  stable/9/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.h
  stable/9/contrib/llvm/utils/TableGen/InstrEnumEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/InstrEnumEmitter.h
  stable/9/contrib/llvm/utils/TableGen/InstrInfoEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/InstrInfoEmitter.h
  stable/9/contrib/llvm/utils/TableGen/IntrinsicEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/IntrinsicEmitter.h
  stable/9/contrib/llvm/utils/TableGen/PseudoLoweringEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/PseudoLoweringEmitter.h
  stable/9/contrib/llvm/utils/TableGen/RegisterInfoEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/RegisterInfoEmitter.h
  stable/9/contrib/llvm/utils/TableGen/SetTheory.cpp
  stable/9/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp
  stable/9/contrib/llvm/utils/TableGen/SubtargetEmitter.h
  stable/9/contrib/llvm/utils/TableGen/TableGen.cpp
  stable/9/contrib/llvm/utils/TableGen/X86DisassemblerTables.cpp
  stable/9/contrib/llvm/utils/TableGen/X86DisassemblerTables.h
  stable/9/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp
  stable/9/contrib/llvm/utils/TableGen/X86RecognizableInstr.h
  stable/9/lib/clang/Makefile
  stable/9/lib/clang/clang.build.mk
  stable/9/lib/clang/include/clang/Basic/Version.inc
  stable/9/lib/clang/include/llvm/Config/config.h
  stable/9/lib/clang/include/llvm/Config/llvm-config.h
  stable/9/lib/clang/libclanganalysis/Makefile
  stable/9/lib/clang/libclangarcmigrate/Makefile
  stable/9/lib/clang/libclangast/Makefile
  stable/9/lib/clang/libclangbasic/Makefile
  stable/9/lib/clang/libclangcodegen/Makefile
  stable/9/lib/clang/libclangfrontend/Makefile
  stable/9/lib/clang/libclangparse/Makefile
  stable/9/lib/clang/libclangsema/Makefile
  stable/9/lib/clang/libclangserialization/Makefile
  stable/9/lib/clang/libclangstaticanalyzercheckers/Makefile
  stable/9/lib/clang/libclangstaticanalyzercore/Makefile
  stable/9/lib/clang/libllvmarmcodegen/Makefile
  stable/9/lib/clang/libllvmarmdesc/Makefile
  stable/9/lib/clang/libllvmarmdisassembler/Makefile
  stable/9/lib/clang/libllvmcodegen/Makefile
  stable/9/lib/clang/libllvmipo/Makefile
  stable/9/lib/clang/libllvmmc/Makefile
  stable/9/lib/clang/libllvmmcparser/Makefile
  stable/9/lib/clang/libllvmmipscodegen/Makefile
  stable/9/lib/clang/libllvmmipsdesc/Makefile
  stable/9/lib/clang/libllvmpowerpccodegen/Makefile
  stable/9/lib/clang/libllvmpowerpcdesc/Makefile
  stable/9/lib/clang/libllvmscalaropts/Makefile
  stable/9/lib/clang/libllvmtarget/Makefile
  stable/9/lib/clang/libllvmtransformutils/Makefile
  stable/9/lib/clang/libllvmx86codegen/Makefile
  stable/9/lib/clang/libllvmx86desc/Makefile
  stable/9/lib/clang/libllvmx86disassembler/Makefile
  stable/9/usr.bin/clang/Makefile
  stable/9/usr.bin/clang/clang/clang.1
  stable/9/usr.bin/clang/tblgen/Makefile
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)
  stable/9/lib/clang/   (props changed)
  stable/9/usr.bin/clang/   (props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/Makefile.inc1	Fri Oct 28 21:08:39 2011	(r226890)
@@ -1030,7 +1030,9 @@ _crunchgen=	usr.sbin/crunch/crunchgen
 .if ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
-	usr.bin/clang/tblgen
+	lib/clang/libllvmtablegen \
+	usr.bin/clang/tblgen \
+	usr.bin/clang/clang-tblgen
 .endif
 
 .if ${MK_CDDL} != "no" && \

Modified: stable/9/contrib/llvm/include/llvm-c/Core.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm-c/Core.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm-c/Core.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -115,7 +115,10 @@ typedef enum {
     LLVMNoImplicitFloatAttribute = 1<<23,
     LLVMNakedAttribute      = 1<<24,
     LLVMInlineHintAttribute = 1<<25,
-    LLVMStackAlignment = 7<<26
+    LLVMStackAlignment = 7<<26,
+    LLVMReturnsTwice = 1 << 29,
+    LLVMUWTable = 1 << 30,
+    LLVMNonLazyBind = 1 << 31
 } LLVMAttribute;
 
 typedef enum {
@@ -125,7 +128,7 @@ typedef enum {
   LLVMSwitch         = 3,
   LLVMIndirectBr     = 4,
   LLVMInvoke         = 5,
-  LLVMUnwind         = 6,
+  /* removed 6 due to API changes */
   LLVMUnreachable    = 7,
 
   /* Standard Binary Operators */
@@ -176,14 +179,26 @@ typedef enum {
   LLVMPHI            = 44,
   LLVMCall           = 45,
   LLVMSelect         = 46,
-  /* UserOp1 */
-  /* UserOp2 */
+  LLVMUserOp1        = 47,
+  LLVMUserOp2        = 48,
   LLVMVAArg          = 49,
   LLVMExtractElement = 50,
   LLVMInsertElement  = 51,
   LLVMShuffleVector  = 52,
   LLVMExtractValue   = 53,
-  LLVMInsertValue    = 54
+  LLVMInsertValue    = 54,
+
+  /* Atomic operators */
+  LLVMFence          = 55,
+  LLVMAtomicCmpXchg  = 56,
+  LLVMAtomicRMW      = 57,
+
+  /* Exception Handling Operators */
+  LLVMResume         = 58,
+  LLVMLandingPad     = 59,
+  LLVMUnwind         = 60
+
+
 } LLVMOpcode;
 
 typedef enum {
@@ -274,6 +289,11 @@ typedef enum {
   LLVMRealPredicateTrue   /**< Always true (always folded) */
 } LLVMRealPredicate;
 
+typedef enum {
+  LLVMLandingPadCatch,    /**< A catch clause   */
+  LLVMLandingPadFilter    /**< A filter clause  */
+} LLVMLandingPadClauseTy;
+
 void LLVMInitializeCore(LLVMPassRegistryRef R);
 
 
@@ -340,6 +360,7 @@ LLVMContextRef LLVMGetModuleContext(LLVM
 
 /** See llvm::LLVMTypeKind::getTypeID. */
 LLVMTypeKind LLVMGetTypeKind(LLVMTypeRef Ty);
+LLVMBool LLVMTypeIsSized(LLVMTypeRef Ty);
 
 /** See llvm::LLVMType::getContext. */
 LLVMContextRef LLVMGetTypeContext(LLVMTypeRef Ty);
@@ -388,6 +409,7 @@ LLVMTypeRef LLVMStructTypeInContext(LLVM
 LLVMTypeRef LLVMStructType(LLVMTypeRef *ElementTypes, unsigned ElementCount,
                            LLVMBool Packed);
 LLVMTypeRef LLVMStructCreateNamed(LLVMContextRef C, const char *Name);
+const char *LLVMGetStructName(LLVMTypeRef Ty);
 void LLVMStructSetBody(LLVMTypeRef StructTy, LLVMTypeRef *ElementTypes,
                        unsigned ElementCount, LLVMBool Packed);
 
@@ -427,8 +449,11 @@ LLVMTypeRef LLVMX86MMXType(void);
   macro(Argument)                           \
   macro(BasicBlock)                         \
   macro(InlineAsm)                          \
+  macro(MDNode)                             \
+  macro(MDString)                           \
   macro(User)                               \
     macro(Constant)                         \
+      macro(BlockAddress)                   \
       macro(ConstantAggregateZero)          \
       macro(ConstantArray)                  \
       macro(ConstantExpr)                   \
@@ -448,29 +473,32 @@ LLVMTypeRef LLVMX86MMXType(void);
         macro(IntrinsicInst)                \
           macro(DbgInfoIntrinsic)           \
             macro(DbgDeclareInst)           \
+          macro(EHExceptionInst)            \
           macro(EHSelectorInst)             \
           macro(MemIntrinsic)               \
             macro(MemCpyInst)               \
             macro(MemMoveInst)              \
             macro(MemSetInst)               \
       macro(CmpInst)                        \
-      macro(FCmpInst)                       \
-      macro(ICmpInst)                       \
+        macro(FCmpInst)                     \
+        macro(ICmpInst)                     \
       macro(ExtractElementInst)             \
       macro(GetElementPtrInst)              \
       macro(InsertElementInst)              \
       macro(InsertValueInst)                \
+      macro(LandingPadInst)                 \
       macro(PHINode)                        \
       macro(SelectInst)                     \
       macro(ShuffleVectorInst)              \
       macro(StoreInst)                      \
       macro(TerminatorInst)                 \
         macro(BranchInst)                   \
+        macro(IndirectBrInst)               \
         macro(InvokeInst)                   \
         macro(ReturnInst)                   \
         macro(SwitchInst)                   \
         macro(UnreachableInst)              \
-        macro(UnwindInst)                   \
+        macro(ResumeInst)                   \
     macro(UnaryInstruction)                 \
       macro(AllocaInst)                     \
       macro(CastInst)                       \
@@ -533,6 +561,11 @@ LLVMValueRef LLVMMDString(const char *St
 LLVMValueRef LLVMMDNodeInContext(LLVMContextRef C, LLVMValueRef *Vals,
                                  unsigned Count);
 LLVMValueRef LLVMMDNode(LLVMValueRef *Vals, unsigned Count);
+const char  *LLVMGetMDString(LLVMValueRef V, unsigned* Len);
+int LLVMGetMDNodeNumOperands(LLVMValueRef V);
+LLVMValueRef *LLVMGetMDNodeOperand(LLVMValueRef V, unsigned i);
+unsigned LLVMGetNamedMetadataNumOperands(LLVMModuleRef M, const char* name);
+void LLVMGetNamedMetadataOperands(LLVMModuleRef M, const char* name, LLVMValueRef *Dest);
 
 /* Operations on scalar constants */
 LLVMValueRef LLVMConstInt(LLVMTypeRef IntTy, unsigned long long N,
@@ -728,6 +761,7 @@ LLVMValueRef LLVMBasicBlockAsValue(LLVMB
 LLVMBool LLVMValueIsBasicBlock(LLVMValueRef Val);
 LLVMBasicBlockRef LLVMValueAsBasicBlock(LLVMValueRef Val);
 LLVMValueRef LLVMGetBasicBlockParent(LLVMBasicBlockRef BB);
+LLVMValueRef LLVMGetBasicBlockTerminator(LLVMBasicBlockRef BB);
 unsigned LLVMCountBasicBlocks(LLVMValueRef Fn);
 void LLVMGetBasicBlocks(LLVMValueRef Fn, LLVMBasicBlockRef *BasicBlocks);
 LLVMBasicBlockRef LLVMGetFirstBasicBlock(LLVMValueRef Fn);
@@ -747,16 +781,21 @@ LLVMBasicBlockRef LLVMAppendBasicBlock(L
 LLVMBasicBlockRef LLVMInsertBasicBlock(LLVMBasicBlockRef InsertBeforeBB,
                                        const char *Name);
 void LLVMDeleteBasicBlock(LLVMBasicBlockRef BB);
+void LLVMRemoveBasicBlockFromParent(LLVMBasicBlockRef BB);
 
 void LLVMMoveBasicBlockBefore(LLVMBasicBlockRef BB, LLVMBasicBlockRef MovePos);
 void LLVMMoveBasicBlockAfter(LLVMBasicBlockRef BB, LLVMBasicBlockRef MovePos);
 
-/* Operations on instructions */
-LLVMBasicBlockRef LLVMGetInstructionParent(LLVMValueRef Inst);
 LLVMValueRef LLVMGetFirstInstruction(LLVMBasicBlockRef BB);
 LLVMValueRef LLVMGetLastInstruction(LLVMBasicBlockRef BB);
+
+/* Operations on instructions */
+LLVMBasicBlockRef LLVMGetInstructionParent(LLVMValueRef Inst);
 LLVMValueRef LLVMGetNextInstruction(LLVMValueRef Inst);
 LLVMValueRef LLVMGetPreviousInstruction(LLVMValueRef Inst);
+void LLVMInstructionEraseFromParent(LLVMValueRef Inst);
+LLVMOpcode   LLVMGetInstructionOpcode(LLVMValueRef Inst);
+LLVMIntPredicate LLVMGetICmpPredicate(LLVMValueRef Inst);
 
 /* Operations on call sites */
 void LLVMSetInstructionCallConv(LLVMValueRef Instr, unsigned CC);
@@ -771,6 +810,9 @@ void LLVMSetInstrParamAlignment(LLVMValu
 LLVMBool LLVMIsTailCall(LLVMValueRef CallInst);
 void LLVMSetTailCall(LLVMValueRef CallInst, LLVMBool IsTailCall);
 
+/* Operations on switch instructions (only) */
+LLVMBasicBlockRef LLVMGetSwitchDefaultDest(LLVMValueRef SwitchInstr);
+
 /* Operations on phi nodes */
 void LLVMAddIncoming(LLVMValueRef PhiNode, LLVMValueRef *IncomingValues,
                      LLVMBasicBlockRef *IncomingBlocks, unsigned Count);
@@ -818,7 +860,10 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilder
                              LLVMValueRef *Args, unsigned NumArgs,
                              LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch,
                              const char *Name);
-LLVMValueRef LLVMBuildUnwind(LLVMBuilderRef);
+LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
+                                 LLVMValueRef PersFn, unsigned NumClauses,
+                                 const char *Name);
+LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn);
 LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef);
 
 /* Add a case to the switch instruction */
@@ -828,6 +873,12 @@ void LLVMAddCase(LLVMValueRef Switch, LL
 /* Add a destination to the indirectbr instruction */
 void LLVMAddDestination(LLVMValueRef IndirectBr, LLVMBasicBlockRef Dest);
 
+/* Add a catch or filter clause to the landingpad instruction */
+void LLVMAddClause(LLVMValueRef LandingPad, LLVMValueRef ClauseVal);
+
+/* Set the 'cleanup' flag in the landingpad instruction */
+void LLVMSetCleanup(LLVMValueRef LandingPad, LLVMBool Val);
+
 /* Arithmetic */
 LLVMValueRef LLVMBuildAdd(LLVMBuilderRef, LLVMValueRef LHS, LLVMValueRef RHS,
                           const char *Name);
@@ -1136,7 +1187,7 @@ namespace llvm {
     return reinterpret_cast<Type**>(Tys);
   }
   
-  inline LLVMTypeRef *wrap(const Type **Tys) {
+  inline LLVMTypeRef *wrap(Type **Tys) {
     return reinterpret_cast<LLVMTypeRef*>(const_cast<Type**>(Tys));
   }
   

Modified: stable/9/contrib/llvm/include/llvm-c/Disassembler.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm-c/Disassembler.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm-c/Disassembler.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -66,7 +66,7 @@ typedef int (*LLVMOpInfoCallback)(void *
  */
 struct LLVMOpInfoSymbol1 {
   uint64_t Present;  /* 1 if this symbol is present */
-  char *Name;        /* symbol name if not NULL */
+  const char *Name;  /* symbol name if not NULL */
   uint64_t Value;    /* symbol value if name is NULL */
 };
 
@@ -93,11 +93,35 @@ struct LLVMOpInfo1 {
  * disassembler for things like adding a comment for a PC plus a constant
  * offset load instruction to use a symbol name instead of a load address value.
  * It is passed the block information is saved when the disassembler context is
- * created and a value of a symbol to look up.  If no symbol is found NULL is
- * returned.
+ * created and the ReferenceValue to look up as a symbol.  If no symbol is found
+ * for the ReferenceValue NULL is returned.  The ReferenceType of the
+ * instruction is passed indirectly as is the PC of the instruction in
+ * ReferencePC.  If the output reference can be determined its type is returned
+ * indirectly in ReferenceType along with ReferenceName if any, or that is set
+ * to NULL.
  */
 typedef const char *(*LLVMSymbolLookupCallback)(void *DisInfo,
-                                                uint64_t SymbolValue);
+                                                uint64_t ReferenceValue,
+						uint64_t *ReferenceType,
+						uint64_t ReferencePC,
+						const char **ReferenceName);
+/**
+ * The reference types on input and output.
+ */
+/* No input reference type or no output reference type. */
+#define LLVMDisassembler_ReferenceType_InOut_None 0
+
+/* The input reference is from a branch instruction. */
+#define LLVMDisassembler_ReferenceType_In_Branch 1
+/* The input reference is from a PC relative load instruction. */
+#define LLVMDisassembler_ReferenceType_In_PCrel_Load 2
+
+/* The output reference is to as symbol stub. */
+#define LLVMDisassembler_ReferenceType_Out_SymbolStub 1
+/* The output reference is to a symbol address in a literal pool. */
+#define LLVMDisassembler_ReferenceType_Out_LitPool_SymAddr 2
+/* The output reference is to a cstring address in a literal pool. */
+#define LLVMDisassembler_ReferenceType_Out_LitPool_CstrAddr 3
 
 #ifdef __cplusplus
 extern "C" {

Modified: stable/9/contrib/llvm/include/llvm-c/Object.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm-c/Object.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm-c/Object.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -59,14 +59,14 @@ namespace llvm {
       return reinterpret_cast<LLVMObjectFileRef>(const_cast<ObjectFile*>(OF));
     }
 
-    inline ObjectFile::section_iterator *unwrap(LLVMSectionIteratorRef SI) {
-      return reinterpret_cast<ObjectFile::section_iterator*>(SI);
+    inline section_iterator *unwrap(LLVMSectionIteratorRef SI) {
+      return reinterpret_cast<section_iterator*>(SI);
     }
 
     inline LLVMSectionIteratorRef
-    wrap(const ObjectFile::section_iterator *SI) {
+    wrap(const section_iterator *SI) {
       return reinterpret_cast<LLVMSectionIteratorRef>
-        (const_cast<ObjectFile::section_iterator*>(SI));
+        (const_cast<section_iterator*>(SI));
     }
   }
 }

Modified: stable/9/contrib/llvm/include/llvm-c/Target.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm-c/Target.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm-c/Target.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -29,6 +29,7 @@ extern "C" {
 enum LLVMByteOrdering { LLVMBigEndian, LLVMLittleEndian };
 
 typedef struct LLVMOpaqueTargetData *LLVMTargetDataRef;
+typedef struct LLVMOpaqueTargetLibraryInfotData *LLVMTargetLibraryInfoRef;
 typedef struct LLVMStructLayout *LLVMStructLayoutRef;
 
 /* Declare all of the target-initialization functions that are available. */
@@ -42,7 +43,7 @@ typedef struct LLVMStructLayout *LLVMStr
 #undef LLVM_TARGET  /* Explicit undef to make SWIG happier */
 
 #define LLVM_TARGET(TargetName) \
-  void LLVMInitialize##TargetName##MCAsmInfo(void);
+  void LLVMInitialize##TargetName##TargetMC(void);
 #include "llvm/Config/Targets.def"
 #undef LLVM_TARGET  /* Explicit undef to make SWIG happier */
   
@@ -72,7 +73,7 @@ static inline LLVMBool LLVMInitializeNat
 #ifdef LLVM_NATIVE_TARGET
   LLVM_NATIVE_TARGETINFO();
   LLVM_NATIVE_TARGET();
-  LLVM_NATIVE_MCASMINFO();
+  LLVM_NATIVE_TARGETMC();
   return 0;
 #else
   return 1;
@@ -90,6 +91,11 @@ LLVMTargetDataRef LLVMCreateTargetData(c
     See the method llvm::PassManagerBase::add. */
 void LLVMAddTargetData(LLVMTargetDataRef, LLVMPassManagerRef);
 
+/** Adds target library information to a pass manager. This does not take
+    ownership of the target library info.
+    See the method llvm::PassManagerBase::add. */
+void LLVMAddTargetLibraryInfo(LLVMTargetLibraryInfoRef, LLVMPassManagerRef);
+
 /** Converts target data to a target layout string. The string must be disposed
     with LLVMDisposeMessage.
     See the constructor llvm::TargetData::TargetData. */
@@ -157,6 +163,7 @@ void LLVMDisposeTargetData(LLVMTargetDat
 
 namespace llvm {
   class TargetData;
+  class TargetLibraryInfo;
 
   inline TargetData *unwrap(LLVMTargetDataRef P) {
     return reinterpret_cast<TargetData*>(P);
@@ -165,6 +172,15 @@ namespace llvm {
   inline LLVMTargetDataRef wrap(const TargetData *P) {
     return reinterpret_cast<LLVMTargetDataRef>(const_cast<TargetData*>(P));
   }
+
+  inline TargetLibraryInfo *unwrap(LLVMTargetLibraryInfoRef P) {
+    return reinterpret_cast<TargetLibraryInfo*>(P);
+  }
+
+  inline LLVMTargetLibraryInfoRef wrap(const TargetLibraryInfo *P) {
+    TargetLibraryInfo *X = const_cast<TargetLibraryInfo*>(P);
+    return reinterpret_cast<LLVMTargetLibraryInfoRef>(X);
+  }
 }
 
 #endif /* defined(__cplusplus) */

Modified: stable/9/contrib/llvm/include/llvm-c/Transforms/IPO.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm-c/Transforms/IPO.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm-c/Transforms/IPO.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -36,6 +36,9 @@ void LLVMAddFunctionAttrsPass(LLVMPassMa
 /** See llvm::createFunctionInliningPass function. */
 void LLVMAddFunctionInliningPass(LLVMPassManagerRef PM);
 
+/** See llvm::createAlwaysInlinerPass function. */
+void LLVMAddAlwaysInlinerPass(LLVMPassManagerRef PM);
+
 /** See llvm::createGlobalDCEPass function. */
 void LLVMAddGlobalDCEPass(LLVMPassManagerRef PM);
 
@@ -45,9 +48,6 @@ void LLVMAddGlobalOptimizerPass(LLVMPass
 /** See llvm::createIPConstantPropagationPass function. */
 void LLVMAddIPConstantPropagationPass(LLVMPassManagerRef PM);
 
-/** See llvm::createLowerSetJmpPass function. */
-void LLVMAddLowerSetJmpPass(LLVMPassManagerRef PM);
-
 /** See llvm::createPruneEHPass function. */
 void LLVMAddPruneEHPass(LLVMPassManagerRef PM);
 
@@ -57,9 +57,6 @@ void LLVMAddIPSCCPPass(LLVMPassManagerRe
 /** See llvm::createInternalizePass function. */
 void LLVMAddInternalizePass(LLVMPassManagerRef, unsigned AllButMain);
 
-// FIXME: Remove in LLVM 3.0.
-void LLVMAddRaiseAllocationsPass(LLVMPassManagerRef PM);
-
 /** See llvm::createStripDeadPrototypesPass function. */
 void LLVMAddStripDeadPrototypesPass(LLVMPassManagerRef PM);
 

Copied: stable/9/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h (from r226633, head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h	Fri Oct 28 21:08:39 2011	(r226890, copy of r226633, head/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h)
@@ -0,0 +1,90 @@
+/*===-- llvm-c/Transform/PassManagerBuilder.h - PMB C Interface ---*- C -*-===*\
+|*                                                                            *|
+|*                     The LLVM Compiler Infrastructure                       *|
+|*                                                                            *|
+|* This file is distributed under the University of Illinois Open Source      *|
+|* License. See LICENSE.TXT for details.                                      *|
+|*                                                                            *|
+|*===----------------------------------------------------------------------===*|
+|*                                                                            *|
+|* This header declares the C interface to the PassManagerBuilder class.      *|
+|*                                                                            *|
+\*===----------------------------------------------------------------------===*/
+
+#ifndef LLVM_C_PASSMANAGERBUILDER
+#define LLVM_C_PASSMANAGERBUILDER
+
+#include "llvm-c/Core.h"
+
+typedef struct LLVMOpaquePassManagerBuilder *LLVMPassManagerBuilderRef;
+
+#ifdef __cplusplus
+#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+extern "C" {
+#endif
+
+/** See llvm::PassManagerBuilder. */
+LLVMPassManagerBuilderRef LLVMPassManagerBuilderCreate(void);
+void LLVMPassManagerBuilderDispose(LLVMPassManagerBuilderRef PMB);
+
+/** See llvm::PassManagerBuilder::OptLevel. */
+void
+LLVMPassManagerBuilderSetOptLevel(LLVMPassManagerBuilderRef PMB,
+                                  unsigned OptLevel);
+
+/** See llvm::PassManagerBuilder::SizeLevel. */
+void
+LLVMPassManagerBuilderSetSizeLevel(LLVMPassManagerBuilderRef PMB,
+                                   unsigned SizeLevel);
+
+/** See llvm::PassManagerBuilder::DisableUnitAtATime. */
+void
+LLVMPassManagerBuilderSetDisableUnitAtATime(LLVMPassManagerBuilderRef PMB,
+                                            LLVMBool Value);
+
+/** See llvm::PassManagerBuilder::DisableUnrollLoops. */
+void
+LLVMPassManagerBuilderSetDisableUnrollLoops(LLVMPassManagerBuilderRef PMB,
+                                            LLVMBool Value);
+
+/** See llvm::PassManagerBuilder::DisableSimplifyLibCalls */
+void
+LLVMPassManagerBuilderSetDisableSimplifyLibCalls(LLVMPassManagerBuilderRef PMB,
+                                                 LLVMBool Value);
+
+/** See llvm::PassManagerBuilder::Inliner. */
+void
+LLVMPassManagerBuilderUseInlinerWithThreshold(LLVMPassManagerBuilderRef PMB,
+                                              unsigned Threshold);
+
+/** See llvm::PassManagerBuilder::populateFunctionPassManager. */
+void
+LLVMPassManagerBuilderPopulateFunctionPassManager(LLVMPassManagerBuilderRef PMB,
+                                                  LLVMPassManagerRef PM);
+
+/** See llvm::PassManagerBuilder::populateModulePassManager. */
+void
+LLVMPassManagerBuilderPopulateModulePassManager(LLVMPassManagerBuilderRef PMB,
+                                                LLVMPassManagerRef PM);
+
+/** See llvm::PassManagerBuilder::populateLTOPassManager. */
+void LLVMPassManagerBuilderPopulateLTOPassManager(LLVMPassManagerBuilderRef PMB,
+                                                  LLVMPassManagerRef PM,
+                                                  bool Internalize,
+                                                  bool RunInliner);
+
+#ifdef __cplusplus
+}
+
+namespace llvm {
+  inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) {
+    return reinterpret_cast<PassManagerBuilder*>(P);
+  }
+
+  inline LLVMPassManagerBuilderRef wrap(PassManagerBuilder *P) {
+    return reinterpret_cast<LLVMPassManagerBuilderRef>(P);
+  }
+}
+#endif
+
+#endif

Modified: stable/9/contrib/llvm/include/llvm-c/Transforms/Scalar.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm-c/Transforms/Scalar.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm-c/Transforms/Scalar.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -107,6 +107,9 @@ void LLVMAddCorrelatedValuePropagationPa
 /** See llvm::createEarlyCSEPass function */
 void LLVMAddEarlyCSEPass(LLVMPassManagerRef PM);
 
+/** See llvm::createLowerExpectIntrinsicPass function */
+void LLVMAddLowerExpectIntrinsicPass(LLVMPassManagerRef PM);
+
 /** See llvm::createTypeBasedAliasAnalysisPass function */
 void LLVMAddTypeBasedAliasAnalysisPass(LLVMPassManagerRef PM);
 

Modified: stable/9/contrib/llvm/include/llvm/ADT/APInt.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm/ADT/APInt.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm/ADT/APInt.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -15,6 +15,7 @@
 #ifndef LLVM_APINT_H
 #define LLVM_APINT_H
 
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/MathExtras.h"
 #include <cassert>
 #include <climits>
@@ -160,7 +161,7 @@ class APInt {
   /// not assume that the string is well-formed and (2) grows the
   /// result to hold the input.
   ///
-  /// @param radix 2, 8, 10, or 16
+  /// @param radix 2, 8, 10, 16, or 36
   /// @brief Convert a char array into an APInt
   void fromString(unsigned numBits, StringRef str, uint8_t radix);
 
@@ -176,6 +177,9 @@ class APInt {
   /// out-of-line slow case for inline constructor
   void initSlowCase(unsigned numBits, uint64_t val, bool isSigned);
 
+  /// shared code between two array constructors
+  void initFromArray(ArrayRef<uint64_t> array);
+
   /// out-of-line slow case for inline copy constructor
   void initSlowCase(const APInt& that);
 
@@ -230,19 +234,26 @@ public:
     clearUnusedBits();
   }
 
-  /// Note that numWords can be smaller or larger than the corresponding bit
-  /// width but any extraneous bits will be dropped.
+  /// Note that bigVal.size() can be smaller or larger than the corresponding
+  /// bit width but any extraneous bits will be dropped.
   /// @param numBits the bit width of the constructed APInt
-  /// @param numWords the number of words in bigVal
   /// @param bigVal a sequence of words to form the initial value of the APInt
   /// @brief Construct an APInt of numBits width, initialized as bigVal[].
+  APInt(unsigned numBits, ArrayRef<uint64_t> bigVal);
+  /// Equivalent to APInt(numBits, ArrayRef<uint64_t>(bigVal, numWords)), but
+  /// deprecated because this constructor is prone to ambiguity with the
+  /// APInt(unsigned, uint64_t, bool) constructor.
+  ///
+  /// If this overload is ever deleted, care should be taken to prevent calls
+  /// from being incorrectly captured by the APInt(unsigned, uint64_t, bool)
+  /// constructor.
   APInt(unsigned numBits, unsigned numWords, const uint64_t bigVal[]);
 
   /// This constructor interprets the string \arg str in the given radix. The
   /// interpretation stops when the first character that is not suitable for the
   /// radix is encountered, or the end of the string. Acceptable radix values
-  /// are 2, 8, 10 and 16. It is an error for the value implied by the string to
-  /// require more bits than numBits.
+  /// are 2, 8, 10, 16, and 36. It is an error for the value implied by the 
+  /// string to require more bits than numBits.
   ///
   /// @param numBits the bit width of the constructed APInt
   /// @param str the string to be interpreted
@@ -342,7 +353,8 @@ public:
 
     if (isSingleWord())
       return isUIntN(N, VAL);
-    return APInt(N, getNumWords(), pVal).zext(getBitWidth()) == (*this);
+    return APInt(N, makeArrayRef(pVal, getNumWords())).zext(getBitWidth())
+      == (*this);
   }
 
   /// @brief Check if this APInt has an N-bits signed integer value.
@@ -1245,13 +1257,13 @@ public:
                 bool formatAsCLiteral = false) const;
 
   /// Considers the APInt to be unsigned and converts it into a string in the
-  /// radix given. The radix can be 2, 8, 10 or 16.
+  /// radix given. The radix can be 2, 8, 10 16, or 36.
   void toStringUnsigned(SmallVectorImpl<char> &Str, unsigned Radix = 10) const {
     toString(Str, Radix, false, false);
   }
 
   /// Considers the APInt to be signed and converts it into a string in the
-  /// radix given. The radix can be 2, 8, 10 or 16.
+  /// radix given. The radix can be 2, 8, 10, 16, or 36.
   void toStringSigned(SmallVectorImpl<char> &Str, unsigned Radix = 10) const {
     toString(Str, Radix, true, false);
   }

Modified: stable/9/contrib/llvm/include/llvm/ADT/ArrayRef.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm/ADT/ArrayRef.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm/ADT/ArrayRef.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -147,7 +147,53 @@ namespace llvm {
     
     /// @}
   };
-  
+
+  /// @name ArrayRef Convenience constructors
+  /// @{
+
+  /// Construct an ArrayRef from a single element.
+  template<typename T>
+  ArrayRef<T> makeArrayRef(const T &OneElt) {
+    return OneElt;
+  }
+
+  /// Construct an ArrayRef from a pointer and length.
+  template<typename T>
+  ArrayRef<T> makeArrayRef(const T *data, size_t length) {
+    return ArrayRef<T>(data, length);
+  }
+
+  /// Construct an ArrayRef from a range.
+  template<typename T>
+  ArrayRef<T> makeArrayRef(const T *begin, const T *end) {
+    return ArrayRef<T>(begin, end);
+  }
+
+  /// Construct an ArrayRef from a SmallVector.
+  template <typename T>
+  ArrayRef<T> makeArrayRef(const SmallVectorImpl<T> &Vec) {
+    return Vec;
+  }
+
+  /// Construct an ArrayRef from a SmallVector.
+  template <typename T, unsigned N>
+  ArrayRef<T> makeArrayRef(const SmallVector<T, N> &Vec) {
+    return Vec;
+  }
+
+  /// Construct an ArrayRef from a std::vector.
+  template<typename T>
+  ArrayRef<T> makeArrayRef(const std::vector<T> &Vec) {
+    return Vec;
+  }
+
+  /// Construct an ArrayRef from a C array.
+  template<typename T, size_t N>
+  ArrayRef<T> makeArrayRef(const T (&Arr)[N]) {
+    return ArrayRef<T>(Arr);
+  }
+
+  /// @}
   /// @name ArrayRef Comparison Operators
   /// @{
 

Modified: stable/9/contrib/llvm/include/llvm/ADT/DenseMap.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm/ADT/DenseMap.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm/ADT/DenseMap.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -540,6 +540,12 @@ private:
       ++Ptr;
   }
 };
+  
+template<typename KeyT, typename ValueT, typename KeyInfoT, typename ValueInfoT>
+static inline size_t
+capacity_in_bytes(const DenseMap<KeyT, ValueT, KeyInfoT, ValueInfoT> &X) {
+  return X.getMemorySize();
+}
 
 } // end namespace llvm
 

Modified: stable/9/contrib/llvm/include/llvm/ADT/DenseMapInfo.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm/ADT/DenseMapInfo.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm/ADT/DenseMapInfo.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -51,7 +51,7 @@ struct DenseMapInfo<T*> {
 template<> struct DenseMapInfo<char> {
   static inline char getEmptyKey() { return ~0; }
   static inline char getTombstoneKey() { return ~0 - 1; }
-  static unsigned getHashValue(const char& Val) { return Val * 37; }
+  static unsigned getHashValue(const char& Val) { return Val * 37U; }
   static bool isEqual(const char &LHS, const char &RHS) {
     return LHS == RHS;
   }
@@ -61,7 +61,7 @@ template<> struct DenseMapInfo<char> {
 template<> struct DenseMapInfo<unsigned> {
   static inline unsigned getEmptyKey() { return ~0; }
   static inline unsigned getTombstoneKey() { return ~0U - 1; }
-  static unsigned getHashValue(const unsigned& Val) { return Val * 37; }
+  static unsigned getHashValue(const unsigned& Val) { return Val * 37U; }
   static bool isEqual(const unsigned& LHS, const unsigned& RHS) {
     return LHS == RHS;
   }
@@ -96,7 +96,7 @@ template<> struct DenseMapInfo<unsigned 
 template<> struct DenseMapInfo<int> {
   static inline int getEmptyKey() { return 0x7fffffff; }
   static inline int getTombstoneKey() { return -0x7fffffff - 1; }
-  static unsigned getHashValue(const int& Val) { return (unsigned)(Val * 37); }
+  static unsigned getHashValue(const int& Val) { return (unsigned)(Val * 37U); }
   static bool isEqual(const int& LHS, const int& RHS) {
     return LHS == RHS;
   }
@@ -109,7 +109,7 @@ template<> struct DenseMapInfo<long> {
   }
   static inline long getTombstoneKey() { return getEmptyKey() - 1L; }
   static unsigned getHashValue(const long& Val) {
-    return (unsigned)(Val * 37L);
+    return (unsigned)(Val * 37UL);
   }
   static bool isEqual(const long& LHS, const long& RHS) {
     return LHS == RHS;
@@ -121,7 +121,7 @@ template<> struct DenseMapInfo<long long
   static inline long long getEmptyKey() { return 0x7fffffffffffffffLL; }
   static inline long long getTombstoneKey() { return -0x7fffffffffffffffLL-1; }
   static unsigned getHashValue(const long long& Val) {
-    return (unsigned)(Val * 37LL);
+    return (unsigned)(Val * 37ULL);
   }
   static bool isEqual(const long long& LHS,
                       const long long& RHS) {
@@ -142,7 +142,7 @@ struct DenseMapInfo<std::pair<T, U> > {
   }
   static inline Pair getTombstoneKey() {
     return std::make_pair(FirstInfo::getTombstoneKey(),
-                            SecondInfo::getEmptyKey());
+                          SecondInfo::getTombstoneKey());
   }
   static unsigned getHashValue(const Pair& PairVal) {
     uint64_t key = (uint64_t)FirstInfo::getHashValue(PairVal.first) << 32
@@ -158,7 +158,7 @@ struct DenseMapInfo<std::pair<T, U> > {
     return (unsigned)key;
   }
   static bool isEqual(const Pair &LHS, const Pair &RHS) {
-    return FirstInfo::isEqual(LHS.first, RHS.first) && 
+    return FirstInfo::isEqual(LHS.first, RHS.first) &&
            SecondInfo::isEqual(LHS.second, RHS.second);
   }
 };

Modified: stable/9/contrib/llvm/include/llvm/ADT/DenseSet.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm/ADT/DenseSet.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm/ADT/DenseSet.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -28,7 +28,7 @@ class DenseSet {
   MapTy TheMap;
 public:
   DenseSet(const DenseSet &Other) : TheMap(Other.TheMap) {}
-  explicit DenseSet(unsigned NumInitBuckets = 64) : TheMap(NumInitBuckets) {}
+  explicit DenseSet(unsigned NumInitBuckets = 0) : TheMap(NumInitBuckets) {}
 
   bool empty() const { return TheMap.empty(); }
   unsigned size() const { return TheMap.size(); }

Modified: stable/9/contrib/llvm/include/llvm/ADT/ImmutableMap.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm/ADT/ImmutableMap.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm/ADT/ImmutableMap.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -117,6 +117,10 @@ public:
       return ImmutableMap(Canonicalize ? F.getCanonicalTree(T): T);
     }
 
+    typename TreeTy::Factory *getTreeFactory() const {
+      return const_cast<typename TreeTy::Factory *>(&F);
+    }
+
   private:
     Factory(const Factory& RHS); // DO NOT IMPLEMENT
     void operator=(const Factory& RHS); // DO NOT IMPLEMENT
@@ -256,6 +260,159 @@ public:
   }
 };
 
+// NOTE: This will possibly become the new implementation of ImmutableMap some day.
+template <typename KeyT, typename ValT,
+typename ValInfo = ImutKeyValueInfo<KeyT,ValT> >
+class ImmutableMapRef {
+public:
+  typedef typename ValInfo::value_type      value_type;
+  typedef typename ValInfo::value_type_ref  value_type_ref;
+  typedef typename ValInfo::key_type        key_type;
+  typedef typename ValInfo::key_type_ref    key_type_ref;
+  typedef typename ValInfo::data_type       data_type;
+  typedef typename ValInfo::data_type_ref   data_type_ref;
+  typedef ImutAVLTree<ValInfo>              TreeTy;
+  typedef typename TreeTy::Factory          FactoryTy;
+  
+protected:
+  TreeTy *Root;
+  FactoryTy *Factory;
+  
+public:
+  /// Constructs a map from a pointer to a tree root.  In general one
+  /// should use a Factory object to create maps instead of directly
+  /// invoking the constructor, but there are cases where make this
+  /// constructor public is useful.
+  explicit ImmutableMapRef(const TreeTy* R, FactoryTy *F) 
+    : Root(const_cast<TreeTy*>(R)),
+      Factory(F) {
+    if (Root) { Root->retain(); }
+  }
+  
+  ImmutableMapRef(const ImmutableMapRef &X)
+    : Root(X.Root),
+      Factory(X.Factory) {
+    if (Root) { Root->retain(); }
+  }
+
+  ImmutableMapRef &operator=(const ImmutableMapRef &X) {
+    if (Root != X.Root) {
+      if (X.Root)
+        X.Root->retain();
+      
+      if (Root)
+        Root->release();
+      
+      Root = X.Root;
+      Factory = X.Factory;
+    }
+    return *this;
+  }
+
+  ~ImmutableMapRef() {
+    if (Root)
+      Root->release();
+  }
+  
+  static inline ImmutableMapRef getEmptyMap(FactoryTy *F) {
+    return ImmutableMapRef(0, F);
+  }
+
+  ImmutableMapRef add(key_type_ref K, data_type_ref D) {
+    TreeTy *NewT = Factory->add(Root, std::pair<key_type, data_type>(K, D));
+    return ImmutableMapRef(NewT, Factory);
+  }
+
+  ImmutableMapRef remove(key_type_ref K) {
+    TreeTy *NewT = Factory->remove(Root, K);
+    return ImmutableMapRef(NewT, Factory);
+  }
+  
+  bool contains(key_type_ref K) const {
+    return Root ? Root->contains(K) : false;
+  }
+  
+  ImmutableMap<KeyT, ValT> asImmutableMap() const {
+    return ImmutableMap<KeyT, ValT>(Factory->getCanonicalTree(Root));
+  }
+  
+  bool operator==(const ImmutableMapRef &RHS) const {
+    return Root && RHS.Root ? Root->isEqual(*RHS.Root) : Root == RHS.Root;
+  }
+  
+  bool operator!=(const ImmutableMapRef &RHS) const {
+    return Root && RHS.Root ? Root->isNotEqual(*RHS.Root) : Root != RHS.Root;
+  }
+    
+  bool isEmpty() const { return !Root; }
+    
+  //===--------------------------------------------------===//
+  // For testing.
+  //===--------------------------------------------------===//
+  
+  void verify() const { if (Root) Root->verify(); }
+  
+  //===--------------------------------------------------===//
+  // Iterators.
+  //===--------------------------------------------------===//
+  
+  class iterator {
+    typename TreeTy::iterator itr;
+    
+    iterator() {}
+    iterator(TreeTy* t) : itr(t) {}
+    friend class ImmutableMapRef;
+    
+  public:
+    value_type_ref operator*() const { return itr->getValue(); }
+    value_type*    operator->() const { return &itr->getValue(); }
+    
+    key_type_ref getKey() const { return itr->getValue().first; }
+    data_type_ref getData() const { return itr->getValue().second; }
+    
+    
+    iterator& operator++() { ++itr; return *this; }
+    iterator  operator++(int) { iterator tmp(*this); ++itr; return tmp; }
+    iterator& operator--() { --itr; return *this; }
+    iterator  operator--(int) { iterator tmp(*this); --itr; return tmp; }
+    bool operator==(const iterator& RHS) const { return RHS.itr == itr; }
+    bool operator!=(const iterator& RHS) const { return RHS.itr != itr; }
+  };
+  
+  iterator begin() const { return iterator(Root); }
+  iterator end() const { return iterator(); }
+  
+  data_type* lookup(key_type_ref K) const {
+    if (Root) {
+      TreeTy* T = Root->find(K);
+      if (T) return &T->getValue().second;
+    }
+    
+    return 0;
+  }
+  
+  /// getMaxElement - Returns the <key,value> pair in the ImmutableMap for
+  ///  which key is the highest in the ordering of keys in the map.  This
+  ///  method returns NULL if the map is empty.
+  value_type* getMaxElement() const {
+    return Root ? &(Root->getMaxElement()->getValue()) : 0;
+  }
+  
+  //===--------------------------------------------------===//
+  // Utility methods.
+  //===--------------------------------------------------===//
+  
+  unsigned getHeight() const { return Root ? Root->getHeight() : 0; }
+  
+  static inline void Profile(FoldingSetNodeID& ID, const ImmutableMapRef &M) {
+    ID.AddPointer(M.Root);
+  }
+  
+  inline void Profile(FoldingSetNodeID& ID) const {
+    return Profile(ID, *this);
+  }
+};
+  
 } // end namespace llvm
 
 #endif

Modified: stable/9/contrib/llvm/include/llvm/ADT/ImmutableSet.h
==============================================================================
--- stable/9/contrib/llvm/include/llvm/ADT/ImmutableSet.h	Fri Oct 28 20:28:13 2011	(r226889)
+++ stable/9/contrib/llvm/include/llvm/ADT/ImmutableSet.h	Fri Oct 28 21:08:39 2011	(r226890)
@@ -997,6 +997,10 @@ public:
 
     BumpPtrAllocator& getAllocator() { return F.getAllocator(); }
 
+    typename TreeTy::Factory *getTreeFactory() const {
+      return const_cast<typename TreeTy::Factory *>(&F);
+    }
+    
   private:
     Factory(const Factory& RHS); // DO NOT IMPLEMENT
     void operator=(const Factory& RHS); // DO NOT IMPLEMENT
@@ -1021,6 +1025,10 @@ public:
     if (Root) { Root->retain(); }
     return Root;
   }
+  
+  TreeTy *getRootWithoutRetain() const {
+    return Root;
+  }
 
   /// isEmpty - Return true if the set contains no elements.
   bool isEmpty() const { return !Root; }
@@ -1078,6 +1086,132 @@ public:
 
   void validateTree() const { if (Root) Root->validateTree(); }
 };
+  
+// NOTE: This may some day replace the current ImmutableSet.
+template <typename ValT, typename ValInfo = ImutContainerInfo<ValT> >
+class ImmutableSetRef {
+public:
+  typedef typename ValInfo::value_type      value_type;
+  typedef typename ValInfo::value_type_ref  value_type_ref;
+  typedef ImutAVLTree<ValInfo> TreeTy;
+  typedef typename TreeTy::Factory          FactoryTy;
+  
+private:
+  TreeTy *Root;
+  FactoryTy *Factory;
+  
+public:
+  /// Constructs a set from a pointer to a tree root.  In general one
+  /// should use a Factory object to create sets instead of directly
+  /// invoking the constructor, but there are cases where make this
+  /// constructor public is useful.
+  explicit ImmutableSetRef(TreeTy* R, FactoryTy *F)
+    : Root(R),
+      Factory(F) {
+    if (Root) { Root->retain(); }
+  }
+  ImmutableSetRef(const ImmutableSetRef &X)
+    : Root(X.Root),
+      Factory(X.Factory) {
+    if (Root) { Root->retain(); }
+  }
+  ImmutableSetRef &operator=(const ImmutableSetRef &X) {
+    if (Root != X.Root) {
+      if (X.Root) { X.Root->retain(); }
+      if (Root) { Root->release(); }
+      Root = X.Root;
+      Factory = X.Factory;
+    }
+    return *this;
+  }
+  ~ImmutableSetRef() {
+    if (Root) { Root->release(); }
+  }
+  
+  static inline ImmutableSetRef getEmptySet(FactoryTy *F) {
+    return ImmutableSetRef(0, F);
+  }
+  
+  ImmutableSetRef add(value_type_ref V) {
+    return ImmutableSetRef(Factory->add(Root, V), Factory);
+  }
+  
+  ImmutableSetRef remove(value_type_ref V) {
+    return ImmutableSetRef(Factory->remove(Root, V), Factory);
+  }
+    
+  /// Returns true if the set contains the specified value.
+  bool contains(value_type_ref V) const {
+    return Root ? Root->contains(V) : false;
+  }
+  
+  ImmutableSet<ValT> asImmutableSet(bool canonicalize = true) const {
+    return ImmutableSet<ValT>(canonicalize ?
+                              Factory->getCanonicalTree(Root) : Root);

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

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 06:13:45 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FDDC106566B;
	Sat, 29 Oct 2011 06:13:45 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1F3A08FC0A;
	Sat, 29 Oct 2011 06:13: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 p9T6DjkX097083;
	Sat, 29 Oct 2011 06:13:45 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9T6DiZK097081;
	Sat, 29 Oct 2011 06:13:44 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201110290613.p9T6DiZK097081@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 29 Oct 2011 06:13: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: r226894 - stable/9/sys/vm
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 06:13:45 -0000

Author: attilio
Date: Sat Oct 29 06:13:44 2011
New Revision: 226894
URL: http://svn.freebsd.org/changeset/base/226894

Log:
  Include a missing opt_vm.h which doesn't let VM_NRESERVLEVEL switching
  correct utilization.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/vm/vm_phys.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)

Modified: stable/9/sys/vm/vm_phys.c
==============================================================================
--- stable/9/sys/vm/vm_phys.c	Sat Oct 29 01:26:36 2011	(r226893)
+++ stable/9/sys/vm/vm_phys.c	Sat Oct 29 06:13:44 2011	(r226894)
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_vm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 06:28:19 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45BAD106564A;
	Sat, 29 Oct 2011 06:28:19 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3545E8FC19;
	Sat, 29 Oct 2011 06:28:19 +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 p9T6SJqs097650;
	Sat, 29 Oct 2011 06:28:19 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9T6SJOO097648;
	Sat, 29 Oct 2011 06:28:19 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201110290628.p9T6SJOO097648@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 29 Oct 2011 06:28:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226897 - stable/8/sys/vm
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 06:28:19 -0000

Author: attilio
Date: Sat Oct 29 06:28:18 2011
New Revision: 226897
URL: http://svn.freebsd.org/changeset/base/226897

Log:
  MFC r226642:
  Include a missing opt_vm.h which doesn't let VM_NRESERVLEVEL switching
  correct utilization.

Modified:
  stable/8/sys/vm/vm_phys.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/vm/vm_phys.c
==============================================================================
--- stable/8/sys/vm/vm_phys.c	Sat Oct 29 06:26:49 2011	(r226896)
+++ stable/8/sys/vm/vm_phys.c	Sat Oct 29 06:28:18 2011	(r226897)
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_vm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 12:39:06 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BCE2106564A;
	Sat, 29 Oct 2011 12:39:06 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 30F4F8FC12;
	Sat, 29 Oct 2011 12:39:06 +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 p9TCd6JR016959;
	Sat, 29 Oct 2011 12:39:06 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TCd6pR016954;
	Sat, 29 Oct 2011 12:39:06 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201110291239.p9TCd6pR016954@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sat, 29 Oct 2011 12:39: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: r226904 - in stable/9/sys/dev/usb: . controller
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 12:39:06 -0000

Author: hselasky
Date: Sat Oct 29 12:39:05 2011
New Revision: 226904
URL: http://svn.freebsd.org/changeset/base/226904

Log:
  MFC r226803:
  Fix suspend and resume of non-super-speed USB devices
  in the generic XHCI driver. There appears to be some minor
  logic missing for this feature to work.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/usb/controller/xhci.c
  stable/9/sys/dev/usb/controller/xhcireg.h
  stable/9/sys/dev/usb/usb.h
  stable/9/sys/dev/usb/usb_hub.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)

Modified: stable/9/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/9/sys/dev/usb/controller/xhci.c	Sat Oct 29 12:32:13 2011	(r226903)
+++ stable/9/sys/dev/usb/controller/xhci.c	Sat Oct 29 12:39:05 2011	(r226904)
@@ -3048,7 +3048,9 @@ xhci_roothub_exec(struct usb_device *ude
 		}
 		port = XHCI_PORTSC(index);
 
-		v = XREAD4(sc, oper, port) & ~XHCI_PS_CLEAR;
+		v = XREAD4(sc, oper, port);
+		i = XHCI_PS_PLS_GET(v);
+		v &= ~XHCI_PS_CLEAR;
 
 		switch (value) {
 		case UHF_C_BH_PORT_RESET:
@@ -3082,6 +3084,17 @@ xhci_roothub_exec(struct usb_device *ude
 			XWRITE4(sc, oper, port, v & ~XHCI_PS_PIC_SET(3));
 			break;
 		case UHF_PORT_SUSPEND:
+
+			/* U3 -> U15 */
+			if (i == 3) {
+				XWRITE4(sc, oper, port, v |
+				    XHCI_PS_PLS_SET(0xF) | XHCI_PS_LWS);
+			}
+
+			/* wait 20ms for resume sequence to complete */
+			usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
+
+			/* U0 */
 			XWRITE4(sc, oper, port, v |
 			    XHCI_PS_PLS_SET(0) | XHCI_PS_LWS);
 			break;

Modified: stable/9/sys/dev/usb/controller/xhcireg.h
==============================================================================
--- stable/9/sys/dev/usb/controller/xhcireg.h	Sat Oct 29 12:32:13 2011	(r226903)
+++ stable/9/sys/dev/usb/controller/xhcireg.h	Sat Oct 29 12:39:05 2011	(r226904)
@@ -133,7 +133,7 @@
 #define	XHCI_PS_WOE		0x08000000	/* RW - wake on over-current enable */
 #define	XHCI_PS_DR		0x40000000	/* RO - device removable */
 #define	XHCI_PS_WPR		0x80000000U	/* RW - warm port reset */
-#define	XHCI_PS_CLEAR		0x80FF00F7U	/* command bits */
+#define	XHCI_PS_CLEAR		0x80FF01FFU	/* command bits */
 
 #define	XHCI_PORTPMSC(n)	(0x3F4 + (0x10 * (n)))	/* XHCI status and control */
 #define	XHCI_PM3_U1TO_GET(x)	(((x) >> 0) & 0xFF)	/* RW - U1 timeout */

Modified: stable/9/sys/dev/usb/usb.h
==============================================================================
--- stable/9/sys/dev/usb/usb.h	Sat Oct 29 12:32:13 2011	(r226903)
+++ stable/9/sys/dev/usb/usb.h	Sat Oct 29 12:39:05 2011	(r226904)
@@ -686,6 +686,7 @@ struct usb_port_status {
 #define	UPS_PORT_LS_HOT_RST	0x09
 #define	UPS_PORT_LS_COMP_MODE	0x0A
 #define	UPS_PORT_LS_LOOPBACK	0x0B
+#define	UPS_PORT_LS_RESUME	0x0F
 #define	UPS_PORT_POWER			0x0100
 #define	UPS_LOW_SPEED			0x0200
 #define	UPS_HIGH_SPEED			0x0400

Modified: stable/9/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/9/sys/dev/usb/usb_hub.c	Sat Oct 29 12:32:13 2011	(r226903)
+++ stable/9/sys/dev/usb/usb_hub.c	Sat Oct 29 12:39:05 2011	(r226904)
@@ -611,6 +611,7 @@ uhub_suspend_resume_port(struct uhub_sof
 		switch (UPS_PORT_LINK_STATE_GET(sc->sc_st.port_status)) {
 		case UPS_PORT_LS_U0:
 		case UPS_PORT_LS_U1:
+		case UPS_PORT_LS_RESUME:
 			is_suspend = 0;
 			break;
 		default:

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 16:38:04 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D96291065672;
	Sat, 29 Oct 2011 16:38:04 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AEFDC8FC14;
	Sat, 29 Oct 2011 16:38:04 +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 p9TGc4f0024539;
	Sat, 29 Oct 2011 16:38:04 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TGc4ps024537;
	Sat, 29 Oct 2011 16:38:04 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201110291638.p9TGc4ps024537@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 29 Oct 2011 16:38:04 +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: r226906 - stable/9/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 16:38:05 -0000

Author: marcel
Date: Sat Oct 29 16:38:04 2011
New Revision: 226906
URL: http://svn.freebsd.org/changeset/base/226906

Log:
  MFC r226673:
  Don't terminate the interactive root mount prompt on mount failure.
  This restores the previous behaviour. While here, match '?' and '.'
  inputs exactly and improve the error message.
  
  Requested by: avg@
  Derived from a patch by: Arnaud Lacombe <lacombar@gmail.com>
  Approved by: re (kib@)

Modified:
  stable/9/sys/kern/vfs_mountroot.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)

Modified: stable/9/sys/kern/vfs_mountroot.c
==============================================================================
--- stable/9/sys/kern/vfs_mountroot.c	Sat Oct 29 13:50:15 2011	(r226905)
+++ stable/9/sys/kern/vfs_mountroot.c	Sat Oct 29 16:38:04 2011	(r226906)
@@ -483,26 +483,27 @@ parse_dir_ask(char **conf)
 	printf("  .               Yield 1 second (for background tasks)\n");
 	printf("  <empty line>    Abort manual input\n");
 
- again:
-	printf("\nmountroot> ");
-	gets(name, sizeof(name), GETS_ECHO);
-	if (name[0] == '\0')
-		return (0);
-	if (name[0] == '?') {
-		printf("\nList of GEOM managed disk devices:\n  ");
-		g_dev_print();
-		goto again;
-	}
-	if (name[0] == '.') {
-		pause("rmask", hz);
-		goto again;
-	}
-	mnt = name;
-	error = parse_mount(&mnt);
-	if (error == -1) {
-		printf("Invalid specification.\n");
-		goto again;
-	}
+	do {
+		error = EINVAL;
+		printf("\nmountroot> ");
+		gets(name, sizeof(name), GETS_ECHO);
+		if (name[0] == '\0')
+			break;
+		if (name[0] == '?' && name[1] == '\0') {
+			printf("\nList of GEOM managed disk devices:\n  ");
+			g_dev_print();
+			continue;
+		}
+		if (name[0] == '.' && name[1] == '\0') {
+			pause("rmask", hz);
+			continue;
+		}
+		mnt = name;
+		error = parse_mount(&mnt);
+		if (error == -1)
+			printf("Invalid file system specification.\n");
+	} while (error != 0);
+
 	return (error);
 }
 

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 22:06:54 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20C7E1065670;
	Sat, 29 Oct 2011 22:06:54 +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 0EB148FC0A;
	Sat, 29 Oct 2011 22: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 p9TM6rvb034783;
	Sat, 29 Oct 2011 22:06:53 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TM6rWa034778;
	Sat, 29 Oct 2011 22:06:53 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292206.p9TM6rWa034778@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 22: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: r226910 - in stable/9/sys/dev: aac asr hptiop mfi
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 22:06:54 -0000

Author: marius
Date: Sat Oct 29 22:06:53 2011
New Revision: 226910
URL: http://svn.freebsd.org/changeset/base/226910

Log:
  Merge from r225950:
  
  Set the sense residual properly.
  
  Reviewed by:	ken
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/aac/aac_cam.c
  stable/9/sys/dev/asr/asr.c
  stable/9/sys/dev/hptiop/hptiop.c
  stable/9/sys/dev/mfi/mfi_cam.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)

Modified: stable/9/sys/dev/aac/aac_cam.c
==============================================================================
--- stable/9/sys/dev/aac/aac_cam.c	Sat Oct 29 18:16:29 2011	(r226909)
+++ stable/9/sys/dev/aac/aac_cam.c	Sat Oct 29 22:06:53 2011	(r226910)
@@ -532,6 +532,7 @@ aac_cam_complete(struct aac_command *cm)
 	union	ccb *ccb;
 	struct 	aac_srb_response *srbr;
 	struct	aac_softc *sc;
+	int	sense_returned;
 
 	sc = cm->cm_sc;
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -556,16 +557,17 @@ aac_cam_complete(struct aac_command *cm)
 
 			/* Take care of autosense */
 			if (srbr->sense_len) {
-				int sense_len, scsi_sense_len;
-
-				scsi_sense_len = sizeof(struct scsi_sense_data);
-				bzero(&ccb->csio.sense_data, scsi_sense_len);
-				sense_len = (srbr->sense_len >
-				    scsi_sense_len) ? scsi_sense_len :
-				    srbr->sense_len;
+				sense_returned = srbr->sense_len;
+				if (sense_returned < ccb->csio.sense_len)
+					ccb->csio.sense_resid =
+					   ccb->csio.sense_len -
+					   sense_returned;
+					else
+					    ccb->csio.sense_resid = 0;
+				bzero(&ccb->csio.sense_data,
+				    sizeof(struct scsi_sense_data));
 				bcopy(&srbr->sense[0], &ccb->csio.sense_data,
-				    srbr->sense_len);
-				ccb->csio.sense_len = sense_len;
+				    min(ccb->csio.sense_len, sense_returned));
 				ccb->ccb_h.status |= CAM_AUTOSNS_VALID;
 				// scsi_sense_print(&ccb->csio);
 			}

Modified: stable/9/sys/dev/asr/asr.c
==============================================================================
--- stable/9/sys/dev/asr/asr.c	Sat Oct 29 18:16:29 2011	(r226909)
+++ stable/9/sys/dev/asr/asr.c	Sat Oct 29 22:06:53 2011	(r226910)
@@ -3071,6 +3071,14 @@ asr_intr(Asr_softc_t *sc)
 				 && (size > ccb->csio.sense_len)) {
 					size = ccb->csio.sense_len;
 				}
+				if (size < ccb->csio.sense_len) {
+					ccb->csio.sense_resid =
+					    ccb->csio.sense_len - size;
+				} else {
+					ccb->csio.sense_resid = 0;
+				}
+				bzero(&(ccb->csio.sense_data),
+				    sizeof(ccb->csio.sense_data));
 				bcopy(Reply->SenseData,
 				      &(ccb->csio.sense_data), size);
 			}
@@ -3566,6 +3574,12 @@ ASR_queue_i(Asr_softc_t	*sc, PI2O_MESSAG
 		if (size > sizeof(ccb->csio.sense_data)) {
 			size = sizeof(ccb->csio.sense_data);
 		}
+		if (size < ccb->csio.sense_len) {
+			ccb->csio.sense_resid = ccb->csio.sense_len - size;
+		} else {
+			ccb->csio.sense_resid = 0;
+		}
+		bzero(&(ccb->csio.sense_data), sizeof(ccb->csio.sense_data));
 		bcopy(&(ccb->csio.sense_data), Reply_Ptr->SenseData, size);
 		I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setAutoSenseTransferCount(
 		    Reply_Ptr, size);

Modified: stable/9/sys/dev/hptiop/hptiop.c
==============================================================================
--- stable/9/sys/dev/hptiop/hptiop.c	Sat Oct 29 18:16:29 2011	(r226909)
+++ stable/9/sys/dev/hptiop/hptiop.c	Sat Oct 29 22:06:53 2011	(r226910)
@@ -424,6 +424,13 @@ srb_complete:
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		case IOP_RESULT_CHECK_CONDITION:
+			memset(&ccb->csio.sense_data, 0,
+			    sizeof(ccb->csio.sense_data));
+			if (dxfer < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    dxfer;
+			else
+				ccb->csio.sense_resid = 0;
 			if (srb->srb_flag & HPT_SRB_FLAG_HIGH_MEM_ACESS) {/*iop*/
 				bus_space_read_region_1(hba->bar0t, hba->bar0h,
 					index + offsetof(struct hpt_iop_request_scsi_command,
@@ -573,6 +580,13 @@ static void hptiop_request_callback_mv(s
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		case IOP_RESULT_CHECK_CONDITION:
+			memset(&ccb->csio.sense_data, 0,
+			    sizeof(ccb->csio.sense_data));
+			if (req->dataxfer_length < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    req->dataxfer_length;
+			else
+				ccb->csio.sense_resid = 0;
 			memcpy(&ccb->csio.sense_data, &req->sg_list, 
 				MIN(req->dataxfer_length, sizeof(ccb->csio.sense_data)));
 			ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;

Modified: stable/9/sys/dev/mfi/mfi_cam.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_cam.c	Sat Oct 29 18:16:29 2011	(r226909)
+++ stable/9/sys/dev/mfi/mfi_cam.c	Sat Oct 29 22:06:53 2011	(r226910)
@@ -354,7 +354,13 @@ mfip_done(struct mfi_command *cm)
 
 		ccbh->status = CAM_SCSI_STATUS_ERROR | CAM_AUTOSNS_VALID;
 		csio->scsi_status = pt->header.scsi_status;
-		sense_len = min(pt->header.sense_len, sizeof(struct scsi_sense_data));
+		if (pt->header.sense_len < csio->sense_len)
+			csio->sense_resid = csio->sense_len -
+			    pt->header.sense_len;
+		else
+			csio->sense_resid = 0;
+		sense_len = min(pt->header.sense_len,
+		    sizeof(struct scsi_sense_data));
 		bzero(&csio->sense_data, sizeof(struct scsi_sense_data));
 		bcopy(&cm->cm_sense->data[0], &csio->sense_data, sense_len);
 		break;

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:27:32 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 857B1106564A;
	Sat, 29 Oct 2011 23:27:32 +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 6A56C8FC0C;
	Sat, 29 Oct 2011 23:27: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 p9TNRWtC037419;
	Sat, 29 Oct 2011 23:27:32 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNRWRX037416;
	Sat, 29 Oct 2011 23:27:32 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292327.p9TNRWRX037416@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:27:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226911 - in stable/8/sys/dev: esp sym
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:27:32 -0000

Author: marius
Date: Sat Oct 29 23:27:32 2011
New Revision: 226911
URL: http://svn.freebsd.org/changeset/base/226911

Log:
  MFC: r226095
  
  Merge from r225950:
  
  Set the sense residual properly.
  
  Reviewed by:	ken

Modified:
  stable/8/sys/dev/esp/ncr53c9x.c
  stable/8/sys/dev/sym/sym_hipd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/esp/ncr53c9x.c
==============================================================================
--- stable/8/sys/dev/esp/ncr53c9x.c	Sat Oct 29 22:06:53 2011	(r226910)
+++ stable/8/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:27:32 2011	(r226911)
@@ -1367,7 +1367,8 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ss->byte2 = ccb->ccb_h.target_lun << SCSI_CMD_LUN_SHIFT;
 	ss->length = sizeof(struct scsi_sense_data);
 	ecb->clen = sizeof(*ss);
-	ecb->daddr = (char *)&ecb->ccb->csio.sense_data;
+	memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
+	ecb->daddr = (char *)&ccb->csio.sense_data;
 	ecb->dleft = sizeof(struct scsi_sense_data);
 	ecb->flags |= ECB_SENSE;
 	ecb->timeout = NCR_SENSE_TIMEOUT;
@@ -1397,7 +1398,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 	union ccb *ccb = ecb->ccb;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	int lun;
+	int lun, sense_returned;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -1426,6 +1427,13 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 			ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
 			ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR |
 			    CAM_AUTOSNS_VALID;
+			sense_returned = sizeof(ccb->csio.sense_data) -
+			    ecb->dleft;
+			if (sense_returned < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    sense_returned;
+			else
+				ccb->csio.sense_resid = 0;
 		} else if (ecb->stat == SCSI_STATUS_CHECK_COND) {
 			if ((ecb->flags & ECB_SENSE) != 0)
 				ccb->ccb_h.status = CAM_AUTOSENSE_FAIL;

Modified: stable/8/sys/dev/sym/sym_hipd.c
==============================================================================
--- stable/8/sys/dev/sym/sym_hipd.c	Sat Oct 29 22:06:53 2011	(r226910)
+++ stable/8/sys/dev/sym/sym_hipd.c	Sat Oct 29 23:27:32 2011	(r226911)
@@ -7154,7 +7154,7 @@ static void sym_complete_error (hcb_p np
 {
 	struct ccb_scsiio *csio;
 	u_int cam_status;
-	int i;
+	int i, sense_returned;
 
 	SYM_LOCK_ASSERT(MA_OWNED);
 
@@ -7214,11 +7214,15 @@ static void sym_complete_error (hcb_p np
 			 *  Bounce back the sense data to user and
 			 *  fix the residual.
 			 */
-			bzero(&csio->sense_data, csio->sense_len);
+			bzero(&csio->sense_data, sizeof(csio->sense_data));
+			sense_returned = SYM_SNS_BBUF_LEN - csio->sense_resid;
+			if (sense_returned < csio->sense_len)
+				csio->sense_resid = csio->sense_len -
+				    sense_returned;
+			else
+				csio->sense_resid = 0;
 			bcopy(cp->sns_bbuf, &csio->sense_data,
-			      MIN(csio->sense_len, SYM_SNS_BBUF_LEN));
-			csio->sense_resid += csio->sense_len;
-			csio->sense_resid -= SYM_SNS_BBUF_LEN;
+			    MIN(csio->sense_len, sense_returned));
 #if 0
 			/*
 			 *  If the device reports a UNIT ATTENTION condition

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:27:36 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79E951065670;
	Sat, 29 Oct 2011 23:27:36 +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 5EF168FC15;
	Sat, 29 Oct 2011 23:27: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 p9TNRaw7037458;
	Sat, 29 Oct 2011 23:27:36 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNRa4D037455;
	Sat, 29 Oct 2011 23:27:36 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292327.p9TNRa4D037455@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:27:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226912 - in stable/7/sys/dev: esp sym
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:27:36 -0000

Author: marius
Date: Sat Oct 29 23:27:36 2011
New Revision: 226912
URL: http://svn.freebsd.org/changeset/base/226912

Log:
  MFC: r226095
  
  Merge from r225950:
  
  Set the sense residual properly.
  
  Reviewed by:	ken

Modified:
  stable/7/sys/dev/esp/ncr53c9x.c
  stable/7/sys/dev/sym/sym_hipd.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/esp/ncr53c9x.c
==============================================================================
--- stable/7/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:27:32 2011	(r226911)
+++ stable/7/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:27:36 2011	(r226912)
@@ -1367,7 +1367,8 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ss->byte2 = ccb->ccb_h.target_lun << SCSI_CMD_LUN_SHIFT;
 	ss->length = sizeof(struct scsi_sense_data);
 	ecb->clen = sizeof(*ss);
-	ecb->daddr = (char *)&ecb->ccb->csio.sense_data;
+	memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
+	ecb->daddr = (char *)&ccb->csio.sense_data;
 	ecb->dleft = sizeof(struct scsi_sense_data);
 	ecb->flags |= ECB_SENSE;
 	ecb->timeout = NCR_SENSE_TIMEOUT;
@@ -1397,7 +1398,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 	union ccb *ccb = ecb->ccb;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	int lun;
+	int lun, sense_returned;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -1426,6 +1427,13 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 			ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
 			ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR |
 			    CAM_AUTOSNS_VALID;
+			sense_returned = sizeof(ccb->csio.sense_data) -
+			    ecb->dleft;
+			if (sense_returned < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    sense_returned;
+			else
+				ccb->csio.sense_resid = 0;
 		} else if (ecb->stat == SCSI_STATUS_CHECK_COND) {
 			if ((ecb->flags & ECB_SENSE) != 0)
 				ccb->ccb_h.status = CAM_AUTOSENSE_FAIL;

Modified: stable/7/sys/dev/sym/sym_hipd.c
==============================================================================
--- stable/7/sys/dev/sym/sym_hipd.c	Sat Oct 29 23:27:32 2011	(r226911)
+++ stable/7/sys/dev/sym/sym_hipd.c	Sat Oct 29 23:27:36 2011	(r226912)
@@ -7154,7 +7154,7 @@ static void sym_complete_error (hcb_p np
 {
 	struct ccb_scsiio *csio;
 	u_int cam_status;
-	int i;
+	int i, sense_returned;
 
 	SYM_LOCK_ASSERT(MA_OWNED);
 
@@ -7214,11 +7214,15 @@ static void sym_complete_error (hcb_p np
 			 *  Bounce back the sense data to user and
 			 *  fix the residual.
 			 */
-			bzero(&csio->sense_data, csio->sense_len);
+			bzero(&csio->sense_data, sizeof(csio->sense_data));
+			sense_returned = SYM_SNS_BBUF_LEN - csio->sense_resid;
+			if (sense_returned < csio->sense_len)
+				csio->sense_resid = csio->sense_len -
+				    sense_returned;
+			else
+				csio->sense_resid = 0;
 			bcopy(cp->sns_bbuf, &csio->sense_data,
-			      MIN(csio->sense_len, SYM_SNS_BBUF_LEN));
-			csio->sense_resid += csio->sense_len;
-			csio->sense_resid -= SYM_SNS_BBUF_LEN;
+			    MIN(csio->sense_len, sense_returned));
 #if 0
 			/*
 			 *  If the device reports a UNIT ATTENTION condition

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:44:30 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5F928106566B;
	Sat, 29 Oct 2011 23:44:30 +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 4CE468FC08;
	Sat, 29 Oct 2011 23:44:30 +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 p9TNiUc1038103;
	Sat, 29 Oct 2011 23:44:30 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNiUfu038092;
	Sat, 29 Oct 2011 23:44:30 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292344.p9TNiUfu038092@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:44:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226913 - stable/8/sys/dev/aac
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:44:30 -0000

Author: marius
Date: Sat Oct 29 23:44:29 2011
New Revision: 226913
URL: http://svn.freebsd.org/changeset/base/226913

Log:
  MFC: r206534
  
  Whitespace cleanup, in advance of next sync with Adaptec's driver.  No
  functional change.

Modified:
  stable/8/sys/dev/aac/aac.c
  stable/8/sys/dev/aac/aac_cam.c
  stable/8/sys/dev/aac/aac_debug.c
  stable/8/sys/dev/aac/aac_disk.c
  stable/8/sys/dev/aac/aac_pci.c
  stable/8/sys/dev/aac/aacreg.h
  stable/8/sys/dev/aac/aacvar.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/aac/aac.c
==============================================================================
--- stable/8/sys/dev/aac/aac.c	Sat Oct 29 23:27:36 2011	(r226912)
+++ stable/8/sys/dev/aac/aac.c	Sat Oct 29 23:44:29 2011	(r226913)
@@ -2004,7 +2004,7 @@ aac_setup_intr(struct aac_softc *sc)
 	}
 	if (sc->flags & AAC_FLAGS_NEW_COMM) {
 		if (bus_setup_intr(sc->aac_dev, sc->aac_irq,
-				   INTR_MPSAFE|INTR_TYPE_BIO, NULL, 
+				   INTR_MPSAFE|INTR_TYPE_BIO, NULL,
 				   aac_new_intr, sc, &sc->aac_intr)) {
 			device_printf(sc->aac_dev, "can't set up interrupt\n");
 			return (EINVAL);

Modified: stable/8/sys/dev/aac/aac_cam.c
==============================================================================
--- stable/8/sys/dev/aac/aac_cam.c	Sat Oct 29 23:27:36 2011	(r226912)
+++ stable/8/sys/dev/aac/aac_cam.c	Sat Oct 29 23:44:29 2011	(r226913)
@@ -443,7 +443,7 @@ aac_cam_action(struct cam_sim *sim, unio
 			    srb->cdb_len);
 
 		/* Set command */
-		fib->Header.Command = (sc->flags & AAC_FLAGS_SG_64BIT) ? 
+		fib->Header.Command = (sc->flags & AAC_FLAGS_SG_64BIT) ?
 			ScsiPortCommandU64 : ScsiPortCommand;
 
 		/* Map the s/g list. XXX 32bit addresses only! */
@@ -560,7 +560,7 @@ aac_cam_complete(struct aac_command *cm)
 
 				scsi_sense_len = sizeof(struct scsi_sense_data);
 				bzero(&ccb->csio.sense_data, scsi_sense_len);
-				sense_len = (srbr->sense_len > 
+				sense_len = (srbr->sense_len >
 				    scsi_sense_len) ? scsi_sense_len :
 				    srbr->sense_len;
 				bcopy(&srbr->sense[0], &ccb->csio.sense_data,

Modified: stable/8/sys/dev/aac/aac_debug.c
==============================================================================
--- stable/8/sys/dev/aac/aac_debug.c	Sat Oct 29 23:27:36 2011	(r226912)
+++ stable/8/sys/dev/aac/aac_debug.c	Sat Oct 29 23:44:29 2011	(r226913)
@@ -62,62 +62,62 @@ aac_print_queues(struct aac_softc *sc)
 	device_printf(sc->aac_dev, "FIB queue header at %p  queues at %p\n",
 	    &sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][0],
 	    &sc->aac_queues->qt_HostNormCmdQueue[0]);
-	device_printf(sc->aac_dev, "HOST_NORM_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_NORM_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_NORM_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "HOST_HIGH_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_HIGH_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_HIGH_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_NORM_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_NORM_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_NORM_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_HIGH_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_HIGH_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_HIGH_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "HOST_NORM_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_NORM_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_NORM_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "HOST_HIGH_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_HIGH_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_HIGH_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_NORM_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_NORM_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_NORM_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_HIGH_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_HIGH_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_HIGH_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "AACQ_FREE      %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_FREE      %d/%d\n",
 	    sc->aac_qstat[AACQ_FREE].q_length, sc->aac_qstat[AACQ_FREE].q_max);
-	device_printf(sc->aac_dev, "AACQ_BIO       %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_BIO       %d/%d\n",
 	    sc->aac_qstat[AACQ_BIO].q_length, sc->aac_qstat[AACQ_BIO].q_max);
-	device_printf(sc->aac_dev, "AACQ_READY     %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_READY     %d/%d\n",
 	    sc->aac_qstat[AACQ_READY].q_length,
 	    sc->aac_qstat[AACQ_READY].q_max);
-	device_printf(sc->aac_dev, "AACQ_BUSY      %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_BUSY      %d/%d\n",
 	    sc->aac_qstat[AACQ_BUSY].q_length, sc->aac_qstat[AACQ_BUSY].q_max);
 }
 
@@ -225,8 +225,8 @@ aac_print_fib(struct aac_softc *sc, stru
 
 		if (br->Command == VM_CtBlockRead) {
 			device_printf(sc->aac_dev,
-				      "  BlockRead: container %d  0x%x/%d\n", 
-				      br->ContainerId, br->BlockNumber, 
+				      "  BlockRead: container %d  0x%x/%d\n",
+				      br->ContainerId, br->BlockNumber,
 				      br->ByteCount);
 			sg = &br->SgMap;
 		}
@@ -234,7 +234,7 @@ aac_print_fib(struct aac_softc *sc, stru
 			device_printf(sc->aac_dev,
 				      "  BlockWrite: container %d  0x%x/%d "
 				      "(%s)\n", bw->ContainerId,
-				      bw->BlockNumber, bw->ByteCount, 
+				      bw->BlockNumber, bw->ByteCount,
 				      bw->Stable == CSTABLE ? "stable" :
 				      "unstable");
 			sg = &bw->SgMap;
@@ -267,7 +267,7 @@ aac_print_aif(struct aac_softc *sc, stru
 		device_printf(sc->aac_dev, "EventNotify(%d)\n", aif->seqNumber);
 		switch(aif->data.EN.type) {
 		case AifEnGeneric:		/* Generic notification */
-			device_printf(sc->aac_dev, "(Generic) %.*s\n", 
+			device_printf(sc->aac_dev, "(Generic) %.*s\n",
 				  (int)sizeof(aif->data.EN.data.EG),
 				  aif->data.EN.data.EG.text);
 			break;
@@ -281,21 +281,21 @@ aac_print_aif(struct aac_softc *sc, stru
 		case AifEnContainerChange:	/* Adapter specific container
 						 * configuration change */
 			device_printf(sc->aac_dev, "(ContainerChange) "
-				      "container %d,%d\n", 
-				      aif->data.EN.data.ECC.container[0], 
+				      "container %d,%d\n",
+				      aif->data.EN.data.ECC.container[0],
 				      aif->data.EN.data.ECC.container[1]);
 			break;
 		case AifEnDeviceFailure:	/* SCSI device failed */
 			device_printf(sc->aac_dev, "(DeviceFailure) "
-				      "handle %d\n", 
+				      "handle %d\n",
 				      aif->data.EN.data.EDF.deviceHandle);
 			break;
 		case AifEnMirrorFailover:	/* Mirror failover started */
 			device_printf(sc->aac_dev, "(MirrorFailover) "
 				      "container %d failed, "
 				      "migrating from slice %d to %d\n",
-				      aif->data.EN.data.EMF.container, 
-				      aif->data.EN.data.EMF.failedSlice, 
+				      aif->data.EN.data.EMF.container,
+				      aif->data.EN.data.EMF.failedSlice,
 				      aif->data.EN.data.EMF.creatingSlice);
 			break;
 		case AifEnContainerEvent:	/* Significant container
@@ -325,7 +325,7 @@ aac_print_aif(struct aac_softc *sc, stru
 			device_printf(sc->aac_dev, "(EnclosureManagement) "
 				      "EMPID %d unit %d "
 				      "event %d\n", aif->data.EN.data.EEE.empID,
-				      aif->data.EN.data.EEE.unitID, 
+				      aif->data.EN.data.EEE.unitID,
 				      aif->data.EN.data.EEE.eventType);
 			break;
 		case AifEnBatteryEvent:		/* Significant NV battery
@@ -348,14 +348,14 @@ aac_print_aif(struct aac_softc *sc, stru
 			device_printf(sc->aac_dev, "(BatteryNeedsRecond)\n");
 			break;
 		case AifEnClusterEvent:		/* Some cluster event */
-			device_printf(sc->aac_dev, "(ClusterEvent) event %d\n", 
+			device_printf(sc->aac_dev, "(ClusterEvent) event %d\n",
 				      aif->data.EN.data.ECLE.eventType);
 			break;
 		case AifEnDiskSetEvent:		/* A disk set event occured. */
 			device_printf(sc->aac_dev, "(DiskSetEvent) event %d "
 				      "diskset %jd creator %jd\n",
-				      aif->data.EN.data.EDS.eventType, 
-				      (intmax_t)aif->data.EN.data.EDS.DsNum, 
+				      aif->data.EN.data.EDS.eventType,
+				      (intmax_t)aif->data.EN.data.EDS.DsNum,
 				      (intmax_t)aif->data.EN.data.EDS.CreatorId);
 			break;
 		case AifDenMorphComplete: 	/* A morph operation
@@ -392,7 +392,7 @@ aac_print_aif(struct aac_softc *sc, stru
 		}		
 	
 		device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n",
-			      aif->seqNumber, status, 
+			      aif->seqNumber, status,
 			      aif->data.PR[0].currentTick,
 			      aif->data.PR[0].finalTick);
 		switch(aif->data.PR[0].jd.type) {
@@ -418,12 +418,12 @@ aac_print_aif(struct aac_softc *sc, stru
 			break;
 		case AifJobCtrZero:		/* Container clear operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerZero) container %d\n", 
+				      "(ContainerZero) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 			break;
 		case AifJobCtrCopy:		/* Container copy operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerCopy) container %d to %d\n", 
+				      "(ContainerCopy) container %d to %d\n",
 				      aif->data.PR[0].jd.client.container.src,
 				      aif->data.PR[0].jd.client.container.dst);
 			break;
@@ -456,12 +456,12 @@ aac_print_aif(struct aac_softc *sc, stru
 		case AifJobCtrScrubRaid5:	/* Container Scrub Raid5
 						 * operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerScrubRaid5) container %d\n", 
+				      "(ContainerScrubRaid5) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 			break;
 		case AifJobCtrMorph:		/* Container morph operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerMorph) container %d\n", 
+				      "(ContainerMorph) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 				      /* XXX two containers? */
 			break;
@@ -476,13 +476,13 @@ aac_print_aif(struct aac_softc *sc, stru
 		case AifJobCtrRebuildMirror:	/* Container Rebuild Mirror
 						 * operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerRebuildMirror) container " 
+				      "(ContainerRebuildMirror) container "
 				      "%d\n",
 				      aif->data.PR[0].jd.client.container.src);
 			break;
 		case AifJobCtrCrazyCache:	/* crazy cache */
 			device_printf(sc->aac_dev,
-				      "(ContainerCrazyCache) container %d\n", 
+				      "(ContainerCrazyCache) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 				      /* XXX two containers? */
 			break;

Modified: stable/8/sys/dev/aac/aac_disk.c
==============================================================================
--- stable/8/sys/dev/aac/aac_disk.c	Sat Oct 29 23:27:36 2011	(r226912)
+++ stable/8/sys/dev/aac/aac_disk.c	Sat Oct 29 23:44:29 2011	(r226913)
@@ -87,7 +87,7 @@ DRIVER_MODULE(aacd, aac, aac_disk_driver
 /*
  * Handle open from generic layer.
  *
- * This is called by the diskslice code on first open in order to get the 
+ * This is called by the diskslice code on first open in order to get the
  * basic device geometry paramters.
  */
 static int

Modified: stable/8/sys/dev/aac/aac_pci.c
==============================================================================
--- stable/8/sys/dev/aac/aac_pci.c	Sat Oct 29 23:27:36 2011	(r226912)
+++ stable/8/sys/dev/aac/aac_pci.c	Sat Oct 29 23:44:29 2011	(r226913)
@@ -353,7 +353,7 @@ aac_pci_attach(device_t dev)
 	/* assume failure is 'not configured' */
 	error = ENXIO;
 
-	/* 
+	/*
 	 * Verify that the adapter is correctly set up in PCI space.
 	 */
 	command = pci_read_config(sc->aac_dev, PCIR_COMMAND, 2);
@@ -401,7 +401,7 @@ aac_pci_attach(device_t dev)
 
 	/*
 	 * Allocate the parent bus DMA tag appropriate for our PCI interface.
-	 * 
+	 *
 	 * Note that some of these controllers are 64-bit capable.
 	 */
 	if (bus_dma_tag_create(NULL, 			/* parent */
@@ -419,7 +419,7 @@ aac_pci_attach(device_t dev)
 		goto out;
 	}
 
-	/* 
+	/*
 	 * Detect the hardware interface version, set up the bus interface
 	 * indirection.
 	 */

Modified: stable/8/sys/dev/aac/aacreg.h
==============================================================================
--- stable/8/sys/dev/aac/aacreg.h	Sat Oct 29 23:27:36 2011	(r226912)
+++ stable/8/sys/dev/aac/aacreg.h	Sat Oct 29 23:44:29 2011	(r226913)
@@ -220,20 +220,20 @@ typedef enum {
 	IsAdapterPaused =		704,
 	SendHostTime =			705,
 	RequestSupplementAdapterInfo =	706,	/* Supp. Info for set in UCC
-						 * use only if supported 
+						 * use only if supported
 						 * (RequestAdapterInfo first) */
 	LastMiscCommand =		707,
-  
-	OnLineDiagnostic =		800,      
-	FduAdapterTest =		801, 
+
+	OnLineDiagnostic =		800,
+	FduAdapterTest =		801,
 	RequestCompatibilityId =	802,
 	AdapterEnvironmentInfo =	803,	/* temp. sensors */
 	NvsramEventLog =		900,
 	ResetNvsramEventLogPointers =	901,
 	EnableEventLog =		902,
 	DisableEventLog =		903,
-	EncryptedKeyTransportFIB=	904,    
-	KeyableFeaturesFIB=		905     
+	EncryptedKeyTransportFIB=	904,
+	KeyableFeaturesFIB=		905
 } AAC_FibCommands;
 
 /*
@@ -283,7 +283,7 @@ typedef enum {
 #define AAC_ERROR_FIB_DEALLOCATION_FAILED	0x08
 
 /*
- * Adapter Init Structure: this is passed to the adapter with the 
+ * Adapter Init Structure: this is passed to the adapter with the
  * AAC_MONKER_INITSTRUCT command to point it at our control structures.
  */
 struct aac_adapter_init {
@@ -331,14 +331,14 @@ typedef enum {
 	CT_MORPH,
 	CT_PASSTHRU,
 	CT_RAID4,
-	CT_RAID10,                  /* stripe of mirror */
-	CT_RAID00,                  /* stripe of stripe */
-	CT_VOLUME_OF_MIRRORS,       /* volume of mirror */
-	CT_PSEUDO_RAID3,            /* really raid4 */
-	CT_RAID50,		    /* stripe of raid5 */
-	CT_RAID5D,		    /* raid5 distributed hot-sparing */
+	CT_RAID10,		/* stripe of mirror */
+	CT_RAID00,		/* stripe of stripe */
+	CT_VOLUME_OF_MIRRORS,	/* volume of mirror */
+	CT_PSEUDO_RAID3,	/* really raid4 */
+	CT_RAID50,		/* stripe of raid5 */
+	CT_RAID5D,		/* raid5 distributed hot-sparing */
 	CT_RAID5D0,
-	CT_RAID1E,		    /* extended raid1 mirroring */
+	CT_RAID1E,		/* extended raid1 mirroring */
 	CT_RAID6,
 	CT_RAID60,
 } AAC_FSAVolType;
@@ -347,23 +347,23 @@ typedef enum {
  * Host-addressable object types
  */
 typedef enum {
-	FT_REG = 1,     /* regular file */
-	FT_DIR,         /* directory */
-	FT_BLK,         /* "block" device - reserved */
-	FT_CHR,         /* "character special" device - reserved */
-	FT_LNK,         /* symbolic link */
-	FT_SOCK,        /* socket */
-	FT_FIFO,        /* fifo */
-	FT_FILESYS,     /* ADAPTEC's "FSA"(tm) filesystem */
-	FT_DRIVE,       /* physical disk - addressable in scsi by b/t/l */
-	FT_SLICE,       /* virtual disk - raw volume - slice */
-	FT_PARTITION,   /* FSA partition - carved out of a slice - building
+	FT_REG = 1,	/* regular file */
+	FT_DIR,		/* directory */
+	FT_BLK,		/* "block" device - reserved */
+	FT_CHR,		/* "character special" device - reserved */
+	FT_LNK,		/* symbolic link */
+	FT_SOCK,	/* socket */
+	FT_FIFO,	/* fifo */
+	FT_FILESYS,	/* ADAPTEC's "FSA"(tm) filesystem */
+	FT_DRIVE,	/* physical disk - addressable in scsi by b/t/l */
+	FT_SLICE,	/* virtual disk - raw volume - slice */
+	FT_PARTITION,	/* FSA partition - carved out of a slice - building
 			 * block for containers */
-	FT_VOLUME,      /* Container - Volume Set */
-	FT_STRIPE,      /* Container - Stripe Set */
-	FT_MIRROR,      /* Container - Mirror Set */
-	FT_RAID5,       /* Container - Raid 5 Set */
-	FT_DATABASE     /* Storage object with "foreign" content manager */
+	FT_VOLUME,	/* Container - Volume Set */
+	FT_STRIPE,	/* Container - Stripe Set */
+	FT_MIRROR,	/* Container - Mirror Set */
+	FT_RAID5,	/* Container - Raid 5 Set */
+	FT_DATABASE	/* Storage object with "foreign" content manager */
 } AAC_FType;
 
 /*
@@ -469,7 +469,7 @@ typedef enum {
 	CPU_MIPS,
 	CPU_XSCALE,
 	CPU__last
-} AAC_CpuType;  
+} AAC_CpuType;
 
 typedef enum {
 	CPUI960_JX = 1,
@@ -546,7 +546,7 @@ typedef enum {
  * XXX the aac-2622 with no battery present reports PLATFORM_BAT_OPT_PRESENT
  */
 typedef enum
-{ 
+{
 	PLATFORM_BAT_REQ_PRESENT = 1,	/* BATTERY REQUIRED AND PRESENT */
 	PLATFORM_BAT_REQ_NOTPRESENT,	/* BATTERY REQUIRED AND NOT PRESENT */
 	PLATFORM_BAT_OPT_PRESENT,	/* BATTERY OPTIONAL AND PRESENT */
@@ -554,9 +554,9 @@ typedef enum
 	PLATFORM_BAT_NOT_SUPPORTED	/* BATTERY NOT SUPPORTED */
 } AAC_BatteryPlatform;
 
-/* 
+/*
  * options supported by this board
- * there has to be a one to one mapping of these defines and the ones in 
+ * there has to be a one to one mapping of these defines and the ones in
  * fsaapi.h, search for FSA_SUPPORT_SNAPSHOT
  */
 #define AAC_SUPPORTED_SNAPSHOT		0x01
@@ -579,24 +579,24 @@ typedef enum
 #define AAC_SUPPORTED_64BIT_ARRAYSIZE	0x40000
 #define AAC_SUPPORTED_HEAT_SENSOR	0x80000
 
-/* 
+/*
  * Structure used to respond to a RequestAdapterInfo fib.
  */
 struct aac_adapter_info {
-	AAC_Platform		PlatformBase;    /* adapter type */
+	AAC_Platform		PlatformBase;	 /* adapter type */
 	AAC_CpuType		CpuArchitecture; /* adapter CPU type */
-	AAC_CpuSubType		CpuVariant;      /* adapter CPU subtype */
-	u_int32_t		ClockSpeed;      /* adapter CPU clockspeed */
-	u_int32_t		ExecutionMem;    /* adapter Execution Memory
+	AAC_CpuSubType		CpuVariant;	 /* adapter CPU subtype */
+	u_int32_t		ClockSpeed;	 /* adapter CPU clockspeed */
+	u_int32_t		ExecutionMem;	 /* adapter Execution Memory
 						  * size */
-	u_int32_t		BufferMem;       /* adapter Data Memory */
-	u_int32_t		TotalMem;        /* adapter Total Memory */
+	u_int32_t		BufferMem;	 /* adapter Data Memory */
+	u_int32_t		TotalMem;	 /* adapter Total Memory */
 	struct FsaRevision	KernelRevision;  /* adapter Kernel Software
 						  * Revision */
 	struct FsaRevision	MonitorRevision; /* adapter Monitor/Diagnostic
 						  * Software Revision */
 	struct FsaRevision	HardwareRevision;/* TBD */
-	struct FsaRevision	BIOSRevision;    /* adapter BIOS Revision */
+	struct FsaRevision	BIOSRevision;	 /* adapter BIOS Revision */
 	u_int32_t		ClusteringEnabled;
 	u_int32_t		ClusterChannelMask;
 	u_int64_t		SerialNumber;
@@ -606,7 +606,7 @@ struct aac_adapter_info {
 	AAC_OemFlavor	OemVariant;
 } __packed;
 
-/* 
+/*
  * Structure used to respond to a RequestSupplementAdapterInfo fib.
  */
 struct vpd_info {
@@ -694,7 +694,7 @@ struct aac_supplement_adapter_info {
 #define AAC_KERNEL_PANIC	0x00000100
 
 /*
- * Data types relating to control and monitoring of the NVRAM/WriteCache 
+ * Data types relating to control and monitoring of the NVRAM/WriteCache
  * subsystem.
  */
 
@@ -869,7 +869,7 @@ typedef enum {
 	AifEnGeneric = 1,		/* Generic notification */
 	AifEnTaskComplete,		/* Task has completed */
 	AifEnConfigChange,		/* Adapter config change occurred */
-	AifEnContainerChange,		/* Adapter specific container 
+	AifEnContainerChange,		/* Adapter specific container
 					 * configuration change */
 	AifEnDeviceFailure,		/* SCSI device failed */
 	AifEnMirrorFailover,		/* Mirror failover started */
@@ -883,7 +883,7 @@ typedef enum {
 	AifEnBatteryEvent,		/* Significant NV battery event */
 	AifEnAddContainer,		/* A new container was created. */
 	AifEnDeleteContainer,		/* A container was deleted. */
-	AifEnSMARTEvent, 	       	/* SMART Event */
+	AifEnSMARTEvent,		/* SMART Event */
 	AifEnBatteryNeedsRecond,	/* The battery needs reconditioning */
 	AifEnClusterEvent,		/* Some cluster event */
 	AifEnDiskSetEvent,		/* A disk set event occured. */
@@ -985,7 +985,7 @@ struct aac_AifEventNotify {
 /*
  * Adapter Initiated FIB command structures. Start with the adapter
  * initiated FIBs that really come from the adapter, and get responded
- * to by the host. 
+ * to by the host.
  */
 #define AAC_AIF_REPORT_MAX_SIZE 64
 
@@ -1140,7 +1140,7 @@ typedef enum _VM_COMMANDS {
 	VM_CtHostRead64,
 	VM_CtHostWrite64,
 	VM_DrvErrTblLog,	/* drive error table/log type of command */
-	VM_NameServe64		 
+	VM_NameServe64
 } AAC_VMCommand;
 
 /*
@@ -1546,7 +1546,7 @@ enum {
 /*
  * The adapter can request the host print a message by setting the
  * DB_PRINTF flag in DOORBELL0.  The driver responds by collecting the
- * message from the printf buffer, clearing the DB_PRINTF flag in 
+ * message from the printf buffer, clearing the DB_PRINTF flag in
  * DOORBELL0 and setting it in DOORBELL1.
  * (ODBR and IDBR respectively for the i960Rx adapters)
  */

Modified: stable/8/sys/dev/aac/aacvar.h
==============================================================================
--- stable/8/sys/dev/aac/aacvar.h	Sat Oct 29 23:27:36 2011	(r226912)
+++ stable/8/sys/dev/aac/aacvar.h	Sat Oct 29 23:44:29 2011	(r226913)
@@ -56,7 +56,7 @@
  */
 
 /*
- * The firmware interface allows for a 16-bit s/g list length.  We limit 
+ * The firmware interface allows for a 16-bit s/g list length.  We limit
  * ourselves to a reasonable maximum and ensure alignment.
  */
 #define AAC_MAXSGENTRIES	64	/* max S/G entries, limit 65535 */		
@@ -78,7 +78,7 @@
 #define AAC_PRINTF_BUFSIZE	256
 
 /*
- * We wait this many seconds for the adapter to come ready if it is still 
+ * We wait this many seconds for the adapter to come ready if it is still
  * booting
  */
 #define AAC_BOOT_TIMEOUT	(3 * 60)
@@ -128,7 +128,7 @@ struct aac_sim
 /*
  * Per-disk structure
  */
-struct aac_disk 
+struct aac_disk
 {
 	device_t			ad_dev;
 	struct aac_softc		*ad_controller;
@@ -218,7 +218,7 @@ struct aac_common {
 				AAC_QUEUE_ALIGN];
 
 	/* buffer for text messages from the controller */
-	char		       	ac_printf[AAC_PRINTF_BUFSIZE];
+	char			ac_printf[AAC_PRINTF_BUFSIZE];
 	
 	/* fib for synchronous commands */
 	struct aac_fib		ac_sync_fib;
@@ -227,7 +227,7 @@ struct aac_common {
 /*
  * Interface operations
  */
-struct aac_interface 
+struct aac_interface
 {
 	int	(*aif_get_fwstatus)(struct aac_softc *sc);
 	void	(*aif_qnotify)(struct aac_softc *sc, int qbit);
@@ -302,7 +302,7 @@ struct aac_fib_context {
 /*
  * Per-controller structure.
  */
-struct aac_softc 
+struct aac_softc
 {
 	/* bus connections */
 	device_t		aac_dev;
@@ -348,7 +348,7 @@ struct aac_softc 
 	struct aac_command	*aac_commands;
 
 	/* command management */
-	TAILQ_HEAD(,aac_command) aac_free;	/* command structures 
+	TAILQ_HEAD(,aac_command) aac_free;	/* command structures
 						 * available for reuse */
 	TAILQ_HEAD(,aac_command) aac_ready;	/* commands on hold for
 						 * controller resources */
@@ -416,7 +416,7 @@ struct aac_softc 
 
 	struct callout	aac_daemontime;		/* clock daemon callout */
 
-	u_int32_t	aac_max_fibs;           /* max. FIB count */
+	u_int32_t	aac_max_fibs;		/* max. FIB count */
 	u_int32_t	aac_max_fibs_alloc;		/* max. alloc. per alloc_commands() */
 	u_int32_t	aac_max_fib_size;		/* max. FIB size */
 	u_int32_t	aac_sg_tablesize;		/* max. sg count from host */
@@ -450,7 +450,7 @@ extern void		aac_free(struct aac_softc *
 extern int		aac_attach(struct aac_softc *sc);
 extern int		aac_detach(device_t dev);
 extern int		aac_shutdown(device_t dev);
-extern int		aac_suspend(device_t dev); 
+extern int		aac_suspend(device_t dev);
 extern int		aac_resume(device_t dev);
 extern void		aac_new_intr(void *arg);
 extern int		aac_filter(void *arg);
@@ -564,7 +564,7 @@ aac_dequeue_ ## name (struct aac_softc *
 	if ((cm = TAILQ_FIRST(&sc->aac_ ## name)) != NULL) {		\
 		if ((cm->cm_flags & AAC_ON_ ## index) == 0) {		\
 			printf("command %p not in queue, flags = %#x, "	\
-		       	       "bit = %#x\n", cm, cm->cm_flags,		\
+			       "bit = %#x\n", cm, cm->cm_flags,		\
 			       AAC_ON_ ## index);			\
 			panic("command not in queue");			\
 		}							\

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:44:30 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C3FD1065676;
	Sat, 29 Oct 2011 23:44:30 +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 798F38FC0A;
	Sat, 29 Oct 2011 23:44:30 +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 p9TNiUDw038115;
	Sat, 29 Oct 2011 23:44:30 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNiU1T038107;
	Sat, 29 Oct 2011 23:44:30 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292344.p9TNiU1T038107@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:44:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226914 - stable/7/sys/dev/aac
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:44:30 -0000

Author: marius
Date: Sat Oct 29 23:44:30 2011
New Revision: 226914
URL: http://svn.freebsd.org/changeset/base/226914

Log:
  MFC: r206534
  
  Whitespace cleanup, in advance of next sync with Adaptec's driver.  No
  functional change.

Modified:
  stable/7/sys/dev/aac/aac.c
  stable/7/sys/dev/aac/aac_cam.c
  stable/7/sys/dev/aac/aac_debug.c
  stable/7/sys/dev/aac/aac_disk.c
  stable/7/sys/dev/aac/aac_pci.c
  stable/7/sys/dev/aac/aacreg.h
  stable/7/sys/dev/aac/aacvar.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/aac/aac.c
==============================================================================
--- stable/7/sys/dev/aac/aac.c	Sat Oct 29 23:44:29 2011	(r226913)
+++ stable/7/sys/dev/aac/aac.c	Sat Oct 29 23:44:30 2011	(r226914)
@@ -1997,7 +1997,7 @@ aac_setup_intr(struct aac_softc *sc)
 	}
 	if (sc->flags & AAC_FLAGS_NEW_COMM) {
 		if (bus_setup_intr(sc->aac_dev, sc->aac_irq,
-				   INTR_MPSAFE|INTR_TYPE_BIO, NULL, 
+				   INTR_MPSAFE|INTR_TYPE_BIO, NULL,
 				   aac_new_intr, sc, &sc->aac_intr)) {
 			device_printf(sc->aac_dev, "can't set up interrupt\n");
 			return (EINVAL);

Modified: stable/7/sys/dev/aac/aac_cam.c
==============================================================================
--- stable/7/sys/dev/aac/aac_cam.c	Sat Oct 29 23:44:29 2011	(r226913)
+++ stable/7/sys/dev/aac/aac_cam.c	Sat Oct 29 23:44:30 2011	(r226914)
@@ -395,7 +395,7 @@ aac_cam_action(struct cam_sim *sim, unio
 			    srb->cdb_len);
 
 		/* Set command */
-		fib->Header.Command = (sc->flags & AAC_FLAGS_SG_64BIT) ? 
+		fib->Header.Command = (sc->flags & AAC_FLAGS_SG_64BIT) ?
 			ScsiPortCommandU64 : ScsiPortCommand;
 
 		/* Map the s/g list. XXX 32bit addresses only! */
@@ -512,7 +512,7 @@ aac_cam_complete(struct aac_command *cm)
 
 				scsi_sense_len = sizeof(struct scsi_sense_data);
 				bzero(&ccb->csio.sense_data, scsi_sense_len);
-				sense_len = (srbr->sense_len > 
+				sense_len = (srbr->sense_len >
 				    scsi_sense_len) ? scsi_sense_len :
 				    srbr->sense_len;
 				bcopy(&srbr->sense[0], &ccb->csio.sense_data,

Modified: stable/7/sys/dev/aac/aac_debug.c
==============================================================================
--- stable/7/sys/dev/aac/aac_debug.c	Sat Oct 29 23:44:29 2011	(r226913)
+++ stable/7/sys/dev/aac/aac_debug.c	Sat Oct 29 23:44:30 2011	(r226914)
@@ -62,62 +62,62 @@ aac_print_queues(struct aac_softc *sc)
 	device_printf(sc->aac_dev, "FIB queue header at %p  queues at %p\n",
 	    &sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][0],
 	    &sc->aac_queues->qt_HostNormCmdQueue[0]);
-	device_printf(sc->aac_dev, "HOST_NORM_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_NORM_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_NORM_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "HOST_HIGH_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_HIGH_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_HIGH_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_NORM_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_NORM_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_NORM_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_HIGH_CMD  %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_HIGH_CMD  %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_CMD_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_CMD_QUEUE][
-				      AAC_CONSUMER_INDEX], 
+				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_HIGH_CMD_ENTRIES);
-	device_printf(sc->aac_dev, "HOST_NORM_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_NORM_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_NORM_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_NORM_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "HOST_HIGH_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "HOST_HIGH_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_HOST_HIGH_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_HOST_HIGH_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_NORM_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_NORM_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_NORM_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_NORM_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "ADAP_HIGH_RESP %d/%d (%d)\n", 
+	device_printf(sc->aac_dev, "ADAP_HIGH_RESP %d/%d (%d)\n",
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_RESP_QUEUE][
 				      AAC_PRODUCER_INDEX],
 	    sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_RESP_QUEUE][
 				      AAC_CONSUMER_INDEX],
 	    AAC_ADAP_HIGH_RESP_ENTRIES);
-	device_printf(sc->aac_dev, "AACQ_FREE      %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_FREE      %d/%d\n",
 	    sc->aac_qstat[AACQ_FREE].q_length, sc->aac_qstat[AACQ_FREE].q_max);
-	device_printf(sc->aac_dev, "AACQ_BIO       %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_BIO       %d/%d\n",
 	    sc->aac_qstat[AACQ_BIO].q_length, sc->aac_qstat[AACQ_BIO].q_max);
-	device_printf(sc->aac_dev, "AACQ_READY     %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_READY     %d/%d\n",
 	    sc->aac_qstat[AACQ_READY].q_length,
 	    sc->aac_qstat[AACQ_READY].q_max);
-	device_printf(sc->aac_dev, "AACQ_BUSY      %d/%d\n", 
+	device_printf(sc->aac_dev, "AACQ_BUSY      %d/%d\n",
 	    sc->aac_qstat[AACQ_BUSY].q_length, sc->aac_qstat[AACQ_BUSY].q_max);
 }
 
@@ -225,8 +225,8 @@ aac_print_fib(struct aac_softc *sc, stru
 
 		if (br->Command == VM_CtBlockRead) {
 			device_printf(sc->aac_dev,
-				      "  BlockRead: container %d  0x%x/%d\n", 
-				      br->ContainerId, br->BlockNumber, 
+				      "  BlockRead: container %d  0x%x/%d\n",
+				      br->ContainerId, br->BlockNumber,
 				      br->ByteCount);
 			sg = &br->SgMap;
 		}
@@ -234,7 +234,7 @@ aac_print_fib(struct aac_softc *sc, stru
 			device_printf(sc->aac_dev,
 				      "  BlockWrite: container %d  0x%x/%d "
 				      "(%s)\n", bw->ContainerId,
-				      bw->BlockNumber, bw->ByteCount, 
+				      bw->BlockNumber, bw->ByteCount,
 				      bw->Stable == CSTABLE ? "stable" :
 				      "unstable");
 			sg = &bw->SgMap;
@@ -267,7 +267,7 @@ aac_print_aif(struct aac_softc *sc, stru
 		device_printf(sc->aac_dev, "EventNotify(%d)\n", aif->seqNumber);
 		switch(aif->data.EN.type) {
 		case AifEnGeneric:		/* Generic notification */
-			device_printf(sc->aac_dev, "(Generic) %.*s\n", 
+			device_printf(sc->aac_dev, "(Generic) %.*s\n",
 				  (int)sizeof(aif->data.EN.data.EG),
 				  aif->data.EN.data.EG.text);
 			break;
@@ -281,21 +281,21 @@ aac_print_aif(struct aac_softc *sc, stru
 		case AifEnContainerChange:	/* Adapter specific container
 						 * configuration change */
 			device_printf(sc->aac_dev, "(ContainerChange) "
-				      "container %d,%d\n", 
-				      aif->data.EN.data.ECC.container[0], 
+				      "container %d,%d\n",
+				      aif->data.EN.data.ECC.container[0],
 				      aif->data.EN.data.ECC.container[1]);
 			break;
 		case AifEnDeviceFailure:	/* SCSI device failed */
 			device_printf(sc->aac_dev, "(DeviceFailure) "
-				      "handle %d\n", 
+				      "handle %d\n",
 				      aif->data.EN.data.EDF.deviceHandle);
 			break;
 		case AifEnMirrorFailover:	/* Mirror failover started */
 			device_printf(sc->aac_dev, "(MirrorFailover) "
 				      "container %d failed, "
 				      "migrating from slice %d to %d\n",
-				      aif->data.EN.data.EMF.container, 
-				      aif->data.EN.data.EMF.failedSlice, 
+				      aif->data.EN.data.EMF.container,
+				      aif->data.EN.data.EMF.failedSlice,
 				      aif->data.EN.data.EMF.creatingSlice);
 			break;
 		case AifEnContainerEvent:	/* Significant container
@@ -325,7 +325,7 @@ aac_print_aif(struct aac_softc *sc, stru
 			device_printf(sc->aac_dev, "(EnclosureManagement) "
 				      "EMPID %d unit %d "
 				      "event %d\n", aif->data.EN.data.EEE.empID,
-				      aif->data.EN.data.EEE.unitID, 
+				      aif->data.EN.data.EEE.unitID,
 				      aif->data.EN.data.EEE.eventType);
 			break;
 		case AifEnBatteryEvent:		/* Significant NV battery
@@ -348,14 +348,14 @@ aac_print_aif(struct aac_softc *sc, stru
 			device_printf(sc->aac_dev, "(BatteryNeedsRecond)\n");
 			break;
 		case AifEnClusterEvent:		/* Some cluster event */
-			device_printf(sc->aac_dev, "(ClusterEvent) event %d\n", 
+			device_printf(sc->aac_dev, "(ClusterEvent) event %d\n",
 				      aif->data.EN.data.ECLE.eventType);
 			break;
 		case AifEnDiskSetEvent:		/* A disk set event occured. */
 			device_printf(sc->aac_dev, "(DiskSetEvent) event %d "
 				      "diskset %jd creator %jd\n",
-				      aif->data.EN.data.EDS.eventType, 
-				      (intmax_t)aif->data.EN.data.EDS.DsNum, 
+				      aif->data.EN.data.EDS.eventType,
+				      (intmax_t)aif->data.EN.data.EDS.DsNum,
 				      (intmax_t)aif->data.EN.data.EDS.CreatorId);
 			break;
 		case AifDenMorphComplete: 	/* A morph operation
@@ -392,7 +392,7 @@ aac_print_aif(struct aac_softc *sc, stru
 		}		
 	
 		device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n",
-			      aif->seqNumber, status, 
+			      aif->seqNumber, status,
 			      aif->data.PR[0].currentTick,
 			      aif->data.PR[0].finalTick);
 		switch(aif->data.PR[0].jd.type) {
@@ -418,12 +418,12 @@ aac_print_aif(struct aac_softc *sc, stru
 			break;
 		case AifJobCtrZero:		/* Container clear operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerZero) container %d\n", 
+				      "(ContainerZero) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 			break;
 		case AifJobCtrCopy:		/* Container copy operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerCopy) container %d to %d\n", 
+				      "(ContainerCopy) container %d to %d\n",
 				      aif->data.PR[0].jd.client.container.src,
 				      aif->data.PR[0].jd.client.container.dst);
 			break;
@@ -456,12 +456,12 @@ aac_print_aif(struct aac_softc *sc, stru
 		case AifJobCtrScrubRaid5:	/* Container Scrub Raid5
 						 * operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerScrubRaid5) container %d\n", 
+				      "(ContainerScrubRaid5) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 			break;
 		case AifJobCtrMorph:		/* Container morph operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerMorph) container %d\n", 
+				      "(ContainerMorph) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 				      /* XXX two containers? */
 			break;
@@ -476,13 +476,13 @@ aac_print_aif(struct aac_softc *sc, stru
 		case AifJobCtrRebuildMirror:	/* Container Rebuild Mirror
 						 * operation */
 			device_printf(sc->aac_dev,
-				      "(ContainerRebuildMirror) container " 
+				      "(ContainerRebuildMirror) container "
 				      "%d\n",
 				      aif->data.PR[0].jd.client.container.src);
 			break;
 		case AifJobCtrCrazyCache:	/* crazy cache */
 			device_printf(sc->aac_dev,
-				      "(ContainerCrazyCache) container %d\n", 
+				      "(ContainerCrazyCache) container %d\n",
 				      aif->data.PR[0].jd.client.container.src);
 				      /* XXX two containers? */
 			break;

Modified: stable/7/sys/dev/aac/aac_disk.c
==============================================================================
--- stable/7/sys/dev/aac/aac_disk.c	Sat Oct 29 23:44:29 2011	(r226913)
+++ stable/7/sys/dev/aac/aac_disk.c	Sat Oct 29 23:44:30 2011	(r226914)
@@ -87,7 +87,7 @@ DRIVER_MODULE(aacd, aac, aac_disk_driver
 /*
  * Handle open from generic layer.
  *
- * This is called by the diskslice code on first open in order to get the 
+ * This is called by the diskslice code on first open in order to get the
  * basic device geometry paramters.
  */
 static int

Modified: stable/7/sys/dev/aac/aac_pci.c
==============================================================================
--- stable/7/sys/dev/aac/aac_pci.c	Sat Oct 29 23:44:29 2011	(r226913)
+++ stable/7/sys/dev/aac/aac_pci.c	Sat Oct 29 23:44:30 2011	(r226914)
@@ -353,7 +353,7 @@ aac_pci_attach(device_t dev)
 	/* assume failure is 'not configured' */
 	error = ENXIO;
 
-	/* 
+	/*
 	 * Verify that the adapter is correctly set up in PCI space.
 	 */
 	command = pci_read_config(sc->aac_dev, PCIR_COMMAND, 2);
@@ -401,7 +401,7 @@ aac_pci_attach(device_t dev)
 
 	/*
 	 * Allocate the parent bus DMA tag appropriate for our PCI interface.
-	 * 
+	 *
 	 * Note that some of these controllers are 64-bit capable.
 	 */
 	if (bus_dma_tag_create(NULL, 			/* parent */
@@ -419,7 +419,7 @@ aac_pci_attach(device_t dev)
 		goto out;
 	}
 
-	/* 
+	/*
 	 * Detect the hardware interface version, set up the bus interface
 	 * indirection.
 	 */

Modified: stable/7/sys/dev/aac/aacreg.h
==============================================================================
--- stable/7/sys/dev/aac/aacreg.h	Sat Oct 29 23:44:29 2011	(r226913)
+++ stable/7/sys/dev/aac/aacreg.h	Sat Oct 29 23:44:30 2011	(r226914)
@@ -220,20 +220,20 @@ typedef enum {
 	IsAdapterPaused =		704,
 	SendHostTime =			705,
 	RequestSupplementAdapterInfo =	706,	/* Supp. Info for set in UCC
-						 * use only if supported 
+						 * use only if supported
 						 * (RequestAdapterInfo first) */
 	LastMiscCommand =		707,
-  
-	OnLineDiagnostic =		800,      
-	FduAdapterTest =		801, 
+
+	OnLineDiagnostic =		800,
+	FduAdapterTest =		801,
 	RequestCompatibilityId =	802,
 	AdapterEnvironmentInfo =	803,	/* temp. sensors */
 	NvsramEventLog =		900,
 	ResetNvsramEventLogPointers =	901,
 	EnableEventLog =		902,
 	DisableEventLog =		903,
-	EncryptedKeyTransportFIB=	904,    
-	KeyableFeaturesFIB=		905     
+	EncryptedKeyTransportFIB=	904,
+	KeyableFeaturesFIB=		905
 } AAC_FibCommands;
 
 /*
@@ -283,7 +283,7 @@ typedef enum {
 #define AAC_ERROR_FIB_DEALLOCATION_FAILED	0x08
 
 /*
- * Adapter Init Structure: this is passed to the adapter with the 
+ * Adapter Init Structure: this is passed to the adapter with the
  * AAC_MONKER_INITSTRUCT command to point it at our control structures.
  */
 struct aac_adapter_init {
@@ -329,14 +329,14 @@ typedef enum {
 	CT_MORPH,
 	CT_PASSTHRU,
 	CT_RAID4,
-	CT_RAID10,                  /* stripe of mirror */
-	CT_RAID00,                  /* stripe of stripe */
-	CT_VOLUME_OF_MIRRORS,       /* volume of mirror */
-	CT_PSEUDO_RAID3,            /* really raid4 */
-	CT_RAID50,		    /* stripe of raid5 */
-	CT_RAID5D,		    /* raid5 distributed hot-sparing */
+	CT_RAID10,		/* stripe of mirror */
+	CT_RAID00,		/* stripe of stripe */
+	CT_VOLUME_OF_MIRRORS,	/* volume of mirror */
+	CT_PSEUDO_RAID3,	/* really raid4 */
+	CT_RAID50,		/* stripe of raid5 */
+	CT_RAID5D,		/* raid5 distributed hot-sparing */
 	CT_RAID5D0,
-	CT_RAID1E,		    /* extended raid1 mirroring */
+	CT_RAID1E,		/* extended raid1 mirroring */
 	CT_RAID6,
 	CT_RAID60,
 } AAC_FSAVolType;
@@ -345,23 +345,23 @@ typedef enum {
  * Host-addressable object types
  */
 typedef enum {
-	FT_REG = 1,     /* regular file */
-	FT_DIR,         /* directory */
-	FT_BLK,         /* "block" device - reserved */
-	FT_CHR,         /* "character special" device - reserved */
-	FT_LNK,         /* symbolic link */
-	FT_SOCK,        /* socket */
-	FT_FIFO,        /* fifo */
-	FT_FILESYS,     /* ADAPTEC's "FSA"(tm) filesystem */
-	FT_DRIVE,       /* physical disk - addressable in scsi by b/t/l */
-	FT_SLICE,       /* virtual disk - raw volume - slice */
-	FT_PARTITION,   /* FSA partition - carved out of a slice - building
+	FT_REG = 1,	/* regular file */
+	FT_DIR,		/* directory */
+	FT_BLK,		/* "block" device - reserved */
+	FT_CHR,		/* "character special" device - reserved */
+	FT_LNK,		/* symbolic link */
+	FT_SOCK,	/* socket */
+	FT_FIFO,	/* fifo */
+	FT_FILESYS,	/* ADAPTEC's "FSA"(tm) filesystem */
+	FT_DRIVE,	/* physical disk - addressable in scsi by b/t/l */
+	FT_SLICE,	/* virtual disk - raw volume - slice */
+	FT_PARTITION,	/* FSA partition - carved out of a slice - building
 			 * block for containers */
-	FT_VOLUME,      /* Container - Volume Set */
-	FT_STRIPE,      /* Container - Stripe Set */
-	FT_MIRROR,      /* Container - Mirror Set */
-	FT_RAID5,       /* Container - Raid 5 Set */
-	FT_DATABASE     /* Storage object with "foreign" content manager */
+	FT_VOLUME,	/* Container - Volume Set */
+	FT_STRIPE,	/* Container - Stripe Set */
+	FT_MIRROR,	/* Container - Mirror Set */
+	FT_RAID5,	/* Container - Raid 5 Set */
+	FT_DATABASE	/* Storage object with "foreign" content manager */
 } AAC_FType;
 
 /*
@@ -467,7 +467,7 @@ typedef enum {
 	CPU_MIPS,
 	CPU_XSCALE,
 	CPU__last
-} AAC_CpuType;  
+} AAC_CpuType;
 
 typedef enum {
 	CPUI960_JX = 1,
@@ -544,7 +544,7 @@ typedef enum {
  * XXX the aac-2622 with no battery present reports PLATFORM_BAT_OPT_PRESENT
  */
 typedef enum
-{ 
+{
 	PLATFORM_BAT_REQ_PRESENT = 1,	/* BATTERY REQUIRED AND PRESENT */
 	PLATFORM_BAT_REQ_NOTPRESENT,	/* BATTERY REQUIRED AND NOT PRESENT */
 	PLATFORM_BAT_OPT_PRESENT,	/* BATTERY OPTIONAL AND PRESENT */
@@ -552,9 +552,9 @@ typedef enum
 	PLATFORM_BAT_NOT_SUPPORTED	/* BATTERY NOT SUPPORTED */
 } AAC_BatteryPlatform;
 
-/* 
+/*
  * options supported by this board
- * there has to be a one to one mapping of these defines and the ones in 
+ * there has to be a one to one mapping of these defines and the ones in
  * fsaapi.h, search for FSA_SUPPORT_SNAPSHOT
  */
 #define AAC_SUPPORTED_SNAPSHOT		0x01
@@ -577,24 +577,24 @@ typedef enum
 #define AAC_SUPPORTED_64BIT_ARRAYSIZE	0x40000
 #define AAC_SUPPORTED_HEAT_SENSOR	0x80000
 
-/* 
+/*
  * Structure used to respond to a RequestAdapterInfo fib.
  */
 struct aac_adapter_info {
-	AAC_Platform		PlatformBase;    /* adapter type */
+	AAC_Platform		PlatformBase;	 /* adapter type */
 	AAC_CpuType		CpuArchitecture; /* adapter CPU type */
-	AAC_CpuSubType		CpuVariant;      /* adapter CPU subtype */
-	u_int32_t		ClockSpeed;      /* adapter CPU clockspeed */
-	u_int32_t		ExecutionMem;    /* adapter Execution Memory
+	AAC_CpuSubType		CpuVariant;	 /* adapter CPU subtype */
+	u_int32_t		ClockSpeed;	 /* adapter CPU clockspeed */
+	u_int32_t		ExecutionMem;	 /* adapter Execution Memory
 						  * size */
-	u_int32_t		BufferMem;       /* adapter Data Memory */
-	u_int32_t		TotalMem;        /* adapter Total Memory */
+	u_int32_t		BufferMem;	 /* adapter Data Memory */
+	u_int32_t		TotalMem;	 /* adapter Total Memory */
 	struct FsaRevision	KernelRevision;  /* adapter Kernel Software
 						  * Revision */
 	struct FsaRevision	MonitorRevision; /* adapter Monitor/Diagnostic
 						  * Software Revision */
 	struct FsaRevision	HardwareRevision;/* TBD */
-	struct FsaRevision	BIOSRevision;    /* adapter BIOS Revision */
+	struct FsaRevision	BIOSRevision;	 /* adapter BIOS Revision */
 	u_int32_t		ClusteringEnabled;
 	u_int32_t		ClusterChannelMask;
 	u_int64_t		SerialNumber;
@@ -604,7 +604,7 @@ struct aac_adapter_info {
 	AAC_OemFlavor	OemVariant;
 } __packed;
 
-/* 
+/*
  * Structure used to respond to a RequestSupplementAdapterInfo fib.
  */
 struct vpd_info {
@@ -692,7 +692,7 @@ struct aac_supplement_adapter_info {
 #define AAC_KERNEL_PANIC	0x00000100
 
 /*
- * Data types relating to control and monitoring of the NVRAM/WriteCache 
+ * Data types relating to control and monitoring of the NVRAM/WriteCache
  * subsystem.
  */
 
@@ -867,7 +867,7 @@ typedef enum {
 	AifEnGeneric = 1,		/* Generic notification */
 	AifEnTaskComplete,		/* Task has completed */
 	AifEnConfigChange,		/* Adapter config change occurred */
-	AifEnContainerChange,		/* Adapter specific container 
+	AifEnContainerChange,		/* Adapter specific container
 					 * configuration change */
 	AifEnDeviceFailure,		/* SCSI device failed */
 	AifEnMirrorFailover,		/* Mirror failover started */
@@ -881,7 +881,7 @@ typedef enum {
 	AifEnBatteryEvent,		/* Significant NV battery event */
 	AifEnAddContainer,		/* A new container was created. */
 	AifEnDeleteContainer,		/* A container was deleted. */
-	AifEnSMARTEvent, 	       	/* SMART Event */
+	AifEnSMARTEvent,		/* SMART Event */
 	AifEnBatteryNeedsRecond,	/* The battery needs reconditioning */
 	AifEnClusterEvent,		/* Some cluster event */
 	AifEnDiskSetEvent,		/* A disk set event occured. */
@@ -967,7 +967,7 @@ struct aac_AifEventNotify {
 /*
  * Adapter Initiated FIB command structures. Start with the adapter
  * initiated FIBs that really come from the adapter, and get responded
- * to by the host. 
+ * to by the host.
  */
 #define AAC_AIF_REPORT_MAX_SIZE 64
 
@@ -1120,7 +1120,7 @@ typedef enum _VM_COMMANDS {
 	VM_CtHostRead64,
 	VM_CtHostWrite64,
 	VM_DrvErrTblLog,	/* drive error table/log type of command */
-	VM_NameServe64		 
+	VM_NameServe64
 } AAC_VMCommand;
 
 /*
@@ -1526,7 +1526,7 @@ enum {
 /*
  * The adapter can request the host print a message by setting the
  * DB_PRINTF flag in DOORBELL0.  The driver responds by collecting the
- * message from the printf buffer, clearing the DB_PRINTF flag in 
+ * message from the printf buffer, clearing the DB_PRINTF flag in
  * DOORBELL0 and setting it in DOORBELL1.
  * (ODBR and IDBR respectively for the i960Rx adapters)
  */

Modified: stable/7/sys/dev/aac/aacvar.h
==============================================================================
--- stable/7/sys/dev/aac/aacvar.h	Sat Oct 29 23:44:29 2011	(r226913)
+++ stable/7/sys/dev/aac/aacvar.h	Sat Oct 29 23:44:30 2011	(r226914)
@@ -56,7 +56,7 @@
  */
 
 /*
- * The firmware interface allows for a 16-bit s/g list length.  We limit 
+ * The firmware interface allows for a 16-bit s/g list length.  We limit
  * ourselves to a reasonable maximum and ensure alignment.
  */
 #define AAC_MAXSGENTRIES	64	/* max S/G entries, limit 65535 */		
@@ -78,7 +78,7 @@
 #define AAC_PRINTF_BUFSIZE	256
 
 /*
- * We wait this many seconds for the adapter to come ready if it is still 
+ * We wait this many seconds for the adapter to come ready if it is still
  * booting
  */
 #define AAC_BOOT_TIMEOUT	(3 * 60)
@@ -126,7 +126,7 @@ struct aac_sim
 /*
  * Per-disk structure
  */
-struct aac_disk 
+struct aac_disk
 {
 	device_t			ad_dev;
 	struct aac_softc		*ad_controller;
@@ -216,7 +216,7 @@ struct aac_common {
 				AAC_QUEUE_ALIGN];
 
 	/* buffer for text messages from the controller */
-	char		       	ac_printf[AAC_PRINTF_BUFSIZE];
+	char			ac_printf[AAC_PRINTF_BUFSIZE];
 	
 	/* fib for synchronous commands */
 	struct aac_fib		ac_sync_fib;
@@ -225,7 +225,7 @@ struct aac_common {
 /*
  * Interface operations
  */
-struct aac_interface 
+struct aac_interface
 {
 	int	(*aif_get_fwstatus)(struct aac_softc *sc);
 	void	(*aif_qnotify)(struct aac_softc *sc, int qbit);
@@ -300,7 +300,7 @@ struct aac_fib_context {
 /*
  * Per-controller structure.
  */
-struct aac_softc 
+struct aac_softc
 {
 	/* bus connections */
 	device_t		aac_dev;
@@ -347,7 +347,7 @@ struct aac_softc 
 	struct aac_command	*aac_commands;
 
 	/* command management */
-	TAILQ_HEAD(,aac_command) aac_free;	/* command structures 
+	TAILQ_HEAD(,aac_command) aac_free;	/* command structures
 						 * available for reuse */
 	TAILQ_HEAD(,aac_command) aac_ready;	/* commands on hold for
 						 * controller resources */
@@ -416,7 +416,7 @@ struct aac_softc 
 
 	struct callout	aac_daemontime;		/* clock daemon callout */
 
-	u_int32_t	aac_max_fibs;           /* max. FIB count */
+	u_int32_t	aac_max_fibs;		/* max. FIB count */
 	u_int32_t	aac_max_fibs_alloc;		/* max. alloc. per alloc_commands() */
 	u_int32_t	aac_max_fib_size;		/* max. FIB size */
 	u_int32_t	aac_sg_tablesize;		/* max. sg count from host */
@@ -447,7 +447,7 @@ extern void		aac_free(struct aac_softc *
 extern int		aac_attach(struct aac_softc *sc);
 extern int		aac_detach(device_t dev);
 extern int		aac_shutdown(device_t dev);
-extern int		aac_suspend(device_t dev); 
+extern int		aac_suspend(device_t dev);
 extern int		aac_resume(device_t dev);
 extern void		aac_new_intr(void *arg);
 extern int		aac_fast_intr(void *arg);
@@ -561,7 +561,7 @@ aac_dequeue_ ## name (struct aac_softc *
 	if ((cm = TAILQ_FIRST(&sc->aac_ ## name)) != NULL) {		\
 		if ((cm->cm_flags & AAC_ON_ ## index) == 0) {		\
 			printf("command %p not in queue, flags = %#x, "	\
-		       	       "bit = %#x\n", cm, cm->cm_flags,		\
+			       "bit = %#x\n", cm, cm->cm_flags,		\
 			       AAC_ON_ ## index);			\
 			panic("command not in queue");			\
 		}							\

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:51:21 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A095A106566B;
	Sat, 29 Oct 2011 23:51:21 +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 8E5348FC19;
	Sat, 29 Oct 2011 23:51:21 +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 p9TNpLFX038399;
	Sat, 29 Oct 2011 23:51:21 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNpLG6038394;
	Sat, 29 Oct 2011 23:51:21 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292351.p9TNpLG6038394@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:51:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226915 - in stable/8/sys/dev: aac asr hptiop mfi
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:51:21 -0000

Author: marius
Date: Sat Oct 29 23:51:21 2011
New Revision: 226915
URL: http://svn.freebsd.org/changeset/base/226915

Log:
  MFC: r226350
  
  Merge from r225950:
  
  Set the sense residual properly.
  
  Reviewed by:	ken

Modified:
  stable/8/sys/dev/aac/aac_cam.c
  stable/8/sys/dev/asr/asr.c
  stable/8/sys/dev/hptiop/hptiop.c
  stable/8/sys/dev/mfi/mfi_cam.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/aac/aac_cam.c
==============================================================================
--- stable/8/sys/dev/aac/aac_cam.c	Sat Oct 29 23:44:30 2011	(r226914)
+++ stable/8/sys/dev/aac/aac_cam.c	Sat Oct 29 23:51:21 2011	(r226915)
@@ -532,6 +532,7 @@ aac_cam_complete(struct aac_command *cm)
 	union	ccb *ccb;
 	struct 	aac_srb_response *srbr;
 	struct	aac_softc *sc;
+	int	sense_returned;
 
 	sc = cm->cm_sc;
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -556,16 +557,17 @@ aac_cam_complete(struct aac_command *cm)
 
 			/* Take care of autosense */
 			if (srbr->sense_len) {
-				int sense_len, scsi_sense_len;
-
-				scsi_sense_len = sizeof(struct scsi_sense_data);
-				bzero(&ccb->csio.sense_data, scsi_sense_len);
-				sense_len = (srbr->sense_len >
-				    scsi_sense_len) ? scsi_sense_len :
-				    srbr->sense_len;
+				sense_returned = srbr->sense_len;
+				if (sense_returned < ccb->csio.sense_len)
+					ccb->csio.sense_resid =
+					   ccb->csio.sense_len -
+					   sense_returned;
+					else
+					    ccb->csio.sense_resid = 0;
+				bzero(&ccb->csio.sense_data,
+				    sizeof(struct scsi_sense_data));
 				bcopy(&srbr->sense[0], &ccb->csio.sense_data,
-				    srbr->sense_len);
-				ccb->csio.sense_len = sense_len;
+				    min(ccb->csio.sense_len, sense_returned));
 				ccb->ccb_h.status |= CAM_AUTOSNS_VALID;
 				// scsi_sense_print(&ccb->csio);
 			}

Modified: stable/8/sys/dev/asr/asr.c
==============================================================================
--- stable/8/sys/dev/asr/asr.c	Sat Oct 29 23:44:30 2011	(r226914)
+++ stable/8/sys/dev/asr/asr.c	Sat Oct 29 23:51:21 2011	(r226915)
@@ -3071,6 +3071,14 @@ asr_intr(Asr_softc_t *sc)
 				 && (size > ccb->csio.sense_len)) {
 					size = ccb->csio.sense_len;
 				}
+				if (size < ccb->csio.sense_len) {
+					ccb->csio.sense_resid =
+					    ccb->csio.sense_len - size;
+				} else {
+					ccb->csio.sense_resid = 0;
+				}
+				bzero(&(ccb->csio.sense_data),
+				    sizeof(ccb->csio.sense_data));
 				bcopy(Reply->SenseData,
 				      &(ccb->csio.sense_data), size);
 			}
@@ -3566,6 +3574,12 @@ ASR_queue_i(Asr_softc_t	*sc, PI2O_MESSAG
 		if (size > sizeof(ccb->csio.sense_data)) {
 			size = sizeof(ccb->csio.sense_data);
 		}
+		if (size < ccb->csio.sense_len) {
+			ccb->csio.sense_resid = ccb->csio.sense_len - size;
+		} else {
+			ccb->csio.sense_resid = 0;
+		}
+		bzero(&(ccb->csio.sense_data), sizeof(ccb->csio.sense_data));
 		bcopy(&(ccb->csio.sense_data), Reply_Ptr->SenseData, size);
 		I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setAutoSenseTransferCount(
 		    Reply_Ptr, size);

Modified: stable/8/sys/dev/hptiop/hptiop.c
==============================================================================
--- stable/8/sys/dev/hptiop/hptiop.c	Sat Oct 29 23:44:30 2011	(r226914)
+++ stable/8/sys/dev/hptiop/hptiop.c	Sat Oct 29 23:51:21 2011	(r226915)
@@ -424,6 +424,13 @@ srb_complete:
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		case IOP_RESULT_CHECK_CONDITION:
+			memset(&ccb->csio.sense_data, 0,
+			    sizeof(ccb->csio.sense_data));
+			if (dxfer < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    dxfer;
+			else
+				ccb->csio.sense_resid = 0;
 			if (srb->srb_flag & HPT_SRB_FLAG_HIGH_MEM_ACESS) {/*iop*/
 				bus_space_read_region_1(hba->bar0t, hba->bar0h,
 					index + offsetof(struct hpt_iop_request_scsi_command,
@@ -573,6 +580,13 @@ static void hptiop_request_callback_mv(s
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		case IOP_RESULT_CHECK_CONDITION:
+			memset(&ccb->csio.sense_data, 0,
+			    sizeof(ccb->csio.sense_data));
+			if (req->dataxfer_length < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    req->dataxfer_length;
+			else
+				ccb->csio.sense_resid = 0;
 			memcpy(&ccb->csio.sense_data, &req->sg_list, 
 				MIN(req->dataxfer_length, sizeof(ccb->csio.sense_data)));
 			ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;

Modified: stable/8/sys/dev/mfi/mfi_cam.c
==============================================================================
--- stable/8/sys/dev/mfi/mfi_cam.c	Sat Oct 29 23:44:30 2011	(r226914)
+++ stable/8/sys/dev/mfi/mfi_cam.c	Sat Oct 29 23:51:21 2011	(r226915)
@@ -357,7 +357,13 @@ mfip_done(struct mfi_command *cm)
 
 		ccbh->status = CAM_SCSI_STATUS_ERROR | CAM_AUTOSNS_VALID;
 		csio->scsi_status = pt->header.scsi_status;
-		sense_len = min(pt->header.sense_len, sizeof(struct scsi_sense_data));
+		if (pt->header.sense_len < csio->sense_len)
+			csio->sense_resid = csio->sense_len -
+			    pt->header.sense_len;
+		else
+			csio->sense_resid = 0;
+		sense_len = min(pt->header.sense_len,
+		    sizeof(struct scsi_sense_data));
 		bzero(&csio->sense_data, sizeof(struct scsi_sense_data));
 		bcopy(&cm->cm_sense->data[0], &csio->sense_data, sense_len);
 		break;

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:51:23 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2152106564A;
	Sat, 29 Oct 2011 23:51:23 +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 900218FC1A;
	Sat, 29 Oct 2011 23:51: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 p9TNpNkk038433;
	Sat, 29 Oct 2011 23:51:23 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNpN40038428;
	Sat, 29 Oct 2011 23:51:23 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292351.p9TNpN40038428@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:51:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226916 - in stable/7/sys/dev: aac asr hptiop mfi
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:51:23 -0000

Author: marius
Date: Sat Oct 29 23:51:23 2011
New Revision: 226916
URL: http://svn.freebsd.org/changeset/base/226916

Log:
  MFC: r226350
  
  Merge from r225950:
  
  Set the sense residual properly.
  
  Reviewed by:	ken

Modified:
  stable/7/sys/dev/aac/aac_cam.c
  stable/7/sys/dev/asr/asr.c
  stable/7/sys/dev/hptiop/hptiop.c
  stable/7/sys/dev/mfi/mfi_cam.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/aac/aac_cam.c
==============================================================================
--- stable/7/sys/dev/aac/aac_cam.c	Sat Oct 29 23:51:21 2011	(r226915)
+++ stable/7/sys/dev/aac/aac_cam.c	Sat Oct 29 23:51:23 2011	(r226916)
@@ -484,6 +484,7 @@ aac_cam_complete(struct aac_command *cm)
 	union	ccb *ccb;
 	struct 	aac_srb_response *srbr;
 	struct	aac_softc *sc;
+	int	sense_returned;
 
 	sc = cm->cm_sc;
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -508,16 +509,17 @@ aac_cam_complete(struct aac_command *cm)
 
 			/* Take care of autosense */
 			if (srbr->sense_len) {
-				int sense_len, scsi_sense_len;
-
-				scsi_sense_len = sizeof(struct scsi_sense_data);
-				bzero(&ccb->csio.sense_data, scsi_sense_len);
-				sense_len = (srbr->sense_len >
-				    scsi_sense_len) ? scsi_sense_len :
-				    srbr->sense_len;
+				sense_returned = srbr->sense_len;
+				if (sense_returned < ccb->csio.sense_len)
+					ccb->csio.sense_resid =
+					   ccb->csio.sense_len -
+					   sense_returned;
+					else
+					    ccb->csio.sense_resid = 0;
+				bzero(&ccb->csio.sense_data,
+				    sizeof(struct scsi_sense_data));
 				bcopy(&srbr->sense[0], &ccb->csio.sense_data,
-				    srbr->sense_len);
-				ccb->csio.sense_len = sense_len;
+				    min(ccb->csio.sense_len, sense_returned));
 				ccb->ccb_h.status |= CAM_AUTOSNS_VALID;
 				// scsi_sense_print(&ccb->csio);
 			}

Modified: stable/7/sys/dev/asr/asr.c
==============================================================================
--- stable/7/sys/dev/asr/asr.c	Sat Oct 29 23:51:21 2011	(r226915)
+++ stable/7/sys/dev/asr/asr.c	Sat Oct 29 23:51:23 2011	(r226916)
@@ -3074,6 +3074,14 @@ asr_intr(Asr_softc_t *sc)
 				 && (size > ccb->csio.sense_len)) {
 					size = ccb->csio.sense_len;
 				}
+				if (size < ccb->csio.sense_len) {
+					ccb->csio.sense_resid =
+					    ccb->csio.sense_len - size;
+				} else {
+					ccb->csio.sense_resid = 0;
+				}
+				bzero(&(ccb->csio.sense_data),
+				    sizeof(ccb->csio.sense_data));
 				bcopy(Reply->SenseData,
 				      &(ccb->csio.sense_data), size);
 			}
@@ -3569,6 +3577,12 @@ ASR_queue_i(Asr_softc_t	*sc, PI2O_MESSAG
 		if (size > sizeof(ccb->csio.sense_data)) {
 			size = sizeof(ccb->csio.sense_data);
 		}
+		if (size < ccb->csio.sense_len) {
+			ccb->csio.sense_resid = ccb->csio.sense_len - size;
+		} else {
+			ccb->csio.sense_resid = 0;
+		}
+		bzero(&(ccb->csio.sense_data), sizeof(ccb->csio.sense_data));
 		bcopy(&(ccb->csio.sense_data), Reply_Ptr->SenseData, size);
 		I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setAutoSenseTransferCount(
 		    Reply_Ptr, size);

Modified: stable/7/sys/dev/hptiop/hptiop.c
==============================================================================
--- stable/7/sys/dev/hptiop/hptiop.c	Sat Oct 29 23:51:21 2011	(r226915)
+++ stable/7/sys/dev/hptiop/hptiop.c	Sat Oct 29 23:51:23 2011	(r226916)
@@ -426,6 +426,13 @@ srb_complete:
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		case IOP_RESULT_CHECK_CONDITION:
+			memset(&ccb->csio.sense_data, 0,
+			    sizeof(ccb->csio.sense_data));
+			if (dxfer < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    dxfer;
+			else
+				ccb->csio.sense_resid = 0;
 			if (srb->srb_flag & HPT_SRB_FLAG_HIGH_MEM_ACESS) {/*iop*/
 				bus_space_read_region_1(hba->bar0t, hba->bar0h,
 					index + offsetof(struct hpt_iop_request_scsi_command,
@@ -575,6 +582,13 @@ static void hptiop_request_callback_mv(s
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		case IOP_RESULT_CHECK_CONDITION:
+			memset(&ccb->csio.sense_data, 0,
+			    sizeof(ccb->csio.sense_data));
+			if (req->dataxfer_length < ccb->csio.sense_len)
+				ccb->csio.sense_resid = ccb->csio.sense_len -
+				    req->dataxfer_length;
+			else
+				ccb->csio.sense_resid = 0;
 			memcpy(&ccb->csio.sense_data, &req->sg_list, 
 				MIN(req->dataxfer_length, sizeof(ccb->csio.sense_data)));
 			ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;

Modified: stable/7/sys/dev/mfi/mfi_cam.c
==============================================================================
--- stable/7/sys/dev/mfi/mfi_cam.c	Sat Oct 29 23:51:21 2011	(r226915)
+++ stable/7/sys/dev/mfi/mfi_cam.c	Sat Oct 29 23:51:23 2011	(r226916)
@@ -357,7 +357,13 @@ mfip_done(struct mfi_command *cm)
 
 		ccbh->status = CAM_SCSI_STATUS_ERROR | CAM_AUTOSNS_VALID;
 		csio->scsi_status = pt->header.scsi_status;
-		sense_len = min(pt->header.sense_len, sizeof(struct scsi_sense_data));
+		if (pt->header.sense_len < csio->sense_len)
+			csio->sense_resid = csio->sense_len -
+			    pt->header.sense_len;
+		else
+			csio->sense_resid = 0;
+		sense_len = min(pt->header.sense_len,
+		    sizeof(struct scsi_sense_data));
 		bzero(&csio->sense_data, sizeof(struct scsi_sense_data));
 		bcopy(&cm->cm_sense->data[0], &csio->sense_data, sense_len);
 		break;

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:53:54 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 42BFF106564A;
	Sat, 29 Oct 2011 23:53:54 +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 2FC2F8FC12;
	Sat, 29 Oct 2011 23:53: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 p9TNrs2Y038574;
	Sat, 29 Oct 2011 23:53:54 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNrsHK038569;
	Sat, 29 Oct 2011 23:53:54 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292353.p9TNrsHK038569@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:53:54 +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: r226917 - in stable/9/sys: dev/esp sparc64/sbus
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:53:54 -0000

Author: marius
Date: Sat Oct 29 23:53:53 2011
New Revision: 226917
URL: http://svn.freebsd.org/changeset/base/226917

Log:
  MFC: r226381
  
  Merge from NetBSD:
  - Remove clause 3 and 4 from TNF licenses.
  - Fix memset usage.
  - Various cleanup.
  - Kill caddr_t.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/esp/esp_sbus.c
  stable/9/sys/dev/esp/ncr53c9x.c
  stable/9/sys/dev/esp/ncr53c9xreg.h
  stable/9/sys/dev/esp/ncr53c9xvar.h
  stable/9/sys/sparc64/sbus/lsi64854.c
  stable/9/sys/sparc64/sbus/lsi64854var.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)

Modified: stable/9/sys/dev/esp/esp_sbus.c
==============================================================================
--- stable/9/sys/dev/esp/esp_sbus.c	Sat Oct 29 23:51:23 2011	(r226916)
+++ stable/9/sys/dev/esp/esp_sbus.c	Sat Oct 29 23:53:53 2011	(r226917)
@@ -26,7 +26,7 @@
  *
  */
 
-/*	$NetBSD: esp_sbus.c,v 1.31 2005/02/27 00:27:48 perry Exp $	*/
+/*	$NetBSD: esp_sbus.c,v 1.51 2009/09/17 16:28:12 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -44,13 +44,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -158,12 +151,12 @@ MODULE_DEPEND(esp, sbus, 1, 1, 1);
 /*
  * Functions and the switch for the MI code
  */
-static u_char	esp_read_reg(struct ncr53c9x_softc *sc, int reg);
-static void	esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v);
+static uint8_t	esp_read_reg(struct ncr53c9x_softc *sc, int reg);
+static void	esp_write_reg(struct ncr53c9x_softc *sc, int reg, uint8_t v);
 static int	esp_dma_isintr(struct ncr53c9x_softc *sc);
 static void	esp_dma_reset(struct ncr53c9x_softc *sc);
 static int	esp_dma_intr(struct ncr53c9x_softc *sc);
-static int	esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr,
+static int	esp_dma_setup(struct ncr53c9x_softc *sc, void **addr,
 		    size_t *len, int datain, size_t *dmasize);
 static void	esp_dma_go(struct ncr53c9x_softc *sc);
 static void	esp_dma_stop(struct ncr53c9x_softc *sc);
@@ -172,7 +165,7 @@ static int	espattach(struct esp_softc *e
 		    const struct ncr53c9x_glue *gluep);
 static int	espdetach(struct esp_softc *esc);
 
-static const struct ncr53c9x_glue esp_sbus_glue = {
+static const struct ncr53c9x_glue const esp_sbus_glue = {
 	esp_read_reg,
 	esp_write_reg,
 	esp_dma_isintr,
@@ -718,9 +711,9 @@ espdetach(struct esp_softc *esc)
 static int esp_sbus_debug = 0;
 
 static const struct {
-	char *r_name;
-	int   r_flag;
-} esp__read_regnames [] = {
+	const char *r_name;
+	int r_flag;
+} const esp__read_regnames [] = {
 	{ "TCL", 0},			/* 0/00 */
 	{ "TCM", 0},			/* 1/04 */
 	{ "FIFO", 0},			/* 2/08 */
@@ -739,10 +732,10 @@ static const struct {
 	{ "TCX", 1},			/* f/3c */
 };
 
-static const struct {
-	char *r_name;
-	int   r_flag;
-} esp__write_regnames[] = {
+static const const struct {
+	const char *r_name;
+	int r_flag;
+} const esp__write_regnames[] = {
 	{ "TCL", 1},			/* 0/00 */
 	{ "TCM", 1},			/* 1/04 */
 	{ "FIFO", 0},			/* 2/08 */
@@ -762,11 +755,11 @@ static const struct {
 };
 #endif
 
-static u_char
+static uint8_t
 esp_read_reg(struct ncr53c9x_softc *sc, int reg)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
-	u_char v;
+	uint8_t v;
 
 	v = bus_read_1(esc->sc_res, reg * 4);
 
@@ -780,7 +773,7 @@ esp_read_reg(struct ncr53c9x_softc *sc, 
 }
 
 static void
-esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v)
+esp_write_reg(struct ncr53c9x_softc *sc, int reg, uint8_t v)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -818,8 +811,8 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
 }
 
 static int
-esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr, size_t *len,
-	      int datain, size_t *dmasize)
+esp_dma_setup(struct ncr53c9x_softc *sc, void **addr, size_t *len,
+    int datain, size_t *dmasize)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 

Modified: stable/9/sys/dev/esp/ncr53c9x.c
==============================================================================
--- stable/9/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:51:23 2011	(r226916)
+++ stable/9/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:53:53 2011	(r226917)
@@ -26,7 +26,7 @@
  *
  */
 
-/*	$NetBSD: ncr53c9x.c,v 1.125 2007/01/09 12:53:12 itohy Exp $	*/
+/*	$NetBSD: ncr53c9x.c,v 1.143 2011/07/31 18:39:00 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -43,13 +43,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -133,7 +126,7 @@ __FBSDID("$FreeBSD$");
 MODULE_DEPEND(esp, cam, 1, 1, 1);
 
 #ifdef NCR53C9X_DEBUG
-static int ncr53c9x_debug =
+int ncr53c9x_debug =
     NCR_SHOWMISC /* | NCR_SHOWPHASE | NCR_SHOWTRAC | NCR_SHOWCMDS */;
 #endif
 
@@ -167,7 +160,7 @@ static void	ncr53c9x_sched(struct ncr53c
 static void	ncr53c9x_select(struct ncr53c9x_softc *sc,
 		    struct ncr53c9x_ecb *ecb);
 static void	ncr53c9x_watch(void *arg);
-static void	ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, u_char *p,
+static void	ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, uint8_t *p,
 		    int len);
 
 static struct ncr53c9x_ecb	*ncr53c9x_get_ecb(struct ncr53c9x_softc *sc);
@@ -187,13 +180,11 @@ static inline int	ncr53c9x_stp2cpb(struc
 		NCR_WRITE_REG((sc), NCR_TCL, (size));			\
 		NCR_WRITE_REG((sc), NCR_TCM, (size) >> 8);		\
 		if ((sc->sc_cfg2 & NCRCFG2_FE) ||			\
-		    (sc->sc_rev == NCR_VARIANT_FAS366)) {		\
+		    (sc->sc_rev == NCR_VARIANT_FAS366))			\
 			NCR_WRITE_REG((sc), NCR_TCH, (size) >> 16);	\
-		}							\
-		if (sc->sc_rev == NCR_VARIANT_FAS366) {			\
+		if (sc->sc_rev == NCR_VARIANT_FAS366)			\
 			NCR_WRITE_REG(sc, NCR_RCH, 0);			\
-		}							\
-} while (0)
+} while (/* CONSTCOND */0)
 
 #ifndef mstohz
 #define	mstohz(ms) \
@@ -551,11 +542,10 @@ ncr53c9x_reset(struct ncr53c9x_softc *sc
 		NCR_WRITE_REG(sc, NCR_AMDCFG4, sc->sc_cfg4);
 
 #if 0
-	device_printf(sc->sc_dev, "ncr53c9x_reset: revision %d\n",
-	    sc->sc_rev);
-	device_printf(sc->sc_dev, "ncr53c9x_reset: cfg1 0x%x, cfg2 0x%x, "
-	    "cfg3 0x%x, ccf 0x%x, timeout 0x%x\n",
-	    sc->sc_cfg1, sc->sc_cfg2, sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout);
+	device_printf(sc->sc_dev, "%s: revision %d\n", __func__, sc->sc_rev);
+	device_printf(sc->sc_dev, "%s: cfg1 0x%x, cfg2 0x%x, cfg3 0x%x, ccf "
+	    "0x%x, timeout 0x%x\n", __func__, sc->sc_cfg1, sc->sc_cfg2,
+	    sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout);
 #endif
 }
 
@@ -573,7 +563,8 @@ ncr53c9x_clear(struct ncr53c9x_softc *sc
 	/* Cancel any active commands. */
 	sc->sc_state = NCR_CLEANING;
 	sc->sc_msgify = 0;
-	if ((ecb = sc->sc_nexus) != NULL) {
+	ecb = sc->sc_nexus;
+	if (ecb != NULL) {
 		ecb->ccb->ccb_h.status = result;
 		ncr53c9x_done(sc, ecb);
 	}
@@ -597,7 +588,8 @@ ncr53c9x_clear_target(struct ncr53c9x_so
 
 	/* Cancel outstanding disconnected commands on each LUN. */
 	LIST_FOREACH(li, &sc->sc_tinfo[target].luns, link) {
-		if ((ecb = li->untagged) != NULL) {
+		ecb = li->untagged;
+		if (ecb != NULL) {
 			li->untagged = NULL;
 			/*
 			 * XXX should we terminate a command
@@ -607,12 +599,14 @@ ncr53c9x_clear_target(struct ncr53c9x_so
 			ecb->ccb->ccb_h.status = result;
 			ncr53c9x_done(sc, ecb);
 		}
-		for (i = 0; i < NCR_TAG_DEPTH; i++)
-			if ((ecb = li->queued[i])) {
+		for (i = 0; i < NCR_TAG_DEPTH; i++) {
+			ecb = li->queued[i];
+			if (ecb != NULL) {
 				li->queued[i] = NULL;
 				ecb->ccb->ccb_h.status = result;
 				ncr53c9x_done(sc, ecb);
 			}
+		}
 		li->used = 0;
 	}
 }
@@ -635,7 +629,7 @@ ncr53c9x_init(struct ncr53c9x_softc *sc,
 
 		TAILQ_INIT(&sc->ready_list);
 		sc->sc_nexus = NULL;
-		memset(sc->sc_tinfo, 0, sizeof(sc->sc_tinfo));
+		memset(sc->sc_tinfo, 0, sizeof(*sc->sc_tinfo));
 		for (r = 0; r < sc->sc_ntarg; r++) {
 			LIST_INIT(&sc->sc_tinfo[r].luns);
 		}
@@ -751,7 +745,7 @@ ncr53c9x_stp2cpb(struct ncr53c9x_softc *
 static inline void
 ncr53c9x_setsync(struct ncr53c9x_softc *sc, struct ncr53c9x_tinfo *ti)
 {
-	u_char cfg3, syncoff, synctp;
+	uint8_t cfg3, syncoff, synctp;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -810,7 +804,7 @@ static void
 ncr53c9x_select(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
 {
 	struct ncr53c9x_tinfo *ti;
-	u_char *cmd;
+	uint8_t *cmd;
 	size_t dmasize;
 	int clen, selatn3, selatns;
 	int lun = ecb->ccb->ccb_h.target_lun;
@@ -818,8 +812,8 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_select(t%d,l%d,cmd:%x,tag:%x,%x)] ",
-	    target, lun, ecb->cmd.cmd.opcode, ecb->tag[0], ecb->tag[1]));
+	NCR_TRACE(("[%s(t%d,l%d,cmd:%x,tag:%x,%x)] ", __func__, target, lun,
+	    ecb->cmd.cmd.opcode, ecb->tag[0], ecb->tag[1]));
 
 	ti = &sc->sc_tinfo[target];
 	sc->sc_state = NCR_SELECTING;
@@ -838,9 +832,8 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 		NCRCMD(sc, NCRCMD_FLUSH);
 		NCR_WRITE_REG(sc, NCR_SELID, target | NCR_BUSID_HMEXC32 |
 		    NCR_BUSID_HMEENCID);
-	} else {
+	} else
 		NCR_WRITE_REG(sc, NCR_SELID, target);
-	}
 
 	/*
 	 * If we are requesting sense, force a renegotiation if we are
@@ -873,7 +866,7 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 		selatns = 1;
 	}
 
-	cmd = (u_char *)&ecb->cmd.cmd;
+	cmd = (uint8_t *)&ecb->cmd.cmd;
 
 	if (selatn3) {
 		/* We'll use tags with SELATN3. */
@@ -954,7 +947,7 @@ ncr53c9x_get_ecb(struct ncr53c9x_softc *
 	ecb = TAILQ_FIRST(&sc->free_list);
 	if (ecb) {
 		if (ecb->flags != 0)
-			panic("ecb flags not cleared\n");
+			panic("%s: ecb flags not cleared", __func__);
 		TAILQ_REMOVE(&sc->free_list, ecb, free_links);
 		ecb->flags = ECB_ALLOC;
 		bzero(&ecb->ccb, sizeof(struct ncr53c9x_ecb) -
@@ -990,7 +983,7 @@ ncr53c9x_action(struct cam_sim *sim, uni
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_action %d]", ccb->ccb_h.func_code));
+	NCR_TRACE(("[%s %d]", __func__, ccb->ccb_h.func_code));
 
 	switch (ccb->ccb_h.func_code) {
 	case XPT_RESET_BUS:
@@ -1196,7 +1189,7 @@ ncr53c9x_poll(struct cam_sim *sim)
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_poll] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	if (NCRDMA_ISINTR(sc))
 		ncr53c9x_intr1(sc);
@@ -1260,10 +1253,10 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_sched] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	if (sc->sc_state != NCR_IDLE)
-		panic("ncr53c9x_sched: not IDLE (state=%d)", sc->sc_state);
+		panic("%s: not IDLE (state=%d)", __func__, sc->sc_state);
 
 	/*
 	 * Find first ecb in ready queue that is for a target/lunit
@@ -1288,10 +1281,9 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 		li = TINFO_LUN(ti, lun);
 		if (li == NULL) {
 			/* Initialize LUN info and add to list. */
-			if ((li = malloc(sizeof(*li),
-			    M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
+			li = malloc(sizeof(*li), M_DEVBUF, M_NOWAIT | M_ZERO);
+			if (li == NULL)
 				continue;
-			}
 			li->lun = lun;
 
 			LIST_INSERT_HEAD(&ti->luns, li, link);
@@ -1338,7 +1330,7 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 			ncr53c9x_select(sc, ecb);
 			break;
 		} else {
-			NCR_TRACE(("%d:%d busy\n",
+			NCR_TRACE(("[%s %d:%d busy] \n", __func__,
 			    ecb->ccb->ccb_h.target_id,
 			    ecb->ccb->ccb_h.target_lun));
 		}
@@ -1356,7 +1348,7 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("requesting sense "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	lun = ccb->ccb_h.target_lun;
 	ti = &sc->sc_tinfo[ccb->ccb_h.target_id];
@@ -1368,7 +1360,7 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ss->length = sizeof(struct scsi_sense_data);
 	ecb->clen = sizeof(*ss);
 	memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
-	ecb->daddr = (char *)&ccb->csio.sense_data;
+	ecb->daddr = (uint8_t *)&ccb->csio.sense_data;
 	ecb->dleft = sizeof(struct scsi_sense_data);
 	ecb->flags |= ECB_SENSE;
 	ecb->timeout = NCR_SENSE_TIMEOUT;
@@ -1379,9 +1371,9 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ncr53c9x_dequeue(sc, ecb);
 	li->untagged = ecb;	/* Must be executed first to fix C/A. */
 	li->busy = 2;
-	if (ecb == sc->sc_nexus) {
+	if (ecb == sc->sc_nexus)
 		ncr53c9x_select(sc, ecb);
-	} else {
+	else {
 		TAILQ_INSERT_HEAD(&sc->ready_list, ecb, chain);
 		ecb->flags |= ECB_READY;
 		if (sc->sc_state == NCR_IDLE)
@@ -1402,7 +1394,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_done(status:%x)] ", ccb->ccb_h.status));
+	NCR_TRACE(("[%s(status:%x)] ", __func__, ccb->ccb_h.status));
 
 	ti = &sc->sc_tinfo[ccb->ccb_h.target_id];
 	lun = ccb->ccb_h.target_lun;
@@ -1457,7 +1449,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 	}
 
 #ifdef NCR53C9X_DEBUG
-	if (ncr53c9x_debug & NCR_SHOWTRAC) {
+	if ((ncr53c9x_debug & NCR_SHOWTRAC) != 0) {
 		if (ccb->csio.resid != 0)
 			printf("resid=%d ", ccb->csio.resid);
 		if ((ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0)
@@ -1510,7 +1502,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 	li = TINFO_LUN(ti, lun);
 #ifdef DIAGNOSTIC
 	if (li == NULL || li->lun != lun)
-		panic("ncr53c9x_dequeue: lun %qx for ecb %p does not exist",
+		panic("%s: lun %qx for ecb %p does not exist", __func__,
 		    (long long)lun, ecb);
 #endif
 	if (li->untagged == ecb) {
@@ -1521,9 +1513,9 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 #ifdef DIAGNOSTIC
 		if (li->queued[ecb->tag[1]] != NULL &&
 		    (li->queued[ecb->tag[1]] != ecb))
-			panic("ncr53c9x_dequeue: slot %d for lun %qx has %p "
-			    "instead of ecb %p\n", ecb->tag[1],
-			    (long long)lun, li->queued[ecb->tag[1]], ecb);
+			panic("%s: slot %d for lun %qx has %p instead of ecb "
+			    "%p", __func__, ecb->tag[1], (long long)lun,
+			    li->queued[ecb->tag[1]], ecb);
 #endif
 		li->queued[ecb->tag[1]] = NULL;
 		li->used--;
@@ -1550,7 +1542,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 	NCRCMD(sc, NCRCMD_SETATN);					\
 	sc->sc_flags |= NCR_ATN;					\
 	sc->sc_msgpriq |= (m);						\
-} while (0)
+} while (/* CONSTCOND */0)
 
 static void
 ncr53c9x_flushfifo(struct ncr53c9x_softc *sc)
@@ -1558,7 +1550,7 @@ ncr53c9x_flushfifo(struct ncr53c9x_softc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[flushfifo] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	NCRCMD(sc, NCRCMD_FLUSH);
 
@@ -1570,8 +1562,8 @@ ncr53c9x_flushfifo(struct ncr53c9x_softc
 static int
 ncr53c9x_rdfifo(struct ncr53c9x_softc *sc, int how)
 {
-	u_char *ibuf;
 	int i, n;
+	uint8_t *ibuf;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -1586,7 +1578,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 		break;
 
 	default:
-		panic("ncr53c9x_rdfifo: bad flag");
+		panic("%s: bad flag", __func__);
 		/* NOTREACHED */
 	}
 
@@ -1611,10 +1603,9 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 
 			ncr53c9x_flushfifo(sc);
 		}
-	} else {
+	} else
 		for (i = 0; i < n; i++)
 			ibuf[i] = NCR_READ_REG(sc, NCR_FIFO);
-	}
 
 	sc->sc_imlen += i;
 
@@ -1622,7 +1613,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 #ifdef NCR53C9X_DEBUG
 	NCR_TRACE(("\n[rdfifo %s (%d):",
 	    (how == NCR_RDFIFO_START) ? "start" : "cont", (int)sc->sc_imlen));
-	if (ncr53c9x_debug & NCR_SHOWTRAC) {
+	if ((ncr53c9x_debug & NCR_SHOWTRAC) != 0) {
 		for (i = 0; i < sc->sc_imlen; i++)
 			printf(" %02x", sc->sc_imess[i]);
 		printf("]\n");
@@ -1633,7 +1624,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 }
 
 static void
-ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, u_char *p, int len)
+ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, uint8_t *p, int len)
 {
 	int i;
 
@@ -1641,7 +1632,7 @@ ncr53c9x_wrfifo(struct ncr53c9x_softc *s
 
 #ifdef NCR53C9X_DEBUG
 	NCR_MSGS(("[wrfifo(%d):", len));
-	if (ncr53c9x_debug & NCR_SHOWMSGS) {
+	if ((ncr53c9x_debug & NCR_SHOWMSGS) != 0) {
 		for (i = 0; i < len; i++)
 			printf(" %02x", p[i]);
 		printf("]\n");
@@ -1663,13 +1654,13 @@ ncr53c9x_reselect(struct ncr53c9x_softc 
 	struct ncr53c9x_ecb *ecb = NULL;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	u_char lun, selid, target;
+	uint8_t lun, selid, target;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	if (sc->sc_rev == NCR_VARIANT_FAS366) {
+	if (sc->sc_rev == NCR_VARIANT_FAS366)
 		target = sc->sc_selid;
-	} else {
+	else {
 		/*
 		 * The SCSI chip made a snapshot of the data bus
 		 * while the reselection was being negotiated.
@@ -1751,7 +1742,7 @@ abort:
 #define	MSG_IS2BYTE(m)		(((m) & 0xf0) == 0x20)
 
 static inline int
-__verify_msg_format(u_char *p, int len)
+__verify_msg_format(uint8_t *p, int len)
 {
 
 	if (len == 1 && MSG_IS1BYTE(p[0]))
@@ -1777,12 +1768,12 @@ ncr53c9x_msgin(struct ncr53c9x_softc *sc
 	struct ncr53c9x_ecb *ecb;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	u_char *pb;
+	uint8_t *pb;
 	int lun, plen;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_msgin(curmsglen:%ld)] ", (long)sc->sc_imlen));
+	NCR_TRACE(("[%s(curmsglen:%ld)] ", __func__, (long)sc->sc_imlen));
 
 	if (sc->sc_imlen == 0) {
 		device_printf(sc->sc_dev, "msgin: no msg byte available\n");
@@ -2068,19 +2059,19 @@ gotit:
 			    sc->sc_imess[0]);
 			goto reset;
 		}
-		(void) ncr53c9x_reselect(sc, sc->sc_msgify,
+		(void)ncr53c9x_reselect(sc, sc->sc_msgify,
 		    sc->sc_imess[0], sc->sc_imess[1]);
 		break;
 
 	case NCR_RESELECTED:
-		if (MSG_ISIDENTIFY(sc->sc_imess[1])) {
+		if (MSG_ISIDENTIFY(sc->sc_imess[1]))
 			sc->sc_msgify = sc->sc_imess[1];
-		} else {
+		else {
 			device_printf(sc->sc_dev, "reselect without IDENTIFY;"
 			    " MSG %x; sending DEVICE RESET\n", sc->sc_imess[1]);
 			goto reset;
 		}
-		(void) ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0);
+		(void)ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0);
 		break;
 
 	default:
@@ -2124,8 +2115,8 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_msgout(priq:%x, prevphase:%x)]",
-	    sc->sc_msgpriq, sc->sc_prevphase));
+	NCR_TRACE(("[%s(priq:%x, prevphase:%x)]", __func__, sc->sc_msgpriq,
+	    sc->sc_prevphase));
 
 	/*
 	 * XXX - the NCR_ATN flag is not in sync with the actual ATN
@@ -2138,7 +2129,9 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 		if (sc->sc_prevphase != MESSAGE_OUT_PHASE) {
 		new:
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1); */
+#if 0
+			DELAY(1);
+#endif
 			sc->sc_msgoutq = 0;
 			sc->sc_omlen = 0;
 		}
@@ -2146,10 +2139,9 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 		if (sc->sc_prevphase == MESSAGE_OUT_PHASE) {
 			ncr53c9x_sched_msgout(sc->sc_msgoutq);
 			goto new;
-		} else {
+		} else
 			device_printf(sc->sc_dev, "at line %d: unexpected "
 			    "MESSAGE OUT phase\n", __LINE__);
-		}
 	}
 
 	if (sc->sc_omlen == 0) {
@@ -2181,20 +2173,18 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 			break;
 
 		case SEND_IDENTIFY:
-			if (sc->sc_state != NCR_CONNECTED) {
+			if (sc->sc_state != NCR_CONNECTED)
 				device_printf(sc->sc_dev, "at line %d: no "
 				    "nexus\n", __LINE__);
-			}
 			ecb = sc->sc_nexus;
 			sc->sc_omess[0] =
 			    MSG_IDENTIFY(ecb->ccb->ccb_h.target_lun, 0);
 			break;
 
 		case SEND_TAG:
-			if (sc->sc_state != NCR_CONNECTED) {
+			if (sc->sc_state != NCR_CONNECTED)
 				device_printf(sc->sc_dev, "at line %d: no "
 				    "nexus\n", __LINE__);
-			}
 			ecb = sc->sc_nexus;
 			sc->sc_omess[0] = ecb->tag[0];
 			sc->sc_omess[1] = ecb->tag[1];
@@ -2249,7 +2239,7 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 	}
 
 #ifdef NCR53C9X_DEBUG
-	if (ncr53c9x_debug & NCR_SHOWMSGS) {
+	if ((ncr53c9x_debug & NCR_SHOWMSGS) != 0) {
 		NCR_MSGS(("<msgout:"));
 		for (i = 0; i < sc->sc_omlen; i++)
 			NCR_MSGS((" %02x", sc->sc_omess[i]));
@@ -2310,7 +2300,7 @@ ncr53c9x_intr1(struct ncr53c9x_softc *sc
 	struct timeval cur, wait;
 	size_t size;
 	int i, nfifo;
-	u_char msg;
+	uint8_t msg;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -2385,7 +2375,7 @@ again:
 				 * while we were trying to select
 				 * another target.
 				 */
-#ifdef DEBUG
+#ifdef NCR53C9X_DEBUG
 				device_printf(sc->sc_dev, "ESP100 work-around "
 				    "activated\n");
 #endif
@@ -2492,7 +2482,9 @@ again:
 		    sc->sc_espintr,sc->sc_espstat,sc->sc_espstep));
 		if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) {
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1); */
+#if 0
+			DELAY(1);
+#endif
 		}
 		/*
 		 * This command must (apparently) be issued within
@@ -2734,7 +2726,7 @@ again:
 				if (sc->sc_state == NCR_IDLE &&
 				    sc->sc_espstep == 0)
 					return;
-				panic("ncr53c9x: no nexus");
+				panic("%s: no nexus", __func__);
 			}
 
 			ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id];
@@ -2812,8 +2804,8 @@ again:
 					if (sc->sc_cmdlen == 0)
 						/* Hope for the best... */
 						break;
-				} else if ((NCR_READ_REG(sc, NCR_FFLAG)
-				    & NCRFIFO_FF) == 0) {
+				} else if ((NCR_READ_REG(sc, NCR_FFLAG) &
+				    NCRFIFO_FF) == 0) {
 					/* Hope for the best... */
 					break;
 				}
@@ -2872,7 +2864,7 @@ again:
 			/* "Initiate Command Complete Steps" in progress */
 			sc->sc_flags &= ~NCR_ICCS;
 
-			if (!(sc->sc_espintr & NCRINTR_DONE)) {
+			if ((sc->sc_espintr & NCRINTR_DONE) == 0) {
 				device_printf(sc->sc_dev, "ICCS: "
 				    ": [intr %x, stat %x, step %x]\n",
 				    sc->sc_espintr, sc->sc_espstat,
@@ -2912,9 +2904,8 @@ again:
 	 * Driver is now in state NCR_CONNECTED, i.e. we
 	 * have a current command working the SCSI bus.
 	 */
-	if (sc->sc_state != NCR_CONNECTED || ecb == NULL) {
-		panic("ncr53c9x: no nexus");
-	}
+	if (sc->sc_state != NCR_CONNECTED || ecb == NULL)
+		panic("%s: no nexus", __func__);
 
 	switch (sc->sc_phase) {
 	case MESSAGE_OUT_PHASE:
@@ -2928,7 +2919,7 @@ msgin:
 		NCR_PHASE(("MESSAGE_IN_PHASE "));
 		if ((sc->sc_espintr & NCRINTR_BS) != 0) {
 			if ((sc->sc_rev != NCR_VARIANT_FAS366) ||
-			    !(sc->sc_espstat2 & NCRFAS_STAT2_EMPTY)) {
+			    (sc->sc_espstat2 & NCRFAS_STAT2_EMPTY) == 0) {
 				NCRCMD(sc, NCRCMD_FLUSH);
 			}
 			sc->sc_flags |= NCR_WAITI;
@@ -2945,11 +2936,10 @@ msgin:
 			    (sc->sc_prevphase == sc->sc_phase) ?
 			    NCR_RDFIFO_CONTINUE : NCR_RDFIFO_START);
 			ncr53c9x_msgin(sc);
-		} else {
+		} else
 			device_printf(sc->sc_dev, "MSGIN: weird bits: "
 			    "[intr %x, stat %x, step %x]\n",
 			    sc->sc_espintr, sc->sc_espstat, sc->sc_espstep);
-		}
 		sc->sc_prevphase = MESSAGE_IN_PHASE;
 		goto shortcut;	/* i.e. expect data to be ready */
 
@@ -2966,7 +2956,9 @@ msgin:
 		    ecb->cmd.cmd.opcode, ecb->clen));
 		if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) {
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1);*/
+#if 0
+			DELAY(1);
+#endif
 		}
 		/*
 		 * If we have more messages to send, e.g. WDTR or SDTR
@@ -2981,7 +2973,7 @@ msgin:
 			/* Setup DMA transfer for command. */
 			size = ecb->clen;
 			sc->sc_cmdlen = size;
-			sc->sc_cmdp = (caddr_t)&ecb->cmd.cmd;
+			sc->sc_cmdp = (void *)&ecb->cmd.cmd;
 			NCRDMA_SETUP(sc, &sc->sc_cmdp, &sc->sc_cmdlen,
 			    0, &size);
 			/* Program the SCSI counter. */
@@ -2994,7 +2986,8 @@ msgin:
 			NCRCMD(sc, NCRCMD_TRANS | NCRCMD_DMA);
 			NCRDMA_GO(sc);
 		} else {
-			ncr53c9x_wrfifo(sc, (u_char *)&ecb->cmd.cmd, ecb->clen);
+			ncr53c9x_wrfifo(sc, (uint8_t *)&ecb->cmd.cmd,
+			    ecb->clen);
 			NCRCMD(sc, NCRCMD_TRANS);
 		}
 		sc->sc_prevphase = COMMAND_PHASE;
@@ -3175,7 +3168,7 @@ ncr53c9x_callout(void *arg)
 static void
 ncr53c9x_watch(void *arg)
 {
-	struct ncr53c9x_softc *sc = (struct ncr53c9x_softc *)arg;
+	struct ncr53c9x_softc *sc = arg;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
 	time_t old;

Modified: stable/9/sys/dev/esp/ncr53c9xreg.h
==============================================================================
--- stable/9/sys/dev/esp/ncr53c9xreg.h	Sat Oct 29 23:51:23 2011	(r226916)
+++ stable/9/sys/dev/esp/ncr53c9xreg.h	Sat Oct 29 23:53:53 2011	(r226917)
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr53c9xreg.h,v 1.14 2005/02/27 00:27:02 perry Exp $	*/
+/*	$NetBSD: ncr53c9xreg.h,v 1.16 2009/09/07 13:31:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1994 Peter Galbavy.  All rights reserved.
@@ -43,84 +43,84 @@
 #define	NCR_FIFO	0x02		/* RW - FIFO data		*/
 
 #define	NCR_CMD		0x03		/* RW - Command (2 deep)	*/
-#define  NCRCMD_DMA	0x80		/*	DMA Bit			*/
-#define  NCRCMD_NOP	0x00		/*	No Operation		*/
-#define  NCRCMD_FLUSH	0x01		/*	Flush FIFO		*/
-#define  NCRCMD_RSTCHIP	0x02		/*	Reset Chip		*/
-#define  NCRCMD_RSTSCSI	0x03		/*	Reset SCSI Bus		*/
-#define  NCRCMD_RESEL	0x40		/*	Reselect Sequence	*/
-#define  NCRCMD_SELNATN	0x41		/*	Select without ATN	*/
-#define  NCRCMD_SELATN	0x42		/*	Select with ATN		*/
-#define  NCRCMD_SELATNS	0x43		/*	Select with ATN & Stop	*/
-#define  NCRCMD_ENSEL	0x44		/*	Enable (Re)Selection	*/
-#define  NCRCMD_DISSEL	0x45		/*	Disable (Re)Selection	*/
-#define  NCRCMD_SELATN3	0x46		/*	Select with ATN3	*/
-#define  NCRCMD_RESEL3	0x47		/*	Reselect3 Sequence	*/
-#define  NCRCMD_SNDMSG	0x20		/*	Send Message		*/
-#define  NCRCMD_SNDSTAT	0x21		/*	Send Status		*/
-#define  NCRCMD_SNDDATA	0x22		/*	Send Data		*/
-#define  NCRCMD_DISCSEQ	0x23		/*	Disconnect Sequence	*/
-#define  NCRCMD_TERMSEQ	0x24		/*	Terminate Sequence	*/
-#define  NCRCMD_TCCS	0x25		/*	Target Command Comp Seq	*/
-#define  NCRCMD_DISC	0x27		/*	Disconnect		*/
-#define  NCRCMD_RECMSG	0x28		/*	Receive Message		*/
-#define  NCRCMD_RECCMD	0x29		/*	Receive Command 	*/
-#define  NCRCMD_RECDATA	0x2a		/*	Receive Data		*/
-#define  NCRCMD_RECCSEQ	0x2b		/*	Receive Command Sequence*/
-#define  NCRCMD_ABORT	0x04		/*	Target Abort DMA	*/
-#define  NCRCMD_TRANS	0x10		/*	Transfer Information	*/
-#define  NCRCMD_ICCS	0x11		/*	Initiator Cmd Comp Seq 	*/
-#define  NCRCMD_MSGOK	0x12		/*	Message Accepted	*/
-#define  NCRCMD_TRPAD	0x18		/*	Transfer Pad		*/
-#define  NCRCMD_SETATN	0x1a		/*	Set ATN			*/
-#define  NCRCMD_RSTATN	0x1b		/*	Reset ATN		*/
+#define	 NCRCMD_DMA	0x80		/*	DMA Bit			*/
+#define	 NCRCMD_NOP	0x00		/*	No Operation		*/
+#define	 NCRCMD_FLUSH	0x01		/*	Flush FIFO		*/
+#define	 NCRCMD_RSTCHIP	0x02		/*	Reset Chip		*/
+#define	 NCRCMD_RSTSCSI	0x03		/*	Reset SCSI Bus		*/
+#define	 NCRCMD_RESEL	0x40		/*	Reselect Sequence	*/
+#define	 NCRCMD_SELNATN	0x41		/*	Select without ATN	*/
+#define	 NCRCMD_SELATN	0x42		/*	Select with ATN		*/
+#define	 NCRCMD_SELATNS	0x43		/*	Select with ATN & Stop	*/
+#define	 NCRCMD_ENSEL	0x44		/*	Enable (Re)Selection	*/
+#define	 NCRCMD_DISSEL	0x45		/*	Disable (Re)Selection	*/
+#define	 NCRCMD_SELATN3	0x46		/*	Select with ATN3	*/
+#define	 NCRCMD_RESEL3	0x47		/*	Reselect3 Sequence	*/
+#define	 NCRCMD_SNDMSG	0x20		/*	Send Message		*/
+#define	 NCRCMD_SNDSTAT	0x21		/*	Send Status		*/
+#define	 NCRCMD_SNDDATA	0x22		/*	Send Data		*/
+#define	 NCRCMD_DISCSEQ	0x23		/*	Disconnect Sequence	*/
+#define	 NCRCMD_TERMSEQ	0x24		/*	Terminate Sequence	*/
+#define	 NCRCMD_TCCS	0x25		/*	Target Command Comp Seq	*/
+#define	 NCRCMD_DISC	0x27		/*	Disconnect		*/
+#define	 NCRCMD_RECMSG	0x28		/*	Receive Message		*/
+#define	 NCRCMD_RECCMD	0x29		/*	Receive Command		*/
+#define	 NCRCMD_RECDATA	0x2a		/*	Receive Data		*/
+#define	 NCRCMD_RECCSEQ	0x2b		/*	Receive Command Sequence*/
+#define	 NCRCMD_ABORT	0x04		/*	Target Abort DMA	*/
+#define	 NCRCMD_TRANS	0x10		/*	Transfer Information	*/
+#define	 NCRCMD_ICCS	0x11		/*	Initiator Cmd Comp Seq	*/
+#define	 NCRCMD_MSGOK	0x12		/*	Message Accepted	*/
+#define	 NCRCMD_TRPAD	0x18		/*	Transfer Pad		*/
+#define	 NCRCMD_SETATN	0x1a		/*	Set ATN			*/
+#define	 NCRCMD_RSTATN	0x1b		/*	Reset ATN		*/
 
 #define	NCR_STAT	0x04		/* RO - Status			*/
-#define  NCRSTAT_INT	0x80		/*	Interrupt		*/
-#define  NCRSTAT_GE	0x40		/*	Gross Error		*/
-#define  NCRSTAT_PE	0x20		/*	Parity Error		*/
-#define  NCRSTAT_TC	0x10		/*	Terminal Count		*/
-#define  NCRSTAT_VGC	0x08		/*	Valid Group Code	*/
-#define  NCRSTAT_PHASE	0x07		/*	Phase bits		*/
+#define	 NCRSTAT_INT	0x80		/*	Interrupt		*/
+#define	 NCRSTAT_GE	0x40		/*	Gross Error		*/
+#define	 NCRSTAT_PE	0x20		/*	Parity Error		*/
+#define	 NCRSTAT_TC	0x10		/*	Terminal Count		*/
+#define	 NCRSTAT_VGC	0x08		/*	Valid Group Code	*/
+#define	 NCRSTAT_PHASE	0x07		/*	Phase bits		*/
 
 #define	NCR_SELID	0x04		/* WO - Select/Reselect Bus ID	*/
-#define  NCR_BUSID_HMEXC32	0x40	/*	HME xfer counter is 32bit */
-#define  NCR_BUSID_HMEENCID	0x10 	/*	HME encode reselection ID */
+#define	 NCR_BUSID_HMEXC32	0x40	/*	HME xfer counter is 32bit */
+#define	 NCR_BUSID_HMEENCID	0x10	/*	HME encode reselection ID */
 
 #define	NCR_INTR	0x05		/* RO - Interrupt		*/
-#define  NCRINTR_SBR	0x80		/*	SCSI Bus Reset		*/
-#define  NCRINTR_ILL	0x40		/*	Illegal Command		*/
-#define  NCRINTR_DIS	0x20		/*	Disconnect		*/
-#define  NCRINTR_BS	0x10		/*	Bus Service		*/
-#define  NCRINTR_FC	0x08		/*	Function Complete	*/
-#define  NCRINTR_RESEL	0x04		/*	Reselected		*/
-#define  NCRINTR_SELATN	0x02		/*	Select with ATN		*/
-#define  NCRINTR_SEL	0x01		/*	Selected		*/
+#define	 NCRINTR_SBR	0x80		/*	SCSI Bus Reset		*/
+#define	 NCRINTR_ILL	0x40		/*	Illegal Command		*/
+#define	 NCRINTR_DIS	0x20		/*	Disconnect		*/
+#define	 NCRINTR_BS	0x10		/*	Bus Service		*/
+#define	 NCRINTR_FC	0x08		/*	Function Complete	*/
+#define	 NCRINTR_RESEL	0x04		/*	Reselected		*/
+#define	 NCRINTR_SELATN	0x02		/*	Select with ATN		*/
+#define	 NCRINTR_SEL	0x01		/*	Selected		*/
 
 #define	NCR_TIMEOUT	0x05		/* WO - Select/Reselect Timeout */
 
 #define	NCR_STEP	0x06		/* RO - Sequence Step		*/
-#define  NCRSTEP_MASK	0x07		/*	the last 3 bits		*/
-#define  NCRSTEP_DONE	0x04		/*	command went out	*/
+#define	 NCRSTEP_MASK	0x07		/*	the last 3 bits		*/
+#define	 NCRSTEP_DONE	0x04		/*	command went out	*/
 
 #define	NCR_SYNCTP	0x06		/* WO - Synch Transfer Period	*/
 					/*	Default 5 (53C9X)	*/
 
 #define	NCR_FFLAG	0x07		/* RO - FIFO Flags		*/
-#define  NCRFIFO_SS	0xe0		/*	Sequence Step (Dup)	*/
-#define  NCRFIFO_FF	0x1f		/*	Bytes in FIFO		*/
+#define	 NCRFIFO_SS	0xe0		/*	Sequence Step (Dup)	*/
+#define	 NCRFIFO_FF	0x1f		/*	Bytes in FIFO		*/
 
 #define	NCR_SYNCOFF	0x07		/* WO - Synch Offset		*/
 					/*	0 = ASYNC		*/
 					/*	1 - 15 = SYNC bytes	*/
 
 #define	NCR_CFG1	0x08		/* RW - Configuration #1	*/
-#define  NCRCFG1_SLOW	0x80		/*	Slow Cable Mode		*/
-#define  NCRCFG1_SRR	0x40		/*	SCSI Reset Rep Int Dis	*/
-#define  NCRCFG1_PTEST	0x20		/*	Parity Test Mod		*/
-#define  NCRCFG1_PARENB	0x10		/*	Enable Parity Check	*/
-#define  NCRCFG1_CTEST	0x08		/*	Enable Chip Test	*/
-#define  NCRCFG1_BUSID	0x07		/*	Bus ID			*/
+#define	 NCRCFG1_SLOW	0x80		/*	Slow Cable Mode		*/
+#define	 NCRCFG1_SRR	0x40		/*	SCSI Reset Rep Int Dis	*/
+#define	 NCRCFG1_PTEST	0x20		/*	Parity Test Mod		*/
+#define	 NCRCFG1_PARENB	0x10		/*	Enable Parity Check	*/
+#define	 NCRCFG1_CTEST	0x08		/*	Enable Chip Test	*/
+#define	 NCRCFG1_BUSID	0x07		/*	Bus ID			*/
 
 #define	NCR_CCF		0x09		/* WO -	Clock Conversion Factor	*/
 					/*	0 = 35.01 - 40MHz	*/
@@ -136,24 +136,24 @@
 
 #define	NCR_CFG2	0x0b		/* RW - Configuration #2	*/
 #define	 NCRCFG2_RSVD	0xa0		/*	reserved		*/
-#define  NCRCFG2_FE	0x40		/* 	Features Enable		*/
-#define  NCRCFG2_DREQ	0x10		/* 	DREQ High Impedance	*/
-#define  NCRCFG2_SCSI2	0x08		/* 	SCSI-2 Enable		*/
-#define  NCRCFG2_BPA	0x04		/* 	Target Bad Parity Abort	*/
-#define  NCRCFG2_RPE	0x02		/* 	Register Parity Error	*/
-#define  NCRCFG2_DPE	0x01		/* 	DMA Parity Error	*/
+#define	 NCRCFG2_FE	0x40		/*	Features Enable		*/
+#define	 NCRCFG2_DREQ	0x10		/*	DREQ High Impedance	*/
+#define	 NCRCFG2_SCSI2	0x08		/*	SCSI-2 Enable		*/
+#define	 NCRCFG2_BPA	0x04		/*	Target Bad Parity Abort	*/
+#define	 NCRCFG2_RPE	0x02		/*	Register Parity Error	*/
+#define	 NCRCFG2_DPE	0x01		/*	DMA Parity Error	*/
 
-#define  NCRCFG2_HMEFE	0x10		/*	HME feature enable	*/
+#define	 NCRCFG2_HMEFE	0x10		/*	HME feature enable	*/
 #define	 NCRCFG2_HME32  0x80		/*	HME 32 extended		*/
 
 /* Config #3 only on 53C9X */
 #define	NCR_CFG3	0x0c		/* RW - Configuration #3	*/
 #define	 NCRCFG3_RSVD	0xe0		/*	reserved		*/
-#define  NCRCFG3_IDM	0x10		/*	ID Message Res Check	*/
-#define  NCRCFG3_QTE	0x08		/*	Queue Tag Enable	*/
-#define  NCRCFG3_CDB	0x04		/*	CDB 10-bytes OK		*/
-#define  NCRCFG3_FSCSI	0x02		/*	Fast SCSI		*/
-#define  NCRCFG3_FCLK	0x01		/*	Fast Clock (>25MHz)	*/
+#define	 NCRCFG3_IDM	0x10		/*	ID Message Res Check	*/
+#define	 NCRCFG3_QTE	0x08		/*	Queue Tag Enable	*/
+#define	 NCRCFG3_CDB	0x04		/*	CDB 10-bytes OK		*/
+#define	 NCRCFG3_FSCSI	0x02		/*	Fast SCSI		*/
+#define	 NCRCFG3_FCLK	0x01		/*	Fast Clock (>25MHz)	*/
 
 /*
  * For some unknown reason, the ESP406/FAS408 looks like every
@@ -164,35 +164,35 @@
 
 /* Config #3 different on ESP406/FAS408 */
 #define	NCR_ESPCFG3		0x0c	/* RW - Configuration #3	*/
-#define  NCRESPCFG3_IDM		0x80	/*	ID Message Res Check	*/
-#define  NCRESPCFG3_QTE		0x40	/*	Queue Tag Enable	*/
-#define  NCRESPCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
-#define  NCRESPCFG3_FSCSI	0x10	/*	Fast SCSI		*/
+#define	 NCRESPCFG3_IDM		0x80	/*	ID Message Res Check	*/
+#define	 NCRESPCFG3_QTE		0x40	/*	Queue Tag Enable	*/
+#define	 NCRESPCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
+#define	 NCRESPCFG3_FSCSI	0x10	/*	Fast SCSI		*/
 #define	 NCRESPCFG3_SRESB	0x08	/*	Save Residual Byte	*/
-#define  NCRESPCFG3_FCLK	0x04	/*	Fast Clock (>25MHz)	*/
+#define	 NCRESPCFG3_FCLK	0x04	/*	Fast Clock (>25MHz)	*/
 #define	 NCRESPCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
 #define	 NCRESPCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
 
 /* Config #3 also different on NCR53CF9x/FAS100A/FAS216/FAS236 */
 #define	NCR_F9XCFG3		0x0c	/* RW - Configuration #3	*/
-#define  NCRF9XCFG3_IDM		0x80	/*	ID Message Res Check	*/
-#define  NCRF9XCFG3_QTE		0x40	/*	Queue Tag Enable	*/
-#define  NCRF9XCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
-#define  NCRF9XCFG3_FSCSI	0x10	/*	Fast SCSI		*/
-#define  NCRF9XCFG3_FCLK	0x08	/*	Fast Clock (>25MHz)	*/
-#define  NCRF9XCFG3_SRESB	0x04	/*	Save Residual Byte	*/
-#define  NCRF9XCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
-#define  NCRF9XCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
+#define	 NCRF9XCFG3_IDM		0x80	/*	ID Message Res Check	*/
+#define	 NCRF9XCFG3_QTE		0x40	/*	Queue Tag Enable	*/
+#define	 NCRF9XCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
+#define	 NCRF9XCFG3_FSCSI	0x10	/*	Fast SCSI		*/
+#define	 NCRF9XCFG3_FCLK	0x08	/*	Fast Clock (>25MHz)	*/
+#define	 NCRF9XCFG3_SRESB	0x04	/*	Save Residual Byte	*/
+#define	 NCRF9XCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
+#define	 NCRF9XCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
 
 /* Config #3 on FAS366 */
-#define  NCRFASCFG3_OBAUTO    	0x80    /*	auto push odd-byte to DMA */
-#define  NCRFASCFG3_EWIDE     	0x40    /* 	Enable Wide-SCSI     */
-#define  NCRFASCFG3_IDBIT3	0x20	/* 	Bit 3 of HME SCSI-ID */
-#define	 NCRFASCFG3_IDRESCHK	0x10	/* 	ID message checking */
-#define	 NCRFASCFG3_QUENB	0x08	/* 	3-byte msg support */
-#define	 NCRFASCFG3_CDB10	0x04	/* 	group 2 scsi-2 support */
-#define	 NCRFASCFG3_FASTSCSI	0x02	/* 	10 MB/S fast scsi mode */
-#define	 NCRFASCFG3_FASTCLK	0x01	/* 	fast clock mode */
+#define	 NCRFASCFG3_OBAUTO	0x80    /*	auto push odd-byte to DMA */
+#define	 NCRFASCFG3_EWIDE	0x40    /*	Enable Wide-SCSI     */
+#define	 NCRFASCFG3_IDBIT3	0x20	/*	Bit 3 of HME SCSI-ID */
+#define	 NCRFASCFG3_IDRESCHK	0x10	/*	ID message checking */
+#define	 NCRFASCFG3_QUENB	0x08	/*	3-byte msg support */
+#define	 NCRFASCFG3_CDB10	0x04	/*	group 2 scsi-2 support */
+#define	 NCRFASCFG3_FASTSCSI	0x02	/*	10 MB/S fast scsi mode */
+#define	 NCRFASCFG3_FASTCLK	0x01	/*	fast clock mode */
 
 /* Config #4 only on ESP406/FAS408 */
 #define	NCR_CFG4	0x0d		/* RW - Configuration #4	*/
@@ -208,8 +208,8 @@
 */
 

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

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:53:58 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 807131065672;
	Sat, 29 Oct 2011 23:53:58 +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 6D7F68FC13;
	Sat, 29 Oct 2011 23:53:58 +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 p9TNrwmF038644;
	Sat, 29 Oct 2011 23:53:58 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNrw9K038631;
	Sat, 29 Oct 2011 23:53:58 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292353.p9TNrw9K038631@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:53:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226918 - in stable/7/sys: dev/esp sparc64/sbus
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:53:58 -0000

Author: marius
Date: Sat Oct 29 23:53:58 2011
New Revision: 226918
URL: http://svn.freebsd.org/changeset/base/226918

Log:
  MFC: r226381
  
  Merge from NetBSD:
  - Remove clause 3 and 4 from TNF licenses.
  - Fix memset usage.
  - Various cleanup.
  - Kill caddr_t.

Modified:
  stable/7/sys/dev/esp/esp_sbus.c
  stable/7/sys/dev/esp/ncr53c9x.c
  stable/7/sys/dev/esp/ncr53c9xreg.h
  stable/7/sys/dev/esp/ncr53c9xvar.h
  stable/7/sys/sparc64/sbus/lsi64854.c
  stable/7/sys/sparc64/sbus/lsi64854var.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/esp/esp_sbus.c
==============================================================================
--- stable/7/sys/dev/esp/esp_sbus.c	Sat Oct 29 23:53:53 2011	(r226917)
+++ stable/7/sys/dev/esp/esp_sbus.c	Sat Oct 29 23:53:58 2011	(r226918)
@@ -26,7 +26,7 @@
  *
  */
 
-/*	$NetBSD: esp_sbus.c,v 1.31 2005/02/27 00:27:48 perry Exp $	*/
+/*	$NetBSD: esp_sbus.c,v 1.51 2009/09/17 16:28:12 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -44,13 +44,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -158,12 +151,12 @@ MODULE_DEPEND(esp, sbus, 1, 1, 1);
 /*
  * Functions and the switch for the MI code
  */
-static u_char	esp_read_reg(struct ncr53c9x_softc *sc, int reg);
-static void	esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v);
+static uint8_t	esp_read_reg(struct ncr53c9x_softc *sc, int reg);
+static void	esp_write_reg(struct ncr53c9x_softc *sc, int reg, uint8_t v);
 static int	esp_dma_isintr(struct ncr53c9x_softc *sc);
 static void	esp_dma_reset(struct ncr53c9x_softc *sc);
 static int	esp_dma_intr(struct ncr53c9x_softc *sc);
-static int	esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr,
+static int	esp_dma_setup(struct ncr53c9x_softc *sc, void **addr,
 		    size_t *len, int datain, size_t *dmasize);
 static void	esp_dma_go(struct ncr53c9x_softc *sc);
 static void	esp_dma_stop(struct ncr53c9x_softc *sc);
@@ -172,7 +165,7 @@ static int	espattach(struct esp_softc *e
 		    const struct ncr53c9x_glue *gluep);
 static int	espdetach(struct esp_softc *esc);
 
-static const struct ncr53c9x_glue esp_sbus_glue = {
+static const struct ncr53c9x_glue const esp_sbus_glue = {
 	esp_read_reg,
 	esp_write_reg,
 	esp_dma_isintr,
@@ -718,9 +711,9 @@ espdetach(struct esp_softc *esc)
 static int esp_sbus_debug = 0;
 
 static const struct {
-	char *r_name;
-	int   r_flag;
-} esp__read_regnames [] = {
+	const char *r_name;
+	int r_flag;
+} const esp__read_regnames [] = {
 	{ "TCL", 0},			/* 0/00 */
 	{ "TCM", 0},			/* 1/04 */
 	{ "FIFO", 0},			/* 2/08 */
@@ -739,10 +732,10 @@ static const struct {
 	{ "TCX", 1},			/* f/3c */
 };
 
-static const struct {
-	char *r_name;
-	int   r_flag;
-} esp__write_regnames[] = {
+static const const struct {
+	const char *r_name;
+	int r_flag;
+} const esp__write_regnames[] = {
 	{ "TCL", 1},			/* 0/00 */
 	{ "TCM", 1},			/* 1/04 */
 	{ "FIFO", 0},			/* 2/08 */
@@ -762,11 +755,11 @@ static const struct {
 };
 #endif
 
-static u_char
+static uint8_t
 esp_read_reg(struct ncr53c9x_softc *sc, int reg)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
-	u_char v;
+	uint8_t v;
 
 	v = bus_read_1(esc->sc_res, reg * 4);
 
@@ -780,7 +773,7 @@ esp_read_reg(struct ncr53c9x_softc *sc, 
 }
 
 static void
-esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v)
+esp_write_reg(struct ncr53c9x_softc *sc, int reg, uint8_t v)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -818,8 +811,8 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
 }
 
 static int
-esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr, size_t *len,
-	      int datain, size_t *dmasize)
+esp_dma_setup(struct ncr53c9x_softc *sc, void **addr, size_t *len,
+    int datain, size_t *dmasize)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 

Modified: stable/7/sys/dev/esp/ncr53c9x.c
==============================================================================
--- stable/7/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:53:53 2011	(r226917)
+++ stable/7/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:53:58 2011	(r226918)
@@ -26,7 +26,7 @@
  *
  */
 
-/*	$NetBSD: ncr53c9x.c,v 1.125 2007/01/09 12:53:12 itohy Exp $	*/
+/*	$NetBSD: ncr53c9x.c,v 1.143 2011/07/31 18:39:00 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -43,13 +43,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -133,7 +126,7 @@ __FBSDID("$FreeBSD$");
 MODULE_DEPEND(esp, cam, 1, 1, 1);
 
 #ifdef NCR53C9X_DEBUG
-static int ncr53c9x_debug =
+int ncr53c9x_debug =
     NCR_SHOWMISC /* | NCR_SHOWPHASE | NCR_SHOWTRAC | NCR_SHOWCMDS */;
 #endif
 
@@ -167,7 +160,7 @@ static void	ncr53c9x_sched(struct ncr53c
 static void	ncr53c9x_select(struct ncr53c9x_softc *sc,
 		    struct ncr53c9x_ecb *ecb);
 static void	ncr53c9x_watch(void *arg);
-static void	ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, u_char *p,
+static void	ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, uint8_t *p,
 		    int len);
 
 static struct ncr53c9x_ecb	*ncr53c9x_get_ecb(struct ncr53c9x_softc *sc);
@@ -187,13 +180,11 @@ static inline int	ncr53c9x_stp2cpb(struc
 		NCR_WRITE_REG((sc), NCR_TCL, (size));			\
 		NCR_WRITE_REG((sc), NCR_TCM, (size) >> 8);		\
 		if ((sc->sc_cfg2 & NCRCFG2_FE) ||			\
-		    (sc->sc_rev == NCR_VARIANT_FAS366)) {		\
+		    (sc->sc_rev == NCR_VARIANT_FAS366))			\
 			NCR_WRITE_REG((sc), NCR_TCH, (size) >> 16);	\
-		}							\
-		if (sc->sc_rev == NCR_VARIANT_FAS366) {			\
+		if (sc->sc_rev == NCR_VARIANT_FAS366)			\
 			NCR_WRITE_REG(sc, NCR_RCH, 0);			\
-		}							\
-} while (0)
+} while (/* CONSTCOND */0)
 
 #ifndef mstohz
 #define	mstohz(ms) \
@@ -551,11 +542,10 @@ ncr53c9x_reset(struct ncr53c9x_softc *sc
 		NCR_WRITE_REG(sc, NCR_AMDCFG4, sc->sc_cfg4);
 
 #if 0
-	device_printf(sc->sc_dev, "ncr53c9x_reset: revision %d\n",
-	    sc->sc_rev);
-	device_printf(sc->sc_dev, "ncr53c9x_reset: cfg1 0x%x, cfg2 0x%x, "
-	    "cfg3 0x%x, ccf 0x%x, timeout 0x%x\n",
-	    sc->sc_cfg1, sc->sc_cfg2, sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout);
+	device_printf(sc->sc_dev, "%s: revision %d\n", __func__, sc->sc_rev);
+	device_printf(sc->sc_dev, "%s: cfg1 0x%x, cfg2 0x%x, cfg3 0x%x, ccf "
+	    "0x%x, timeout 0x%x\n", __func__, sc->sc_cfg1, sc->sc_cfg2,
+	    sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout);
 #endif
 }
 
@@ -573,7 +563,8 @@ ncr53c9x_clear(struct ncr53c9x_softc *sc
 	/* Cancel any active commands. */
 	sc->sc_state = NCR_CLEANING;
 	sc->sc_msgify = 0;
-	if ((ecb = sc->sc_nexus) != NULL) {
+	ecb = sc->sc_nexus;
+	if (ecb != NULL) {
 		ecb->ccb->ccb_h.status = result;
 		ncr53c9x_done(sc, ecb);
 	}
@@ -597,7 +588,8 @@ ncr53c9x_clear_target(struct ncr53c9x_so
 
 	/* Cancel outstanding disconnected commands on each LUN. */
 	LIST_FOREACH(li, &sc->sc_tinfo[target].luns, link) {
-		if ((ecb = li->untagged) != NULL) {
+		ecb = li->untagged;
+		if (ecb != NULL) {
 			li->untagged = NULL;
 			/*
 			 * XXX should we terminate a command
@@ -607,12 +599,14 @@ ncr53c9x_clear_target(struct ncr53c9x_so
 			ecb->ccb->ccb_h.status = result;
 			ncr53c9x_done(sc, ecb);
 		}
-		for (i = 0; i < NCR_TAG_DEPTH; i++)
-			if ((ecb = li->queued[i])) {
+		for (i = 0; i < NCR_TAG_DEPTH; i++) {
+			ecb = li->queued[i];
+			if (ecb != NULL) {
 				li->queued[i] = NULL;
 				ecb->ccb->ccb_h.status = result;
 				ncr53c9x_done(sc, ecb);
 			}
+		}
 		li->used = 0;
 	}
 }
@@ -635,7 +629,7 @@ ncr53c9x_init(struct ncr53c9x_softc *sc,
 
 		TAILQ_INIT(&sc->ready_list);
 		sc->sc_nexus = NULL;
-		memset(sc->sc_tinfo, 0, sizeof(sc->sc_tinfo));
+		memset(sc->sc_tinfo, 0, sizeof(*sc->sc_tinfo));
 		for (r = 0; r < sc->sc_ntarg; r++) {
 			LIST_INIT(&sc->sc_tinfo[r].luns);
 		}
@@ -751,7 +745,7 @@ ncr53c9x_stp2cpb(struct ncr53c9x_softc *
 static inline void
 ncr53c9x_setsync(struct ncr53c9x_softc *sc, struct ncr53c9x_tinfo *ti)
 {
-	u_char cfg3, syncoff, synctp;
+	uint8_t cfg3, syncoff, synctp;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -810,7 +804,7 @@ static void
 ncr53c9x_select(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
 {
 	struct ncr53c9x_tinfo *ti;
-	u_char *cmd;
+	uint8_t *cmd;
 	size_t dmasize;
 	int clen, selatn3, selatns;
 	int lun = ecb->ccb->ccb_h.target_lun;
@@ -818,8 +812,8 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_select(t%d,l%d,cmd:%x,tag:%x,%x)] ",
-	    target, lun, ecb->cmd.cmd.opcode, ecb->tag[0], ecb->tag[1]));
+	NCR_TRACE(("[%s(t%d,l%d,cmd:%x,tag:%x,%x)] ", __func__, target, lun,
+	    ecb->cmd.cmd.opcode, ecb->tag[0], ecb->tag[1]));
 
 	ti = &sc->sc_tinfo[target];
 	sc->sc_state = NCR_SELECTING;
@@ -838,9 +832,8 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 		NCRCMD(sc, NCRCMD_FLUSH);
 		NCR_WRITE_REG(sc, NCR_SELID, target | NCR_BUSID_HMEXC32 |
 		    NCR_BUSID_HMEENCID);
-	} else {
+	} else
 		NCR_WRITE_REG(sc, NCR_SELID, target);
-	}
 
 	/*
 	 * If we are requesting sense, force a renegotiation if we are
@@ -873,7 +866,7 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 		selatns = 1;
 	}
 
-	cmd = (u_char *)&ecb->cmd.cmd;
+	cmd = (uint8_t *)&ecb->cmd.cmd;
 
 	if (selatn3) {
 		/* We'll use tags with SELATN3. */
@@ -954,7 +947,7 @@ ncr53c9x_get_ecb(struct ncr53c9x_softc *
 	ecb = TAILQ_FIRST(&sc->free_list);
 	if (ecb) {
 		if (ecb->flags != 0)
-			panic("ecb flags not cleared\n");
+			panic("%s: ecb flags not cleared", __func__);
 		TAILQ_REMOVE(&sc->free_list, ecb, free_links);
 		ecb->flags = ECB_ALLOC;
 		bzero(&ecb->ccb, sizeof(struct ncr53c9x_ecb) -
@@ -990,7 +983,7 @@ ncr53c9x_action(struct cam_sim *sim, uni
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_action %d]", ccb->ccb_h.func_code));
+	NCR_TRACE(("[%s %d]", __func__, ccb->ccb_h.func_code));
 
 	switch (ccb->ccb_h.func_code) {
 	case XPT_RESET_BUS:
@@ -1196,7 +1189,7 @@ ncr53c9x_poll(struct cam_sim *sim)
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_poll] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	if (NCRDMA_ISINTR(sc))
 		ncr53c9x_intr1(sc);
@@ -1260,10 +1253,10 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_sched] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	if (sc->sc_state != NCR_IDLE)
-		panic("ncr53c9x_sched: not IDLE (state=%d)", sc->sc_state);
+		panic("%s: not IDLE (state=%d)", __func__, sc->sc_state);
 
 	/*
 	 * Find first ecb in ready queue that is for a target/lunit
@@ -1288,10 +1281,9 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 		li = TINFO_LUN(ti, lun);
 		if (li == NULL) {
 			/* Initialize LUN info and add to list. */
-			if ((li = malloc(sizeof(*li),
-			    M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
+			li = malloc(sizeof(*li), M_DEVBUF, M_NOWAIT | M_ZERO);
+			if (li == NULL)
 				continue;
-			}
 			li->lun = lun;
 
 			LIST_INSERT_HEAD(&ti->luns, li, link);
@@ -1338,7 +1330,7 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 			ncr53c9x_select(sc, ecb);
 			break;
 		} else {
-			NCR_TRACE(("%d:%d busy\n",
+			NCR_TRACE(("[%s %d:%d busy] \n", __func__,
 			    ecb->ccb->ccb_h.target_id,
 			    ecb->ccb->ccb_h.target_lun));
 		}
@@ -1356,7 +1348,7 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("requesting sense "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	lun = ccb->ccb_h.target_lun;
 	ti = &sc->sc_tinfo[ccb->ccb_h.target_id];
@@ -1368,7 +1360,7 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ss->length = sizeof(struct scsi_sense_data);
 	ecb->clen = sizeof(*ss);
 	memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
-	ecb->daddr = (char *)&ccb->csio.sense_data;
+	ecb->daddr = (uint8_t *)&ccb->csio.sense_data;
 	ecb->dleft = sizeof(struct scsi_sense_data);
 	ecb->flags |= ECB_SENSE;
 	ecb->timeout = NCR_SENSE_TIMEOUT;
@@ -1379,9 +1371,9 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ncr53c9x_dequeue(sc, ecb);
 	li->untagged = ecb;	/* Must be executed first to fix C/A. */
 	li->busy = 2;
-	if (ecb == sc->sc_nexus) {
+	if (ecb == sc->sc_nexus)
 		ncr53c9x_select(sc, ecb);
-	} else {
+	else {
 		TAILQ_INSERT_HEAD(&sc->ready_list, ecb, chain);
 		ecb->flags |= ECB_READY;
 		if (sc->sc_state == NCR_IDLE)
@@ -1402,7 +1394,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_done(status:%x)] ", ccb->ccb_h.status));
+	NCR_TRACE(("[%s(status:%x)] ", __func__, ccb->ccb_h.status));
 
 	ti = &sc->sc_tinfo[ccb->ccb_h.target_id];
 	lun = ccb->ccb_h.target_lun;
@@ -1457,7 +1449,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 	}
 
 #ifdef NCR53C9X_DEBUG
-	if (ncr53c9x_debug & NCR_SHOWTRAC) {
+	if ((ncr53c9x_debug & NCR_SHOWTRAC) != 0) {
 		if (ccb->csio.resid != 0)
 			printf("resid=%d ", ccb->csio.resid);
 		if ((ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0)
@@ -1510,7 +1502,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 	li = TINFO_LUN(ti, lun);
 #ifdef DIAGNOSTIC
 	if (li == NULL || li->lun != lun)
-		panic("ncr53c9x_dequeue: lun %qx for ecb %p does not exist",
+		panic("%s: lun %qx for ecb %p does not exist", __func__,
 		    (long long)lun, ecb);
 #endif
 	if (li->untagged == ecb) {
@@ -1521,9 +1513,9 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 #ifdef DIAGNOSTIC
 		if (li->queued[ecb->tag[1]] != NULL &&
 		    (li->queued[ecb->tag[1]] != ecb))
-			panic("ncr53c9x_dequeue: slot %d for lun %qx has %p "
-			    "instead of ecb %p\n", ecb->tag[1],
-			    (long long)lun, li->queued[ecb->tag[1]], ecb);
+			panic("%s: slot %d for lun %qx has %p instead of ecb "
+			    "%p", __func__, ecb->tag[1], (long long)lun,
+			    li->queued[ecb->tag[1]], ecb);
 #endif
 		li->queued[ecb->tag[1]] = NULL;
 		li->used--;
@@ -1550,7 +1542,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 	NCRCMD(sc, NCRCMD_SETATN);					\
 	sc->sc_flags |= NCR_ATN;					\
 	sc->sc_msgpriq |= (m);						\
-} while (0)
+} while (/* CONSTCOND */0)
 
 static void
 ncr53c9x_flushfifo(struct ncr53c9x_softc *sc)
@@ -1558,7 +1550,7 @@ ncr53c9x_flushfifo(struct ncr53c9x_softc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[flushfifo] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	NCRCMD(sc, NCRCMD_FLUSH);
 
@@ -1570,8 +1562,8 @@ ncr53c9x_flushfifo(struct ncr53c9x_softc
 static int
 ncr53c9x_rdfifo(struct ncr53c9x_softc *sc, int how)
 {
-	u_char *ibuf;
 	int i, n;
+	uint8_t *ibuf;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -1586,7 +1578,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 		break;
 
 	default:
-		panic("ncr53c9x_rdfifo: bad flag");
+		panic("%s: bad flag", __func__);
 		/* NOTREACHED */
 	}
 
@@ -1611,10 +1603,9 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 
 			ncr53c9x_flushfifo(sc);
 		}
-	} else {
+	} else
 		for (i = 0; i < n; i++)
 			ibuf[i] = NCR_READ_REG(sc, NCR_FIFO);
-	}
 
 	sc->sc_imlen += i;
 
@@ -1622,7 +1613,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 #ifdef NCR53C9X_DEBUG
 	NCR_TRACE(("\n[rdfifo %s (%d):",
 	    (how == NCR_RDFIFO_START) ? "start" : "cont", (int)sc->sc_imlen));
-	if (ncr53c9x_debug & NCR_SHOWTRAC) {
+	if ((ncr53c9x_debug & NCR_SHOWTRAC) != 0) {
 		for (i = 0; i < sc->sc_imlen; i++)
 			printf(" %02x", sc->sc_imess[i]);
 		printf("]\n");
@@ -1633,7 +1624,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 }
 
 static void
-ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, u_char *p, int len)
+ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, uint8_t *p, int len)
 {
 	int i;
 
@@ -1641,7 +1632,7 @@ ncr53c9x_wrfifo(struct ncr53c9x_softc *s
 
 #ifdef NCR53C9X_DEBUG
 	NCR_MSGS(("[wrfifo(%d):", len));
-	if (ncr53c9x_debug & NCR_SHOWMSGS) {
+	if ((ncr53c9x_debug & NCR_SHOWMSGS) != 0) {
 		for (i = 0; i < len; i++)
 			printf(" %02x", p[i]);
 		printf("]\n");
@@ -1663,13 +1654,13 @@ ncr53c9x_reselect(struct ncr53c9x_softc 
 	struct ncr53c9x_ecb *ecb = NULL;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	u_char lun, selid, target;
+	uint8_t lun, selid, target;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	if (sc->sc_rev == NCR_VARIANT_FAS366) {
+	if (sc->sc_rev == NCR_VARIANT_FAS366)
 		target = sc->sc_selid;
-	} else {
+	else {
 		/*
 		 * The SCSI chip made a snapshot of the data bus
 		 * while the reselection was being negotiated.
@@ -1751,7 +1742,7 @@ abort:
 #define	MSG_IS2BYTE(m)		(((m) & 0xf0) == 0x20)
 
 static inline int
-__verify_msg_format(u_char *p, int len)
+__verify_msg_format(uint8_t *p, int len)
 {
 
 	if (len == 1 && MSG_IS1BYTE(p[0]))
@@ -1777,12 +1768,12 @@ ncr53c9x_msgin(struct ncr53c9x_softc *sc
 	struct ncr53c9x_ecb *ecb;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	u_char *pb;
+	uint8_t *pb;
 	int lun, plen;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_msgin(curmsglen:%ld)] ", (long)sc->sc_imlen));
+	NCR_TRACE(("[%s(curmsglen:%ld)] ", __func__, (long)sc->sc_imlen));
 
 	if (sc->sc_imlen == 0) {
 		device_printf(sc->sc_dev, "msgin: no msg byte available\n");
@@ -2068,19 +2059,19 @@ gotit:
 			    sc->sc_imess[0]);
 			goto reset;
 		}
-		(void) ncr53c9x_reselect(sc, sc->sc_msgify,
+		(void)ncr53c9x_reselect(sc, sc->sc_msgify,
 		    sc->sc_imess[0], sc->sc_imess[1]);
 		break;
 
 	case NCR_RESELECTED:
-		if (MSG_ISIDENTIFY(sc->sc_imess[1])) {
+		if (MSG_ISIDENTIFY(sc->sc_imess[1]))
 			sc->sc_msgify = sc->sc_imess[1];
-		} else {
+		else {
 			device_printf(sc->sc_dev, "reselect without IDENTIFY;"
 			    " MSG %x; sending DEVICE RESET\n", sc->sc_imess[1]);
 			goto reset;
 		}
-		(void) ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0);
+		(void)ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0);
 		break;
 
 	default:
@@ -2124,8 +2115,8 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_msgout(priq:%x, prevphase:%x)]",
-	    sc->sc_msgpriq, sc->sc_prevphase));
+	NCR_TRACE(("[%s(priq:%x, prevphase:%x)]", __func__, sc->sc_msgpriq,
+	    sc->sc_prevphase));
 
 	/*
 	 * XXX - the NCR_ATN flag is not in sync with the actual ATN
@@ -2138,7 +2129,9 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 		if (sc->sc_prevphase != MESSAGE_OUT_PHASE) {
 		new:
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1); */
+#if 0
+			DELAY(1);
+#endif
 			sc->sc_msgoutq = 0;
 			sc->sc_omlen = 0;
 		}
@@ -2146,10 +2139,9 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 		if (sc->sc_prevphase == MESSAGE_OUT_PHASE) {
 			ncr53c9x_sched_msgout(sc->sc_msgoutq);
 			goto new;
-		} else {
+		} else
 			device_printf(sc->sc_dev, "at line %d: unexpected "
 			    "MESSAGE OUT phase\n", __LINE__);
-		}
 	}
 
 	if (sc->sc_omlen == 0) {
@@ -2181,20 +2173,18 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 			break;
 
 		case SEND_IDENTIFY:
-			if (sc->sc_state != NCR_CONNECTED) {
+			if (sc->sc_state != NCR_CONNECTED)
 				device_printf(sc->sc_dev, "at line %d: no "
 				    "nexus\n", __LINE__);
-			}
 			ecb = sc->sc_nexus;
 			sc->sc_omess[0] =
 			    MSG_IDENTIFY(ecb->ccb->ccb_h.target_lun, 0);
 			break;
 
 		case SEND_TAG:
-			if (sc->sc_state != NCR_CONNECTED) {
+			if (sc->sc_state != NCR_CONNECTED)
 				device_printf(sc->sc_dev, "at line %d: no "
 				    "nexus\n", __LINE__);
-			}
 			ecb = sc->sc_nexus;
 			sc->sc_omess[0] = ecb->tag[0];
 			sc->sc_omess[1] = ecb->tag[1];
@@ -2249,7 +2239,7 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 	}
 
 #ifdef NCR53C9X_DEBUG
-	if (ncr53c9x_debug & NCR_SHOWMSGS) {
+	if ((ncr53c9x_debug & NCR_SHOWMSGS) != 0) {
 		NCR_MSGS(("<msgout:"));
 		for (i = 0; i < sc->sc_omlen; i++)
 			NCR_MSGS((" %02x", sc->sc_omess[i]));
@@ -2310,7 +2300,7 @@ ncr53c9x_intr1(struct ncr53c9x_softc *sc
 	struct timeval cur, wait;
 	size_t size;
 	int i, nfifo;
-	u_char msg;
+	uint8_t msg;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -2385,7 +2375,7 @@ again:
 				 * while we were trying to select
 				 * another target.
 				 */
-#ifdef DEBUG
+#ifdef NCR53C9X_DEBUG
 				device_printf(sc->sc_dev, "ESP100 work-around "
 				    "activated\n");
 #endif
@@ -2492,7 +2482,9 @@ again:
 		    sc->sc_espintr,sc->sc_espstat,sc->sc_espstep));
 		if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) {
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1); */
+#if 0
+			DELAY(1);
+#endif
 		}
 		/*
 		 * This command must (apparently) be issued within
@@ -2734,7 +2726,7 @@ again:
 				if (sc->sc_state == NCR_IDLE &&
 				    sc->sc_espstep == 0)
 					return;
-				panic("ncr53c9x: no nexus");
+				panic("%s: no nexus", __func__);
 			}
 
 			ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id];
@@ -2812,8 +2804,8 @@ again:
 					if (sc->sc_cmdlen == 0)
 						/* Hope for the best... */
 						break;
-				} else if ((NCR_READ_REG(sc, NCR_FFLAG)
-				    & NCRFIFO_FF) == 0) {
+				} else if ((NCR_READ_REG(sc, NCR_FFLAG) &
+				    NCRFIFO_FF) == 0) {
 					/* Hope for the best... */
 					break;
 				}
@@ -2872,7 +2864,7 @@ again:
 			/* "Initiate Command Complete Steps" in progress */
 			sc->sc_flags &= ~NCR_ICCS;
 
-			if (!(sc->sc_espintr & NCRINTR_DONE)) {
+			if ((sc->sc_espintr & NCRINTR_DONE) == 0) {
 				device_printf(sc->sc_dev, "ICCS: "
 				    ": [intr %x, stat %x, step %x]\n",
 				    sc->sc_espintr, sc->sc_espstat,
@@ -2912,9 +2904,8 @@ again:
 	 * Driver is now in state NCR_CONNECTED, i.e. we
 	 * have a current command working the SCSI bus.
 	 */
-	if (sc->sc_state != NCR_CONNECTED || ecb == NULL) {
-		panic("ncr53c9x: no nexus");
-	}
+	if (sc->sc_state != NCR_CONNECTED || ecb == NULL)
+		panic("%s: no nexus", __func__);
 
 	switch (sc->sc_phase) {
 	case MESSAGE_OUT_PHASE:
@@ -2928,7 +2919,7 @@ msgin:
 		NCR_PHASE(("MESSAGE_IN_PHASE "));
 		if ((sc->sc_espintr & NCRINTR_BS) != 0) {
 			if ((sc->sc_rev != NCR_VARIANT_FAS366) ||
-			    !(sc->sc_espstat2 & NCRFAS_STAT2_EMPTY)) {
+			    (sc->sc_espstat2 & NCRFAS_STAT2_EMPTY) == 0) {
 				NCRCMD(sc, NCRCMD_FLUSH);
 			}
 			sc->sc_flags |= NCR_WAITI;
@@ -2945,11 +2936,10 @@ msgin:
 			    (sc->sc_prevphase == sc->sc_phase) ?
 			    NCR_RDFIFO_CONTINUE : NCR_RDFIFO_START);
 			ncr53c9x_msgin(sc);
-		} else {
+		} else
 			device_printf(sc->sc_dev, "MSGIN: weird bits: "
 			    "[intr %x, stat %x, step %x]\n",
 			    sc->sc_espintr, sc->sc_espstat, sc->sc_espstep);
-		}
 		sc->sc_prevphase = MESSAGE_IN_PHASE;
 		goto shortcut;	/* i.e. expect data to be ready */
 
@@ -2966,7 +2956,9 @@ msgin:
 		    ecb->cmd.cmd.opcode, ecb->clen));
 		if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) {
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1);*/
+#if 0
+			DELAY(1);
+#endif
 		}
 		/*
 		 * If we have more messages to send, e.g. WDTR or SDTR
@@ -2981,7 +2973,7 @@ msgin:
 			/* Setup DMA transfer for command. */
 			size = ecb->clen;
 			sc->sc_cmdlen = size;
-			sc->sc_cmdp = (caddr_t)&ecb->cmd.cmd;
+			sc->sc_cmdp = (void *)&ecb->cmd.cmd;
 			NCRDMA_SETUP(sc, &sc->sc_cmdp, &sc->sc_cmdlen,
 			    0, &size);
 			/* Program the SCSI counter. */
@@ -2994,7 +2986,8 @@ msgin:
 			NCRCMD(sc, NCRCMD_TRANS | NCRCMD_DMA);
 			NCRDMA_GO(sc);
 		} else {
-			ncr53c9x_wrfifo(sc, (u_char *)&ecb->cmd.cmd, ecb->clen);
+			ncr53c9x_wrfifo(sc, (uint8_t *)&ecb->cmd.cmd,
+			    ecb->clen);
 			NCRCMD(sc, NCRCMD_TRANS);
 		}
 		sc->sc_prevphase = COMMAND_PHASE;
@@ -3175,7 +3168,7 @@ ncr53c9x_callout(void *arg)
 static void
 ncr53c9x_watch(void *arg)
 {
-	struct ncr53c9x_softc *sc = (struct ncr53c9x_softc *)arg;
+	struct ncr53c9x_softc *sc = arg;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
 	time_t old;

Modified: stable/7/sys/dev/esp/ncr53c9xreg.h
==============================================================================
--- stable/7/sys/dev/esp/ncr53c9xreg.h	Sat Oct 29 23:53:53 2011	(r226917)
+++ stable/7/sys/dev/esp/ncr53c9xreg.h	Sat Oct 29 23:53:58 2011	(r226918)
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr53c9xreg.h,v 1.14 2005/02/27 00:27:02 perry Exp $	*/
+/*	$NetBSD: ncr53c9xreg.h,v 1.16 2009/09/07 13:31:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1994 Peter Galbavy.  All rights reserved.
@@ -43,84 +43,84 @@
 #define	NCR_FIFO	0x02		/* RW - FIFO data		*/
 
 #define	NCR_CMD		0x03		/* RW - Command (2 deep)	*/
-#define  NCRCMD_DMA	0x80		/*	DMA Bit			*/
-#define  NCRCMD_NOP	0x00		/*	No Operation		*/
-#define  NCRCMD_FLUSH	0x01		/*	Flush FIFO		*/
-#define  NCRCMD_RSTCHIP	0x02		/*	Reset Chip		*/
-#define  NCRCMD_RSTSCSI	0x03		/*	Reset SCSI Bus		*/
-#define  NCRCMD_RESEL	0x40		/*	Reselect Sequence	*/
-#define  NCRCMD_SELNATN	0x41		/*	Select without ATN	*/
-#define  NCRCMD_SELATN	0x42		/*	Select with ATN		*/
-#define  NCRCMD_SELATNS	0x43		/*	Select with ATN & Stop	*/
-#define  NCRCMD_ENSEL	0x44		/*	Enable (Re)Selection	*/
-#define  NCRCMD_DISSEL	0x45		/*	Disable (Re)Selection	*/
-#define  NCRCMD_SELATN3	0x46		/*	Select with ATN3	*/
-#define  NCRCMD_RESEL3	0x47		/*	Reselect3 Sequence	*/
-#define  NCRCMD_SNDMSG	0x20		/*	Send Message		*/
-#define  NCRCMD_SNDSTAT	0x21		/*	Send Status		*/
-#define  NCRCMD_SNDDATA	0x22		/*	Send Data		*/
-#define  NCRCMD_DISCSEQ	0x23		/*	Disconnect Sequence	*/
-#define  NCRCMD_TERMSEQ	0x24		/*	Terminate Sequence	*/
-#define  NCRCMD_TCCS	0x25		/*	Target Command Comp Seq	*/
-#define  NCRCMD_DISC	0x27		/*	Disconnect		*/
-#define  NCRCMD_RECMSG	0x28		/*	Receive Message		*/
-#define  NCRCMD_RECCMD	0x29		/*	Receive Command 	*/
-#define  NCRCMD_RECDATA	0x2a		/*	Receive Data		*/
-#define  NCRCMD_RECCSEQ	0x2b		/*	Receive Command Sequence*/
-#define  NCRCMD_ABORT	0x04		/*	Target Abort DMA	*/
-#define  NCRCMD_TRANS	0x10		/*	Transfer Information	*/
-#define  NCRCMD_ICCS	0x11		/*	Initiator Cmd Comp Seq 	*/
-#define  NCRCMD_MSGOK	0x12		/*	Message Accepted	*/
-#define  NCRCMD_TRPAD	0x18		/*	Transfer Pad		*/
-#define  NCRCMD_SETATN	0x1a		/*	Set ATN			*/
-#define  NCRCMD_RSTATN	0x1b		/*	Reset ATN		*/
+#define	 NCRCMD_DMA	0x80		/*	DMA Bit			*/
+#define	 NCRCMD_NOP	0x00		/*	No Operation		*/
+#define	 NCRCMD_FLUSH	0x01		/*	Flush FIFO		*/
+#define	 NCRCMD_RSTCHIP	0x02		/*	Reset Chip		*/
+#define	 NCRCMD_RSTSCSI	0x03		/*	Reset SCSI Bus		*/
+#define	 NCRCMD_RESEL	0x40		/*	Reselect Sequence	*/
+#define	 NCRCMD_SELNATN	0x41		/*	Select without ATN	*/
+#define	 NCRCMD_SELATN	0x42		/*	Select with ATN		*/
+#define	 NCRCMD_SELATNS	0x43		/*	Select with ATN & Stop	*/
+#define	 NCRCMD_ENSEL	0x44		/*	Enable (Re)Selection	*/
+#define	 NCRCMD_DISSEL	0x45		/*	Disable (Re)Selection	*/
+#define	 NCRCMD_SELATN3	0x46		/*	Select with ATN3	*/
+#define	 NCRCMD_RESEL3	0x47		/*	Reselect3 Sequence	*/
+#define	 NCRCMD_SNDMSG	0x20		/*	Send Message		*/
+#define	 NCRCMD_SNDSTAT	0x21		/*	Send Status		*/
+#define	 NCRCMD_SNDDATA	0x22		/*	Send Data		*/
+#define	 NCRCMD_DISCSEQ	0x23		/*	Disconnect Sequence	*/
+#define	 NCRCMD_TERMSEQ	0x24		/*	Terminate Sequence	*/
+#define	 NCRCMD_TCCS	0x25		/*	Target Command Comp Seq	*/
+#define	 NCRCMD_DISC	0x27		/*	Disconnect		*/
+#define	 NCRCMD_RECMSG	0x28		/*	Receive Message		*/
+#define	 NCRCMD_RECCMD	0x29		/*	Receive Command		*/
+#define	 NCRCMD_RECDATA	0x2a		/*	Receive Data		*/
+#define	 NCRCMD_RECCSEQ	0x2b		/*	Receive Command Sequence*/
+#define	 NCRCMD_ABORT	0x04		/*	Target Abort DMA	*/
+#define	 NCRCMD_TRANS	0x10		/*	Transfer Information	*/
+#define	 NCRCMD_ICCS	0x11		/*	Initiator Cmd Comp Seq	*/
+#define	 NCRCMD_MSGOK	0x12		/*	Message Accepted	*/
+#define	 NCRCMD_TRPAD	0x18		/*	Transfer Pad		*/
+#define	 NCRCMD_SETATN	0x1a		/*	Set ATN			*/
+#define	 NCRCMD_RSTATN	0x1b		/*	Reset ATN		*/
 
 #define	NCR_STAT	0x04		/* RO - Status			*/
-#define  NCRSTAT_INT	0x80		/*	Interrupt		*/
-#define  NCRSTAT_GE	0x40		/*	Gross Error		*/
-#define  NCRSTAT_PE	0x20		/*	Parity Error		*/
-#define  NCRSTAT_TC	0x10		/*	Terminal Count		*/
-#define  NCRSTAT_VGC	0x08		/*	Valid Group Code	*/
-#define  NCRSTAT_PHASE	0x07		/*	Phase bits		*/
+#define	 NCRSTAT_INT	0x80		/*	Interrupt		*/
+#define	 NCRSTAT_GE	0x40		/*	Gross Error		*/
+#define	 NCRSTAT_PE	0x20		/*	Parity Error		*/
+#define	 NCRSTAT_TC	0x10		/*	Terminal Count		*/
+#define	 NCRSTAT_VGC	0x08		/*	Valid Group Code	*/
+#define	 NCRSTAT_PHASE	0x07		/*	Phase bits		*/
 
 #define	NCR_SELID	0x04		/* WO - Select/Reselect Bus ID	*/
-#define  NCR_BUSID_HMEXC32	0x40	/*	HME xfer counter is 32bit */
-#define  NCR_BUSID_HMEENCID	0x10 	/*	HME encode reselection ID */
+#define	 NCR_BUSID_HMEXC32	0x40	/*	HME xfer counter is 32bit */
+#define	 NCR_BUSID_HMEENCID	0x10	/*	HME encode reselection ID */
 
 #define	NCR_INTR	0x05		/* RO - Interrupt		*/
-#define  NCRINTR_SBR	0x80		/*	SCSI Bus Reset		*/
-#define  NCRINTR_ILL	0x40		/*	Illegal Command		*/
-#define  NCRINTR_DIS	0x20		/*	Disconnect		*/
-#define  NCRINTR_BS	0x10		/*	Bus Service		*/
-#define  NCRINTR_FC	0x08		/*	Function Complete	*/
-#define  NCRINTR_RESEL	0x04		/*	Reselected		*/
-#define  NCRINTR_SELATN	0x02		/*	Select with ATN		*/
-#define  NCRINTR_SEL	0x01		/*	Selected		*/
+#define	 NCRINTR_SBR	0x80		/*	SCSI Bus Reset		*/
+#define	 NCRINTR_ILL	0x40		/*	Illegal Command		*/
+#define	 NCRINTR_DIS	0x20		/*	Disconnect		*/
+#define	 NCRINTR_BS	0x10		/*	Bus Service		*/
+#define	 NCRINTR_FC	0x08		/*	Function Complete	*/
+#define	 NCRINTR_RESEL	0x04		/*	Reselected		*/
+#define	 NCRINTR_SELATN	0x02		/*	Select with ATN		*/
+#define	 NCRINTR_SEL	0x01		/*	Selected		*/
 
 #define	NCR_TIMEOUT	0x05		/* WO - Select/Reselect Timeout */
 
 #define	NCR_STEP	0x06		/* RO - Sequence Step		*/
-#define  NCRSTEP_MASK	0x07		/*	the last 3 bits		*/
-#define  NCRSTEP_DONE	0x04		/*	command went out	*/
+#define	 NCRSTEP_MASK	0x07		/*	the last 3 bits		*/
+#define	 NCRSTEP_DONE	0x04		/*	command went out	*/
 
 #define	NCR_SYNCTP	0x06		/* WO - Synch Transfer Period	*/
 					/*	Default 5 (53C9X)	*/
 
 #define	NCR_FFLAG	0x07		/* RO - FIFO Flags		*/
-#define  NCRFIFO_SS	0xe0		/*	Sequence Step (Dup)	*/
-#define  NCRFIFO_FF	0x1f		/*	Bytes in FIFO		*/
+#define	 NCRFIFO_SS	0xe0		/*	Sequence Step (Dup)	*/
+#define	 NCRFIFO_FF	0x1f		/*	Bytes in FIFO		*/
 
 #define	NCR_SYNCOFF	0x07		/* WO - Synch Offset		*/
 					/*	0 = ASYNC		*/
 					/*	1 - 15 = SYNC bytes	*/
 
 #define	NCR_CFG1	0x08		/* RW - Configuration #1	*/
-#define  NCRCFG1_SLOW	0x80		/*	Slow Cable Mode		*/
-#define  NCRCFG1_SRR	0x40		/*	SCSI Reset Rep Int Dis	*/
-#define  NCRCFG1_PTEST	0x20		/*	Parity Test Mod		*/
-#define  NCRCFG1_PARENB	0x10		/*	Enable Parity Check	*/
-#define  NCRCFG1_CTEST	0x08		/*	Enable Chip Test	*/
-#define  NCRCFG1_BUSID	0x07		/*	Bus ID			*/
+#define	 NCRCFG1_SLOW	0x80		/*	Slow Cable Mode		*/
+#define	 NCRCFG1_SRR	0x40		/*	SCSI Reset Rep Int Dis	*/
+#define	 NCRCFG1_PTEST	0x20		/*	Parity Test Mod		*/
+#define	 NCRCFG1_PARENB	0x10		/*	Enable Parity Check	*/
+#define	 NCRCFG1_CTEST	0x08		/*	Enable Chip Test	*/
+#define	 NCRCFG1_BUSID	0x07		/*	Bus ID			*/
 
 #define	NCR_CCF		0x09		/* WO -	Clock Conversion Factor	*/
 					/*	0 = 35.01 - 40MHz	*/
@@ -136,24 +136,24 @@
 
 #define	NCR_CFG2	0x0b		/* RW - Configuration #2	*/
 #define	 NCRCFG2_RSVD	0xa0		/*	reserved		*/
-#define  NCRCFG2_FE	0x40		/* 	Features Enable		*/
-#define  NCRCFG2_DREQ	0x10		/* 	DREQ High Impedance	*/
-#define  NCRCFG2_SCSI2	0x08		/* 	SCSI-2 Enable		*/
-#define  NCRCFG2_BPA	0x04		/* 	Target Bad Parity Abort	*/
-#define  NCRCFG2_RPE	0x02		/* 	Register Parity Error	*/
-#define  NCRCFG2_DPE	0x01		/* 	DMA Parity Error	*/
+#define	 NCRCFG2_FE	0x40		/*	Features Enable		*/
+#define	 NCRCFG2_DREQ	0x10		/*	DREQ High Impedance	*/
+#define	 NCRCFG2_SCSI2	0x08		/*	SCSI-2 Enable		*/
+#define	 NCRCFG2_BPA	0x04		/*	Target Bad Parity Abort	*/
+#define	 NCRCFG2_RPE	0x02		/*	Register Parity Error	*/
+#define	 NCRCFG2_DPE	0x01		/*	DMA Parity Error	*/
 
-#define  NCRCFG2_HMEFE	0x10		/*	HME feature enable	*/
+#define	 NCRCFG2_HMEFE	0x10		/*	HME feature enable	*/
 #define	 NCRCFG2_HME32  0x80		/*	HME 32 extended		*/
 
 /* Config #3 only on 53C9X */
 #define	NCR_CFG3	0x0c		/* RW - Configuration #3	*/
 #define	 NCRCFG3_RSVD	0xe0		/*	reserved		*/
-#define  NCRCFG3_IDM	0x10		/*	ID Message Res Check	*/
-#define  NCRCFG3_QTE	0x08		/*	Queue Tag Enable	*/
-#define  NCRCFG3_CDB	0x04		/*	CDB 10-bytes OK		*/
-#define  NCRCFG3_FSCSI	0x02		/*	Fast SCSI		*/
-#define  NCRCFG3_FCLK	0x01		/*	Fast Clock (>25MHz)	*/
+#define	 NCRCFG3_IDM	0x10		/*	ID Message Res Check	*/
+#define	 NCRCFG3_QTE	0x08		/*	Queue Tag Enable	*/
+#define	 NCRCFG3_CDB	0x04		/*	CDB 10-bytes OK		*/
+#define	 NCRCFG3_FSCSI	0x02		/*	Fast SCSI		*/
+#define	 NCRCFG3_FCLK	0x01		/*	Fast Clock (>25MHz)	*/
 
 /*
  * For some unknown reason, the ESP406/FAS408 looks like every
@@ -164,35 +164,35 @@
 
 /* Config #3 different on ESP406/FAS408 */
 #define	NCR_ESPCFG3		0x0c	/* RW - Configuration #3	*/
-#define  NCRESPCFG3_IDM		0x80	/*	ID Message Res Check	*/
-#define  NCRESPCFG3_QTE		0x40	/*	Queue Tag Enable	*/
-#define  NCRESPCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
-#define  NCRESPCFG3_FSCSI	0x10	/*	Fast SCSI		*/
+#define	 NCRESPCFG3_IDM		0x80	/*	ID Message Res Check	*/
+#define	 NCRESPCFG3_QTE		0x40	/*	Queue Tag Enable	*/
+#define	 NCRESPCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
+#define	 NCRESPCFG3_FSCSI	0x10	/*	Fast SCSI		*/
 #define	 NCRESPCFG3_SRESB	0x08	/*	Save Residual Byte	*/
-#define  NCRESPCFG3_FCLK	0x04	/*	Fast Clock (>25MHz)	*/
+#define	 NCRESPCFG3_FCLK	0x04	/*	Fast Clock (>25MHz)	*/
 #define	 NCRESPCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
 #define	 NCRESPCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
 
 /* Config #3 also different on NCR53CF9x/FAS100A/FAS216/FAS236 */
 #define	NCR_F9XCFG3		0x0c	/* RW - Configuration #3	*/
-#define  NCRF9XCFG3_IDM		0x80	/*	ID Message Res Check	*/
-#define  NCRF9XCFG3_QTE		0x40	/*	Queue Tag Enable	*/
-#define  NCRF9XCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
-#define  NCRF9XCFG3_FSCSI	0x10	/*	Fast SCSI		*/
-#define  NCRF9XCFG3_FCLK	0x08	/*	Fast Clock (>25MHz)	*/
-#define  NCRF9XCFG3_SRESB	0x04	/*	Save Residual Byte	*/
-#define  NCRF9XCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
-#define  NCRF9XCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
+#define	 NCRF9XCFG3_IDM		0x80	/*	ID Message Res Check	*/
+#define	 NCRF9XCFG3_QTE		0x40	/*	Queue Tag Enable	*/
+#define	 NCRF9XCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
+#define	 NCRF9XCFG3_FSCSI	0x10	/*	Fast SCSI		*/
+#define	 NCRF9XCFG3_FCLK	0x08	/*	Fast Clock (>25MHz)	*/
+#define	 NCRF9XCFG3_SRESB	0x04	/*	Save Residual Byte	*/
+#define	 NCRF9XCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
+#define	 NCRF9XCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
 
 /* Config #3 on FAS366 */
-#define  NCRFASCFG3_OBAUTO    	0x80    /*	auto push odd-byte to DMA */
-#define  NCRFASCFG3_EWIDE     	0x40    /* 	Enable Wide-SCSI     */
-#define  NCRFASCFG3_IDBIT3	0x20	/* 	Bit 3 of HME SCSI-ID */
-#define	 NCRFASCFG3_IDRESCHK	0x10	/* 	ID message checking */
-#define	 NCRFASCFG3_QUENB	0x08	/* 	3-byte msg support */
-#define	 NCRFASCFG3_CDB10	0x04	/* 	group 2 scsi-2 support */
-#define	 NCRFASCFG3_FASTSCSI	0x02	/* 	10 MB/S fast scsi mode */
-#define	 NCRFASCFG3_FASTCLK	0x01	/* 	fast clock mode */
+#define	 NCRFASCFG3_OBAUTO	0x80    /*	auto push odd-byte to DMA */
+#define	 NCRFASCFG3_EWIDE	0x40    /*	Enable Wide-SCSI     */
+#define	 NCRFASCFG3_IDBIT3	0x20	/*	Bit 3 of HME SCSI-ID */
+#define	 NCRFASCFG3_IDRESCHK	0x10	/*	ID message checking */
+#define	 NCRFASCFG3_QUENB	0x08	/*	3-byte msg support */
+#define	 NCRFASCFG3_CDB10	0x04	/*	group 2 scsi-2 support */
+#define	 NCRFASCFG3_FASTSCSI	0x02	/*	10 MB/S fast scsi mode */
+#define	 NCRFASCFG3_FASTCLK	0x01	/*	fast clock mode */
 
 /* Config #4 only on ESP406/FAS408 */
 #define	NCR_CFG4	0x0d		/* RW - Configuration #4	*/
@@ -208,8 +208,8 @@
 */
 

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

From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 29 23:53:58 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B573D1065673;
	Sat, 29 Oct 2011 23:53:58 +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 A26E88FC14;
	Sat, 29 Oct 2011 23:53:58 +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 p9TNrwnY038653;
	Sat, 29 Oct 2011 23:53:58 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNrwJC038648;
	Sat, 29 Oct 2011 23:53:58 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110292353.p9TNrwJC038648@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 29 Oct 2011 23:53:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226919 - in stable/8/sys: dev/esp sparc64/sbus
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Oct 2011 23:53:58 -0000

Author: marius
Date: Sat Oct 29 23:53:58 2011
New Revision: 226919
URL: http://svn.freebsd.org/changeset/base/226919

Log:
  MFC: r226381
  
  Merge from NetBSD:
  - Remove clause 3 and 4 from TNF licenses.
  - Fix memset usage.
  - Various cleanup.
  - Kill caddr_t.

Modified:
  stable/8/sys/dev/esp/esp_sbus.c
  stable/8/sys/dev/esp/ncr53c9x.c
  stable/8/sys/dev/esp/ncr53c9xreg.h
  stable/8/sys/dev/esp/ncr53c9xvar.h
  stable/8/sys/sparc64/sbus/lsi64854.c
  stable/8/sys/sparc64/sbus/lsi64854var.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/esp/esp_sbus.c
==============================================================================
--- stable/8/sys/dev/esp/esp_sbus.c	Sat Oct 29 23:53:58 2011	(r226918)
+++ stable/8/sys/dev/esp/esp_sbus.c	Sat Oct 29 23:53:58 2011	(r226919)
@@ -26,7 +26,7 @@
  *
  */
 
-/*	$NetBSD: esp_sbus.c,v 1.31 2005/02/27 00:27:48 perry Exp $	*/
+/*	$NetBSD: esp_sbus.c,v 1.51 2009/09/17 16:28:12 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -44,13 +44,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -158,12 +151,12 @@ MODULE_DEPEND(esp, sbus, 1, 1, 1);
 /*
  * Functions and the switch for the MI code
  */
-static u_char	esp_read_reg(struct ncr53c9x_softc *sc, int reg);
-static void	esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v);
+static uint8_t	esp_read_reg(struct ncr53c9x_softc *sc, int reg);
+static void	esp_write_reg(struct ncr53c9x_softc *sc, int reg, uint8_t v);
 static int	esp_dma_isintr(struct ncr53c9x_softc *sc);
 static void	esp_dma_reset(struct ncr53c9x_softc *sc);
 static int	esp_dma_intr(struct ncr53c9x_softc *sc);
-static int	esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr,
+static int	esp_dma_setup(struct ncr53c9x_softc *sc, void **addr,
 		    size_t *len, int datain, size_t *dmasize);
 static void	esp_dma_go(struct ncr53c9x_softc *sc);
 static void	esp_dma_stop(struct ncr53c9x_softc *sc);
@@ -172,7 +165,7 @@ static int	espattach(struct esp_softc *e
 		    const struct ncr53c9x_glue *gluep);
 static int	espdetach(struct esp_softc *esc);
 
-static const struct ncr53c9x_glue esp_sbus_glue = {
+static const struct ncr53c9x_glue const esp_sbus_glue = {
 	esp_read_reg,
 	esp_write_reg,
 	esp_dma_isintr,
@@ -718,9 +711,9 @@ espdetach(struct esp_softc *esc)
 static int esp_sbus_debug = 0;
 
 static const struct {
-	char *r_name;
-	int   r_flag;
-} esp__read_regnames [] = {
+	const char *r_name;
+	int r_flag;
+} const esp__read_regnames [] = {
 	{ "TCL", 0},			/* 0/00 */
 	{ "TCM", 0},			/* 1/04 */
 	{ "FIFO", 0},			/* 2/08 */
@@ -739,10 +732,10 @@ static const struct {
 	{ "TCX", 1},			/* f/3c */
 };
 
-static const struct {
-	char *r_name;
-	int   r_flag;
-} esp__write_regnames[] = {
+static const const struct {
+	const char *r_name;
+	int r_flag;
+} const esp__write_regnames[] = {
 	{ "TCL", 1},			/* 0/00 */
 	{ "TCM", 1},			/* 1/04 */
 	{ "FIFO", 0},			/* 2/08 */
@@ -762,11 +755,11 @@ static const struct {
 };
 #endif
 
-static u_char
+static uint8_t
 esp_read_reg(struct ncr53c9x_softc *sc, int reg)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
-	u_char v;
+	uint8_t v;
 
 	v = bus_read_1(esc->sc_res, reg * 4);
 
@@ -780,7 +773,7 @@ esp_read_reg(struct ncr53c9x_softc *sc, 
 }
 
 static void
-esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v)
+esp_write_reg(struct ncr53c9x_softc *sc, int reg, uint8_t v)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -818,8 +811,8 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
 }
 
 static int
-esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr, size_t *len,
-	      int datain, size_t *dmasize)
+esp_dma_setup(struct ncr53c9x_softc *sc, void **addr, size_t *len,
+    int datain, size_t *dmasize)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 

Modified: stable/8/sys/dev/esp/ncr53c9x.c
==============================================================================
--- stable/8/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:53:58 2011	(r226918)
+++ stable/8/sys/dev/esp/ncr53c9x.c	Sat Oct 29 23:53:58 2011	(r226919)
@@ -26,7 +26,7 @@
  *
  */
 
-/*	$NetBSD: ncr53c9x.c,v 1.125 2007/01/09 12:53:12 itohy Exp $	*/
+/*	$NetBSD: ncr53c9x.c,v 1.143 2011/07/31 18:39:00 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -43,13 +43,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -133,7 +126,7 @@ __FBSDID("$FreeBSD$");
 MODULE_DEPEND(esp, cam, 1, 1, 1);
 
 #ifdef NCR53C9X_DEBUG
-static int ncr53c9x_debug =
+int ncr53c9x_debug =
     NCR_SHOWMISC /* | NCR_SHOWPHASE | NCR_SHOWTRAC | NCR_SHOWCMDS */;
 #endif
 
@@ -167,7 +160,7 @@ static void	ncr53c9x_sched(struct ncr53c
 static void	ncr53c9x_select(struct ncr53c9x_softc *sc,
 		    struct ncr53c9x_ecb *ecb);
 static void	ncr53c9x_watch(void *arg);
-static void	ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, u_char *p,
+static void	ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, uint8_t *p,
 		    int len);
 
 static struct ncr53c9x_ecb	*ncr53c9x_get_ecb(struct ncr53c9x_softc *sc);
@@ -187,13 +180,11 @@ static inline int	ncr53c9x_stp2cpb(struc
 		NCR_WRITE_REG((sc), NCR_TCL, (size));			\
 		NCR_WRITE_REG((sc), NCR_TCM, (size) >> 8);		\
 		if ((sc->sc_cfg2 & NCRCFG2_FE) ||			\
-		    (sc->sc_rev == NCR_VARIANT_FAS366)) {		\
+		    (sc->sc_rev == NCR_VARIANT_FAS366))			\
 			NCR_WRITE_REG((sc), NCR_TCH, (size) >> 16);	\
-		}							\
-		if (sc->sc_rev == NCR_VARIANT_FAS366) {			\
+		if (sc->sc_rev == NCR_VARIANT_FAS366)			\
 			NCR_WRITE_REG(sc, NCR_RCH, 0);			\
-		}							\
-} while (0)
+} while (/* CONSTCOND */0)
 
 #ifndef mstohz
 #define	mstohz(ms) \
@@ -551,11 +542,10 @@ ncr53c9x_reset(struct ncr53c9x_softc *sc
 		NCR_WRITE_REG(sc, NCR_AMDCFG4, sc->sc_cfg4);
 
 #if 0
-	device_printf(sc->sc_dev, "ncr53c9x_reset: revision %d\n",
-	    sc->sc_rev);
-	device_printf(sc->sc_dev, "ncr53c9x_reset: cfg1 0x%x, cfg2 0x%x, "
-	    "cfg3 0x%x, ccf 0x%x, timeout 0x%x\n",
-	    sc->sc_cfg1, sc->sc_cfg2, sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout);
+	device_printf(sc->sc_dev, "%s: revision %d\n", __func__, sc->sc_rev);
+	device_printf(sc->sc_dev, "%s: cfg1 0x%x, cfg2 0x%x, cfg3 0x%x, ccf "
+	    "0x%x, timeout 0x%x\n", __func__, sc->sc_cfg1, sc->sc_cfg2,
+	    sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout);
 #endif
 }
 
@@ -573,7 +563,8 @@ ncr53c9x_clear(struct ncr53c9x_softc *sc
 	/* Cancel any active commands. */
 	sc->sc_state = NCR_CLEANING;
 	sc->sc_msgify = 0;
-	if ((ecb = sc->sc_nexus) != NULL) {
+	ecb = sc->sc_nexus;
+	if (ecb != NULL) {
 		ecb->ccb->ccb_h.status = result;
 		ncr53c9x_done(sc, ecb);
 	}
@@ -597,7 +588,8 @@ ncr53c9x_clear_target(struct ncr53c9x_so
 
 	/* Cancel outstanding disconnected commands on each LUN. */
 	LIST_FOREACH(li, &sc->sc_tinfo[target].luns, link) {
-		if ((ecb = li->untagged) != NULL) {
+		ecb = li->untagged;
+		if (ecb != NULL) {
 			li->untagged = NULL;
 			/*
 			 * XXX should we terminate a command
@@ -607,12 +599,14 @@ ncr53c9x_clear_target(struct ncr53c9x_so
 			ecb->ccb->ccb_h.status = result;
 			ncr53c9x_done(sc, ecb);
 		}
-		for (i = 0; i < NCR_TAG_DEPTH; i++)
-			if ((ecb = li->queued[i])) {
+		for (i = 0; i < NCR_TAG_DEPTH; i++) {
+			ecb = li->queued[i];
+			if (ecb != NULL) {
 				li->queued[i] = NULL;
 				ecb->ccb->ccb_h.status = result;
 				ncr53c9x_done(sc, ecb);
 			}
+		}
 		li->used = 0;
 	}
 }
@@ -635,7 +629,7 @@ ncr53c9x_init(struct ncr53c9x_softc *sc,
 
 		TAILQ_INIT(&sc->ready_list);
 		sc->sc_nexus = NULL;
-		memset(sc->sc_tinfo, 0, sizeof(sc->sc_tinfo));
+		memset(sc->sc_tinfo, 0, sizeof(*sc->sc_tinfo));
 		for (r = 0; r < sc->sc_ntarg; r++) {
 			LIST_INIT(&sc->sc_tinfo[r].luns);
 		}
@@ -751,7 +745,7 @@ ncr53c9x_stp2cpb(struct ncr53c9x_softc *
 static inline void
 ncr53c9x_setsync(struct ncr53c9x_softc *sc, struct ncr53c9x_tinfo *ti)
 {
-	u_char cfg3, syncoff, synctp;
+	uint8_t cfg3, syncoff, synctp;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -810,7 +804,7 @@ static void
 ncr53c9x_select(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
 {
 	struct ncr53c9x_tinfo *ti;
-	u_char *cmd;
+	uint8_t *cmd;
 	size_t dmasize;
 	int clen, selatn3, selatns;
 	int lun = ecb->ccb->ccb_h.target_lun;
@@ -818,8 +812,8 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_select(t%d,l%d,cmd:%x,tag:%x,%x)] ",
-	    target, lun, ecb->cmd.cmd.opcode, ecb->tag[0], ecb->tag[1]));
+	NCR_TRACE(("[%s(t%d,l%d,cmd:%x,tag:%x,%x)] ", __func__, target, lun,
+	    ecb->cmd.cmd.opcode, ecb->tag[0], ecb->tag[1]));
 
 	ti = &sc->sc_tinfo[target];
 	sc->sc_state = NCR_SELECTING;
@@ -838,9 +832,8 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 		NCRCMD(sc, NCRCMD_FLUSH);
 		NCR_WRITE_REG(sc, NCR_SELID, target | NCR_BUSID_HMEXC32 |
 		    NCR_BUSID_HMEENCID);
-	} else {
+	} else
 		NCR_WRITE_REG(sc, NCR_SELID, target);
-	}
 
 	/*
 	 * If we are requesting sense, force a renegotiation if we are
@@ -873,7 +866,7 @@ ncr53c9x_select(struct ncr53c9x_softc *s
 		selatns = 1;
 	}
 
-	cmd = (u_char *)&ecb->cmd.cmd;
+	cmd = (uint8_t *)&ecb->cmd.cmd;
 
 	if (selatn3) {
 		/* We'll use tags with SELATN3. */
@@ -954,7 +947,7 @@ ncr53c9x_get_ecb(struct ncr53c9x_softc *
 	ecb = TAILQ_FIRST(&sc->free_list);
 	if (ecb) {
 		if (ecb->flags != 0)
-			panic("ecb flags not cleared\n");
+			panic("%s: ecb flags not cleared", __func__);
 		TAILQ_REMOVE(&sc->free_list, ecb, free_links);
 		ecb->flags = ECB_ALLOC;
 		bzero(&ecb->ccb, sizeof(struct ncr53c9x_ecb) -
@@ -990,7 +983,7 @@ ncr53c9x_action(struct cam_sim *sim, uni
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_action %d]", ccb->ccb_h.func_code));
+	NCR_TRACE(("[%s %d]", __func__, ccb->ccb_h.func_code));
 
 	switch (ccb->ccb_h.func_code) {
 	case XPT_RESET_BUS:
@@ -1196,7 +1189,7 @@ ncr53c9x_poll(struct cam_sim *sim)
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_poll] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	if (NCRDMA_ISINTR(sc))
 		ncr53c9x_intr1(sc);
@@ -1260,10 +1253,10 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_sched] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	if (sc->sc_state != NCR_IDLE)
-		panic("ncr53c9x_sched: not IDLE (state=%d)", sc->sc_state);
+		panic("%s: not IDLE (state=%d)", __func__, sc->sc_state);
 
 	/*
 	 * Find first ecb in ready queue that is for a target/lunit
@@ -1288,10 +1281,9 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 		li = TINFO_LUN(ti, lun);
 		if (li == NULL) {
 			/* Initialize LUN info and add to list. */
-			if ((li = malloc(sizeof(*li),
-			    M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
+			li = malloc(sizeof(*li), M_DEVBUF, M_NOWAIT | M_ZERO);
+			if (li == NULL)
 				continue;
-			}
 			li->lun = lun;
 
 			LIST_INSERT_HEAD(&ti->luns, li, link);
@@ -1338,7 +1330,7 @@ ncr53c9x_sched(struct ncr53c9x_softc *sc
 			ncr53c9x_select(sc, ecb);
 			break;
 		} else {
-			NCR_TRACE(("%d:%d busy\n",
+			NCR_TRACE(("[%s %d:%d busy] \n", __func__,
 			    ecb->ccb->ccb_h.target_id,
 			    ecb->ccb->ccb_h.target_lun));
 		}
@@ -1356,7 +1348,7 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("requesting sense "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	lun = ccb->ccb_h.target_lun;
 	ti = &sc->sc_tinfo[ccb->ccb_h.target_id];
@@ -1368,7 +1360,7 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ss->length = sizeof(struct scsi_sense_data);
 	ecb->clen = sizeof(*ss);
 	memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
-	ecb->daddr = (char *)&ccb->csio.sense_data;
+	ecb->daddr = (uint8_t *)&ccb->csio.sense_data;
 	ecb->dleft = sizeof(struct scsi_sense_data);
 	ecb->flags |= ECB_SENSE;
 	ecb->timeout = NCR_SENSE_TIMEOUT;
@@ -1379,9 +1371,9 @@ ncr53c9x_sense(struct ncr53c9x_softc *sc
 	ncr53c9x_dequeue(sc, ecb);
 	li->untagged = ecb;	/* Must be executed first to fix C/A. */
 	li->busy = 2;
-	if (ecb == sc->sc_nexus) {
+	if (ecb == sc->sc_nexus)
 		ncr53c9x_select(sc, ecb);
-	} else {
+	else {
 		TAILQ_INSERT_HEAD(&sc->ready_list, ecb, chain);
 		ecb->flags |= ECB_READY;
 		if (sc->sc_state == NCR_IDLE)
@@ -1402,7 +1394,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_done(status:%x)] ", ccb->ccb_h.status));
+	NCR_TRACE(("[%s(status:%x)] ", __func__, ccb->ccb_h.status));
 
 	ti = &sc->sc_tinfo[ccb->ccb_h.target_id];
 	lun = ccb->ccb_h.target_lun;
@@ -1457,7 +1449,7 @@ ncr53c9x_done(struct ncr53c9x_softc *sc,
 	}
 
 #ifdef NCR53C9X_DEBUG
-	if (ncr53c9x_debug & NCR_SHOWTRAC) {
+	if ((ncr53c9x_debug & NCR_SHOWTRAC) != 0) {
 		if (ccb->csio.resid != 0)
 			printf("resid=%d ", ccb->csio.resid);
 		if ((ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0)
@@ -1510,7 +1502,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 	li = TINFO_LUN(ti, lun);
 #ifdef DIAGNOSTIC
 	if (li == NULL || li->lun != lun)
-		panic("ncr53c9x_dequeue: lun %qx for ecb %p does not exist",
+		panic("%s: lun %qx for ecb %p does not exist", __func__,
 		    (long long)lun, ecb);
 #endif
 	if (li->untagged == ecb) {
@@ -1521,9 +1513,9 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 #ifdef DIAGNOSTIC
 		if (li->queued[ecb->tag[1]] != NULL &&
 		    (li->queued[ecb->tag[1]] != ecb))
-			panic("ncr53c9x_dequeue: slot %d for lun %qx has %p "
-			    "instead of ecb %p\n", ecb->tag[1],
-			    (long long)lun, li->queued[ecb->tag[1]], ecb);
+			panic("%s: slot %d for lun %qx has %p instead of ecb "
+			    "%p", __func__, ecb->tag[1], (long long)lun,
+			    li->queued[ecb->tag[1]], ecb);
 #endif
 		li->queued[ecb->tag[1]] = NULL;
 		li->used--;
@@ -1550,7 +1542,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *
 	NCRCMD(sc, NCRCMD_SETATN);					\
 	sc->sc_flags |= NCR_ATN;					\
 	sc->sc_msgpriq |= (m);						\
-} while (0)
+} while (/* CONSTCOND */0)
 
 static void
 ncr53c9x_flushfifo(struct ncr53c9x_softc *sc)
@@ -1558,7 +1550,7 @@ ncr53c9x_flushfifo(struct ncr53c9x_softc
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[flushfifo] "));
+	NCR_TRACE(("[%s] ", __func__));
 
 	NCRCMD(sc, NCRCMD_FLUSH);
 
@@ -1570,8 +1562,8 @@ ncr53c9x_flushfifo(struct ncr53c9x_softc
 static int
 ncr53c9x_rdfifo(struct ncr53c9x_softc *sc, int how)
 {
-	u_char *ibuf;
 	int i, n;
+	uint8_t *ibuf;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -1586,7 +1578,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 		break;
 
 	default:
-		panic("ncr53c9x_rdfifo: bad flag");
+		panic("%s: bad flag", __func__);
 		/* NOTREACHED */
 	}
 
@@ -1611,10 +1603,9 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 
 			ncr53c9x_flushfifo(sc);
 		}
-	} else {
+	} else
 		for (i = 0; i < n; i++)
 			ibuf[i] = NCR_READ_REG(sc, NCR_FIFO);
-	}
 
 	sc->sc_imlen += i;
 
@@ -1622,7 +1613,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 #ifdef NCR53C9X_DEBUG
 	NCR_TRACE(("\n[rdfifo %s (%d):",
 	    (how == NCR_RDFIFO_START) ? "start" : "cont", (int)sc->sc_imlen));
-	if (ncr53c9x_debug & NCR_SHOWTRAC) {
+	if ((ncr53c9x_debug & NCR_SHOWTRAC) != 0) {
 		for (i = 0; i < sc->sc_imlen; i++)
 			printf(" %02x", sc->sc_imess[i]);
 		printf("]\n");
@@ -1633,7 +1624,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *s
 }
 
 static void
-ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, u_char *p, int len)
+ncr53c9x_wrfifo(struct ncr53c9x_softc *sc, uint8_t *p, int len)
 {
 	int i;
 
@@ -1641,7 +1632,7 @@ ncr53c9x_wrfifo(struct ncr53c9x_softc *s
 
 #ifdef NCR53C9X_DEBUG
 	NCR_MSGS(("[wrfifo(%d):", len));
-	if (ncr53c9x_debug & NCR_SHOWMSGS) {
+	if ((ncr53c9x_debug & NCR_SHOWMSGS) != 0) {
 		for (i = 0; i < len; i++)
 			printf(" %02x", p[i]);
 		printf("]\n");
@@ -1663,13 +1654,13 @@ ncr53c9x_reselect(struct ncr53c9x_softc 
 	struct ncr53c9x_ecb *ecb = NULL;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	u_char lun, selid, target;
+	uint8_t lun, selid, target;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	if (sc->sc_rev == NCR_VARIANT_FAS366) {
+	if (sc->sc_rev == NCR_VARIANT_FAS366)
 		target = sc->sc_selid;
-	} else {
+	else {
 		/*
 		 * The SCSI chip made a snapshot of the data bus
 		 * while the reselection was being negotiated.
@@ -1751,7 +1742,7 @@ abort:
 #define	MSG_IS2BYTE(m)		(((m) & 0xf0) == 0x20)
 
 static inline int
-__verify_msg_format(u_char *p, int len)
+__verify_msg_format(uint8_t *p, int len)
 {
 
 	if (len == 1 && MSG_IS1BYTE(p[0]))
@@ -1777,12 +1768,12 @@ ncr53c9x_msgin(struct ncr53c9x_softc *sc
 	struct ncr53c9x_ecb *ecb;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
-	u_char *pb;
+	uint8_t *pb;
 	int lun, plen;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_msgin(curmsglen:%ld)] ", (long)sc->sc_imlen));
+	NCR_TRACE(("[%s(curmsglen:%ld)] ", __func__, (long)sc->sc_imlen));
 
 	if (sc->sc_imlen == 0) {
 		device_printf(sc->sc_dev, "msgin: no msg byte available\n");
@@ -2068,19 +2059,19 @@ gotit:
 			    sc->sc_imess[0]);
 			goto reset;
 		}
-		(void) ncr53c9x_reselect(sc, sc->sc_msgify,
+		(void)ncr53c9x_reselect(sc, sc->sc_msgify,
 		    sc->sc_imess[0], sc->sc_imess[1]);
 		break;
 
 	case NCR_RESELECTED:
-		if (MSG_ISIDENTIFY(sc->sc_imess[1])) {
+		if (MSG_ISIDENTIFY(sc->sc_imess[1]))
 			sc->sc_msgify = sc->sc_imess[1];
-		} else {
+		else {
 			device_printf(sc->sc_dev, "reselect without IDENTIFY;"
 			    " MSG %x; sending DEVICE RESET\n", sc->sc_imess[1]);
 			goto reset;
 		}
-		(void) ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0);
+		(void)ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0);
 		break;
 
 	default:
@@ -2124,8 +2115,8 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
-	NCR_TRACE(("[ncr53c9x_msgout(priq:%x, prevphase:%x)]",
-	    sc->sc_msgpriq, sc->sc_prevphase));
+	NCR_TRACE(("[%s(priq:%x, prevphase:%x)]", __func__, sc->sc_msgpriq,
+	    sc->sc_prevphase));
 
 	/*
 	 * XXX - the NCR_ATN flag is not in sync with the actual ATN
@@ -2138,7 +2129,9 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 		if (sc->sc_prevphase != MESSAGE_OUT_PHASE) {
 		new:
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1); */
+#if 0
+			DELAY(1);
+#endif
 			sc->sc_msgoutq = 0;
 			sc->sc_omlen = 0;
 		}
@@ -2146,10 +2139,9 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 		if (sc->sc_prevphase == MESSAGE_OUT_PHASE) {
 			ncr53c9x_sched_msgout(sc->sc_msgoutq);
 			goto new;
-		} else {
+		} else
 			device_printf(sc->sc_dev, "at line %d: unexpected "
 			    "MESSAGE OUT phase\n", __LINE__);
-		}
 	}
 
 	if (sc->sc_omlen == 0) {
@@ -2181,20 +2173,18 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 			break;
 
 		case SEND_IDENTIFY:
-			if (sc->sc_state != NCR_CONNECTED) {
+			if (sc->sc_state != NCR_CONNECTED)
 				device_printf(sc->sc_dev, "at line %d: no "
 				    "nexus\n", __LINE__);
-			}
 			ecb = sc->sc_nexus;
 			sc->sc_omess[0] =
 			    MSG_IDENTIFY(ecb->ccb->ccb_h.target_lun, 0);
 			break;
 
 		case SEND_TAG:
-			if (sc->sc_state != NCR_CONNECTED) {
+			if (sc->sc_state != NCR_CONNECTED)
 				device_printf(sc->sc_dev, "at line %d: no "
 				    "nexus\n", __LINE__);
-			}
 			ecb = sc->sc_nexus;
 			sc->sc_omess[0] = ecb->tag[0];
 			sc->sc_omess[1] = ecb->tag[1];
@@ -2249,7 +2239,7 @@ ncr53c9x_msgout(struct ncr53c9x_softc *s
 	}
 
 #ifdef NCR53C9X_DEBUG
-	if (ncr53c9x_debug & NCR_SHOWMSGS) {
+	if ((ncr53c9x_debug & NCR_SHOWMSGS) != 0) {
 		NCR_MSGS(("<msgout:"));
 		for (i = 0; i < sc->sc_omlen; i++)
 			NCR_MSGS((" %02x", sc->sc_omess[i]));
@@ -2310,7 +2300,7 @@ ncr53c9x_intr1(struct ncr53c9x_softc *sc
 	struct timeval cur, wait;
 	size_t size;
 	int i, nfifo;
-	u_char msg;
+	uint8_t msg;
 
 	NCR_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -2385,7 +2375,7 @@ again:
 				 * while we were trying to select
 				 * another target.
 				 */
-#ifdef DEBUG
+#ifdef NCR53C9X_DEBUG
 				device_printf(sc->sc_dev, "ESP100 work-around "
 				    "activated\n");
 #endif
@@ -2492,7 +2482,9 @@ again:
 		    sc->sc_espintr,sc->sc_espstat,sc->sc_espstep));
 		if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) {
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1); */
+#if 0
+			DELAY(1);
+#endif
 		}
 		/*
 		 * This command must (apparently) be issued within
@@ -2734,7 +2726,7 @@ again:
 				if (sc->sc_state == NCR_IDLE &&
 				    sc->sc_espstep == 0)
 					return;
-				panic("ncr53c9x: no nexus");
+				panic("%s: no nexus", __func__);
 			}
 
 			ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id];
@@ -2812,8 +2804,8 @@ again:
 					if (sc->sc_cmdlen == 0)
 						/* Hope for the best... */
 						break;
-				} else if ((NCR_READ_REG(sc, NCR_FFLAG)
-				    & NCRFIFO_FF) == 0) {
+				} else if ((NCR_READ_REG(sc, NCR_FFLAG) &
+				    NCRFIFO_FF) == 0) {
 					/* Hope for the best... */
 					break;
 				}
@@ -2872,7 +2864,7 @@ again:
 			/* "Initiate Command Complete Steps" in progress */
 			sc->sc_flags &= ~NCR_ICCS;
 
-			if (!(sc->sc_espintr & NCRINTR_DONE)) {
+			if ((sc->sc_espintr & NCRINTR_DONE) == 0) {
 				device_printf(sc->sc_dev, "ICCS: "
 				    ": [intr %x, stat %x, step %x]\n",
 				    sc->sc_espintr, sc->sc_espstat,
@@ -2912,9 +2904,8 @@ again:
 	 * Driver is now in state NCR_CONNECTED, i.e. we
 	 * have a current command working the SCSI bus.
 	 */
-	if (sc->sc_state != NCR_CONNECTED || ecb == NULL) {
-		panic("ncr53c9x: no nexus");
-	}
+	if (sc->sc_state != NCR_CONNECTED || ecb == NULL)
+		panic("%s: no nexus", __func__);
 
 	switch (sc->sc_phase) {
 	case MESSAGE_OUT_PHASE:
@@ -2928,7 +2919,7 @@ msgin:
 		NCR_PHASE(("MESSAGE_IN_PHASE "));
 		if ((sc->sc_espintr & NCRINTR_BS) != 0) {
 			if ((sc->sc_rev != NCR_VARIANT_FAS366) ||
-			    !(sc->sc_espstat2 & NCRFAS_STAT2_EMPTY)) {
+			    (sc->sc_espstat2 & NCRFAS_STAT2_EMPTY) == 0) {
 				NCRCMD(sc, NCRCMD_FLUSH);
 			}
 			sc->sc_flags |= NCR_WAITI;
@@ -2945,11 +2936,10 @@ msgin:
 			    (sc->sc_prevphase == sc->sc_phase) ?
 			    NCR_RDFIFO_CONTINUE : NCR_RDFIFO_START);
 			ncr53c9x_msgin(sc);
-		} else {
+		} else
 			device_printf(sc->sc_dev, "MSGIN: weird bits: "
 			    "[intr %x, stat %x, step %x]\n",
 			    sc->sc_espintr, sc->sc_espstat, sc->sc_espstep);
-		}
 		sc->sc_prevphase = MESSAGE_IN_PHASE;
 		goto shortcut;	/* i.e. expect data to be ready */
 
@@ -2966,7 +2956,9 @@ msgin:
 		    ecb->cmd.cmd.opcode, ecb->clen));
 		if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) {
 			NCRCMD(sc, NCRCMD_FLUSH);
-/*			DELAY(1);*/
+#if 0
+			DELAY(1);
+#endif
 		}
 		/*
 		 * If we have more messages to send, e.g. WDTR or SDTR
@@ -2981,7 +2973,7 @@ msgin:
 			/* Setup DMA transfer for command. */
 			size = ecb->clen;
 			sc->sc_cmdlen = size;
-			sc->sc_cmdp = (caddr_t)&ecb->cmd.cmd;
+			sc->sc_cmdp = (void *)&ecb->cmd.cmd;
 			NCRDMA_SETUP(sc, &sc->sc_cmdp, &sc->sc_cmdlen,
 			    0, &size);
 			/* Program the SCSI counter. */
@@ -2994,7 +2986,8 @@ msgin:
 			NCRCMD(sc, NCRCMD_TRANS | NCRCMD_DMA);
 			NCRDMA_GO(sc);
 		} else {
-			ncr53c9x_wrfifo(sc, (u_char *)&ecb->cmd.cmd, ecb->clen);
+			ncr53c9x_wrfifo(sc, (uint8_t *)&ecb->cmd.cmd,
+			    ecb->clen);
 			NCRCMD(sc, NCRCMD_TRANS);
 		}
 		sc->sc_prevphase = COMMAND_PHASE;
@@ -3175,7 +3168,7 @@ ncr53c9x_callout(void *arg)
 static void
 ncr53c9x_watch(void *arg)
 {
-	struct ncr53c9x_softc *sc = (struct ncr53c9x_softc *)arg;
+	struct ncr53c9x_softc *sc = arg;
 	struct ncr53c9x_linfo *li;
 	struct ncr53c9x_tinfo *ti;
 	time_t old;

Modified: stable/8/sys/dev/esp/ncr53c9xreg.h
==============================================================================
--- stable/8/sys/dev/esp/ncr53c9xreg.h	Sat Oct 29 23:53:58 2011	(r226918)
+++ stable/8/sys/dev/esp/ncr53c9xreg.h	Sat Oct 29 23:53:58 2011	(r226919)
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr53c9xreg.h,v 1.14 2005/02/27 00:27:02 perry Exp $	*/
+/*	$NetBSD: ncr53c9xreg.h,v 1.16 2009/09/07 13:31:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1994 Peter Galbavy.  All rights reserved.
@@ -43,84 +43,84 @@
 #define	NCR_FIFO	0x02		/* RW - FIFO data		*/
 
 #define	NCR_CMD		0x03		/* RW - Command (2 deep)	*/
-#define  NCRCMD_DMA	0x80		/*	DMA Bit			*/
-#define  NCRCMD_NOP	0x00		/*	No Operation		*/
-#define  NCRCMD_FLUSH	0x01		/*	Flush FIFO		*/
-#define  NCRCMD_RSTCHIP	0x02		/*	Reset Chip		*/
-#define  NCRCMD_RSTSCSI	0x03		/*	Reset SCSI Bus		*/
-#define  NCRCMD_RESEL	0x40		/*	Reselect Sequence	*/
-#define  NCRCMD_SELNATN	0x41		/*	Select without ATN	*/
-#define  NCRCMD_SELATN	0x42		/*	Select with ATN		*/
-#define  NCRCMD_SELATNS	0x43		/*	Select with ATN & Stop	*/
-#define  NCRCMD_ENSEL	0x44		/*	Enable (Re)Selection	*/
-#define  NCRCMD_DISSEL	0x45		/*	Disable (Re)Selection	*/
-#define  NCRCMD_SELATN3	0x46		/*	Select with ATN3	*/
-#define  NCRCMD_RESEL3	0x47		/*	Reselect3 Sequence	*/
-#define  NCRCMD_SNDMSG	0x20		/*	Send Message		*/
-#define  NCRCMD_SNDSTAT	0x21		/*	Send Status		*/
-#define  NCRCMD_SNDDATA	0x22		/*	Send Data		*/
-#define  NCRCMD_DISCSEQ	0x23		/*	Disconnect Sequence	*/
-#define  NCRCMD_TERMSEQ	0x24		/*	Terminate Sequence	*/
-#define  NCRCMD_TCCS	0x25		/*	Target Command Comp Seq	*/
-#define  NCRCMD_DISC	0x27		/*	Disconnect		*/
-#define  NCRCMD_RECMSG	0x28		/*	Receive Message		*/
-#define  NCRCMD_RECCMD	0x29		/*	Receive Command 	*/
-#define  NCRCMD_RECDATA	0x2a		/*	Receive Data		*/
-#define  NCRCMD_RECCSEQ	0x2b		/*	Receive Command Sequence*/
-#define  NCRCMD_ABORT	0x04		/*	Target Abort DMA	*/
-#define  NCRCMD_TRANS	0x10		/*	Transfer Information	*/
-#define  NCRCMD_ICCS	0x11		/*	Initiator Cmd Comp Seq 	*/
-#define  NCRCMD_MSGOK	0x12		/*	Message Accepted	*/
-#define  NCRCMD_TRPAD	0x18		/*	Transfer Pad		*/
-#define  NCRCMD_SETATN	0x1a		/*	Set ATN			*/
-#define  NCRCMD_RSTATN	0x1b		/*	Reset ATN		*/
+#define	 NCRCMD_DMA	0x80		/*	DMA Bit			*/
+#define	 NCRCMD_NOP	0x00		/*	No Operation		*/
+#define	 NCRCMD_FLUSH	0x01		/*	Flush FIFO		*/
+#define	 NCRCMD_RSTCHIP	0x02		/*	Reset Chip		*/
+#define	 NCRCMD_RSTSCSI	0x03		/*	Reset SCSI Bus		*/
+#define	 NCRCMD_RESEL	0x40		/*	Reselect Sequence	*/
+#define	 NCRCMD_SELNATN	0x41		/*	Select without ATN	*/
+#define	 NCRCMD_SELATN	0x42		/*	Select with ATN		*/
+#define	 NCRCMD_SELATNS	0x43		/*	Select with ATN & Stop	*/
+#define	 NCRCMD_ENSEL	0x44		/*	Enable (Re)Selection	*/
+#define	 NCRCMD_DISSEL	0x45		/*	Disable (Re)Selection	*/
+#define	 NCRCMD_SELATN3	0x46		/*	Select with ATN3	*/
+#define	 NCRCMD_RESEL3	0x47		/*	Reselect3 Sequence	*/
+#define	 NCRCMD_SNDMSG	0x20		/*	Send Message		*/
+#define	 NCRCMD_SNDSTAT	0x21		/*	Send Status		*/
+#define	 NCRCMD_SNDDATA	0x22		/*	Send Data		*/
+#define	 NCRCMD_DISCSEQ	0x23		/*	Disconnect Sequence	*/
+#define	 NCRCMD_TERMSEQ	0x24		/*	Terminate Sequence	*/
+#define	 NCRCMD_TCCS	0x25		/*	Target Command Comp Seq	*/
+#define	 NCRCMD_DISC	0x27		/*	Disconnect		*/
+#define	 NCRCMD_RECMSG	0x28		/*	Receive Message		*/
+#define	 NCRCMD_RECCMD	0x29		/*	Receive Command		*/
+#define	 NCRCMD_RECDATA	0x2a		/*	Receive Data		*/
+#define	 NCRCMD_RECCSEQ	0x2b		/*	Receive Command Sequence*/
+#define	 NCRCMD_ABORT	0x04		/*	Target Abort DMA	*/
+#define	 NCRCMD_TRANS	0x10		/*	Transfer Information	*/
+#define	 NCRCMD_ICCS	0x11		/*	Initiator Cmd Comp Seq	*/
+#define	 NCRCMD_MSGOK	0x12		/*	Message Accepted	*/
+#define	 NCRCMD_TRPAD	0x18		/*	Transfer Pad		*/
+#define	 NCRCMD_SETATN	0x1a		/*	Set ATN			*/
+#define	 NCRCMD_RSTATN	0x1b		/*	Reset ATN		*/
 
 #define	NCR_STAT	0x04		/* RO - Status			*/
-#define  NCRSTAT_INT	0x80		/*	Interrupt		*/
-#define  NCRSTAT_GE	0x40		/*	Gross Error		*/
-#define  NCRSTAT_PE	0x20		/*	Parity Error		*/
-#define  NCRSTAT_TC	0x10		/*	Terminal Count		*/
-#define  NCRSTAT_VGC	0x08		/*	Valid Group Code	*/
-#define  NCRSTAT_PHASE	0x07		/*	Phase bits		*/
+#define	 NCRSTAT_INT	0x80		/*	Interrupt		*/
+#define	 NCRSTAT_GE	0x40		/*	Gross Error		*/
+#define	 NCRSTAT_PE	0x20		/*	Parity Error		*/
+#define	 NCRSTAT_TC	0x10		/*	Terminal Count		*/
+#define	 NCRSTAT_VGC	0x08		/*	Valid Group Code	*/
+#define	 NCRSTAT_PHASE	0x07		/*	Phase bits		*/
 
 #define	NCR_SELID	0x04		/* WO - Select/Reselect Bus ID	*/
-#define  NCR_BUSID_HMEXC32	0x40	/*	HME xfer counter is 32bit */
-#define  NCR_BUSID_HMEENCID	0x10 	/*	HME encode reselection ID */
+#define	 NCR_BUSID_HMEXC32	0x40	/*	HME xfer counter is 32bit */
+#define	 NCR_BUSID_HMEENCID	0x10	/*	HME encode reselection ID */
 
 #define	NCR_INTR	0x05		/* RO - Interrupt		*/
-#define  NCRINTR_SBR	0x80		/*	SCSI Bus Reset		*/
-#define  NCRINTR_ILL	0x40		/*	Illegal Command		*/
-#define  NCRINTR_DIS	0x20		/*	Disconnect		*/
-#define  NCRINTR_BS	0x10		/*	Bus Service		*/
-#define  NCRINTR_FC	0x08		/*	Function Complete	*/
-#define  NCRINTR_RESEL	0x04		/*	Reselected		*/
-#define  NCRINTR_SELATN	0x02		/*	Select with ATN		*/
-#define  NCRINTR_SEL	0x01		/*	Selected		*/
+#define	 NCRINTR_SBR	0x80		/*	SCSI Bus Reset		*/
+#define	 NCRINTR_ILL	0x40		/*	Illegal Command		*/
+#define	 NCRINTR_DIS	0x20		/*	Disconnect		*/
+#define	 NCRINTR_BS	0x10		/*	Bus Service		*/
+#define	 NCRINTR_FC	0x08		/*	Function Complete	*/
+#define	 NCRINTR_RESEL	0x04		/*	Reselected		*/
+#define	 NCRINTR_SELATN	0x02		/*	Select with ATN		*/
+#define	 NCRINTR_SEL	0x01		/*	Selected		*/
 
 #define	NCR_TIMEOUT	0x05		/* WO - Select/Reselect Timeout */
 
 #define	NCR_STEP	0x06		/* RO - Sequence Step		*/
-#define  NCRSTEP_MASK	0x07		/*	the last 3 bits		*/
-#define  NCRSTEP_DONE	0x04		/*	command went out	*/
+#define	 NCRSTEP_MASK	0x07		/*	the last 3 bits		*/
+#define	 NCRSTEP_DONE	0x04		/*	command went out	*/
 
 #define	NCR_SYNCTP	0x06		/* WO - Synch Transfer Period	*/
 					/*	Default 5 (53C9X)	*/
 
 #define	NCR_FFLAG	0x07		/* RO - FIFO Flags		*/
-#define  NCRFIFO_SS	0xe0		/*	Sequence Step (Dup)	*/
-#define  NCRFIFO_FF	0x1f		/*	Bytes in FIFO		*/
+#define	 NCRFIFO_SS	0xe0		/*	Sequence Step (Dup)	*/
+#define	 NCRFIFO_FF	0x1f		/*	Bytes in FIFO		*/
 
 #define	NCR_SYNCOFF	0x07		/* WO - Synch Offset		*/
 					/*	0 = ASYNC		*/
 					/*	1 - 15 = SYNC bytes	*/
 
 #define	NCR_CFG1	0x08		/* RW - Configuration #1	*/
-#define  NCRCFG1_SLOW	0x80		/*	Slow Cable Mode		*/
-#define  NCRCFG1_SRR	0x40		/*	SCSI Reset Rep Int Dis	*/
-#define  NCRCFG1_PTEST	0x20		/*	Parity Test Mod		*/
-#define  NCRCFG1_PARENB	0x10		/*	Enable Parity Check	*/
-#define  NCRCFG1_CTEST	0x08		/*	Enable Chip Test	*/
-#define  NCRCFG1_BUSID	0x07		/*	Bus ID			*/
+#define	 NCRCFG1_SLOW	0x80		/*	Slow Cable Mode		*/
+#define	 NCRCFG1_SRR	0x40		/*	SCSI Reset Rep Int Dis	*/
+#define	 NCRCFG1_PTEST	0x20		/*	Parity Test Mod		*/
+#define	 NCRCFG1_PARENB	0x10		/*	Enable Parity Check	*/
+#define	 NCRCFG1_CTEST	0x08		/*	Enable Chip Test	*/
+#define	 NCRCFG1_BUSID	0x07		/*	Bus ID			*/
 
 #define	NCR_CCF		0x09		/* WO -	Clock Conversion Factor	*/
 					/*	0 = 35.01 - 40MHz	*/
@@ -136,24 +136,24 @@
 
 #define	NCR_CFG2	0x0b		/* RW - Configuration #2	*/
 #define	 NCRCFG2_RSVD	0xa0		/*	reserved		*/
-#define  NCRCFG2_FE	0x40		/* 	Features Enable		*/
-#define  NCRCFG2_DREQ	0x10		/* 	DREQ High Impedance	*/
-#define  NCRCFG2_SCSI2	0x08		/* 	SCSI-2 Enable		*/
-#define  NCRCFG2_BPA	0x04		/* 	Target Bad Parity Abort	*/
-#define  NCRCFG2_RPE	0x02		/* 	Register Parity Error	*/
-#define  NCRCFG2_DPE	0x01		/* 	DMA Parity Error	*/
+#define	 NCRCFG2_FE	0x40		/*	Features Enable		*/
+#define	 NCRCFG2_DREQ	0x10		/*	DREQ High Impedance	*/
+#define	 NCRCFG2_SCSI2	0x08		/*	SCSI-2 Enable		*/
+#define	 NCRCFG2_BPA	0x04		/*	Target Bad Parity Abort	*/
+#define	 NCRCFG2_RPE	0x02		/*	Register Parity Error	*/
+#define	 NCRCFG2_DPE	0x01		/*	DMA Parity Error	*/
 
-#define  NCRCFG2_HMEFE	0x10		/*	HME feature enable	*/
+#define	 NCRCFG2_HMEFE	0x10		/*	HME feature enable	*/
 #define	 NCRCFG2_HME32  0x80		/*	HME 32 extended		*/
 
 /* Config #3 only on 53C9X */
 #define	NCR_CFG3	0x0c		/* RW - Configuration #3	*/
 #define	 NCRCFG3_RSVD	0xe0		/*	reserved		*/
-#define  NCRCFG3_IDM	0x10		/*	ID Message Res Check	*/
-#define  NCRCFG3_QTE	0x08		/*	Queue Tag Enable	*/
-#define  NCRCFG3_CDB	0x04		/*	CDB 10-bytes OK		*/
-#define  NCRCFG3_FSCSI	0x02		/*	Fast SCSI		*/
-#define  NCRCFG3_FCLK	0x01		/*	Fast Clock (>25MHz)	*/
+#define	 NCRCFG3_IDM	0x10		/*	ID Message Res Check	*/
+#define	 NCRCFG3_QTE	0x08		/*	Queue Tag Enable	*/
+#define	 NCRCFG3_CDB	0x04		/*	CDB 10-bytes OK		*/
+#define	 NCRCFG3_FSCSI	0x02		/*	Fast SCSI		*/
+#define	 NCRCFG3_FCLK	0x01		/*	Fast Clock (>25MHz)	*/
 
 /*
  * For some unknown reason, the ESP406/FAS408 looks like every
@@ -164,35 +164,35 @@
 
 /* Config #3 different on ESP406/FAS408 */
 #define	NCR_ESPCFG3		0x0c	/* RW - Configuration #3	*/
-#define  NCRESPCFG3_IDM		0x80	/*	ID Message Res Check	*/
-#define  NCRESPCFG3_QTE		0x40	/*	Queue Tag Enable	*/
-#define  NCRESPCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
-#define  NCRESPCFG3_FSCSI	0x10	/*	Fast SCSI		*/
+#define	 NCRESPCFG3_IDM		0x80	/*	ID Message Res Check	*/
+#define	 NCRESPCFG3_QTE		0x40	/*	Queue Tag Enable	*/
+#define	 NCRESPCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
+#define	 NCRESPCFG3_FSCSI	0x10	/*	Fast SCSI		*/
 #define	 NCRESPCFG3_SRESB	0x08	/*	Save Residual Byte	*/
-#define  NCRESPCFG3_FCLK	0x04	/*	Fast Clock (>25MHz)	*/
+#define	 NCRESPCFG3_FCLK	0x04	/*	Fast Clock (>25MHz)	*/
 #define	 NCRESPCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
 #define	 NCRESPCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
 
 /* Config #3 also different on NCR53CF9x/FAS100A/FAS216/FAS236 */
 #define	NCR_F9XCFG3		0x0c	/* RW - Configuration #3	*/
-#define  NCRF9XCFG3_IDM		0x80	/*	ID Message Res Check	*/
-#define  NCRF9XCFG3_QTE		0x40	/*	Queue Tag Enable	*/
-#define  NCRF9XCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
-#define  NCRF9XCFG3_FSCSI	0x10	/*	Fast SCSI		*/
-#define  NCRF9XCFG3_FCLK	0x08	/*	Fast Clock (>25MHz)	*/
-#define  NCRF9XCFG3_SRESB	0x04	/*	Save Residual Byte	*/
-#define  NCRF9XCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
-#define  NCRF9XCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
+#define	 NCRF9XCFG3_IDM		0x80	/*	ID Message Res Check	*/
+#define	 NCRF9XCFG3_QTE		0x40	/*	Queue Tag Enable	*/
+#define	 NCRF9XCFG3_CDB		0x20	/*	CDB 10-bytes OK		*/
+#define	 NCRF9XCFG3_FSCSI	0x10	/*	Fast SCSI		*/
+#define	 NCRF9XCFG3_FCLK	0x08	/*	Fast Clock (>25MHz)	*/
+#define	 NCRF9XCFG3_SRESB	0x04	/*	Save Residual Byte	*/
+#define	 NCRF9XCFG3_ADMA	0x02	/*	Alternate DMA Mode	*/
+#define	 NCRF9XCFG3_T8M		0x01	/*	Threshold 8 Mode	*/
 
 /* Config #3 on FAS366 */
-#define  NCRFASCFG3_OBAUTO    	0x80    /*	auto push odd-byte to DMA */
-#define  NCRFASCFG3_EWIDE     	0x40    /* 	Enable Wide-SCSI     */
-#define  NCRFASCFG3_IDBIT3	0x20	/* 	Bit 3 of HME SCSI-ID */
-#define	 NCRFASCFG3_IDRESCHK	0x10	/* 	ID message checking */
-#define	 NCRFASCFG3_QUENB	0x08	/* 	3-byte msg support */
-#define	 NCRFASCFG3_CDB10	0x04	/* 	group 2 scsi-2 support */
-#define	 NCRFASCFG3_FASTSCSI	0x02	/* 	10 MB/S fast scsi mode */
-#define	 NCRFASCFG3_FASTCLK	0x01	/* 	fast clock mode */
+#define	 NCRFASCFG3_OBAUTO	0x80    /*	auto push odd-byte to DMA */
+#define	 NCRFASCFG3_EWIDE	0x40    /*	Enable Wide-SCSI     */
+#define	 NCRFASCFG3_IDBIT3	0x20	/*	Bit 3 of HME SCSI-ID */
+#define	 NCRFASCFG3_IDRESCHK	0x10	/*	ID message checking */
+#define	 NCRFASCFG3_QUENB	0x08	/*	3-byte msg support */
+#define	 NCRFASCFG3_CDB10	0x04	/*	group 2 scsi-2 support */
+#define	 NCRFASCFG3_FASTSCSI	0x02	/*	10 MB/S fast scsi mode */
+#define	 NCRFASCFG3_FASTCLK	0x01	/*	fast clock mode */
 
 /* Config #4 only on ESP406/FAS408 */
 #define	NCR_CFG4	0x0d		/* RW - Configuration #4	*/
@@ -208,8 +208,8 @@
 */
 

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