From owner-svn-src-head@FreeBSD.ORG  Thu Feb  7 06:48:48 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 49A38DAB;
 Thu,  7 Feb 2013 06:48:48 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 24C3936C;
 Thu,  7 Feb 2013 06:48:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r176mm93040111;
 Thu, 7 Feb 2013 06:48:48 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r176mmKS040110;
 Thu, 7 Feb 2013 06:48:48 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201302070648.r176mmKS040110@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Thu, 7 Feb 2013 06:48:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246452 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Feb 2013 06:48:48 -0000

Author: neel
Date: Thu Feb  7 06:48:47 2013
New Revision: 246452
URL: http://svnweb.freebsd.org/changeset/base/246452

Log:
  If an interrupt event's assign_cpu method fails, then restore the original
  cpuset mask for the associated interrupt thread.
  
  The text used above is verbatim from r195249 and the code should now be
  in line with the intent of that commit.

Modified:
  head/sys/kern/kern_intr.c

Modified: head/sys/kern/kern_intr.c
==============================================================================
--- head/sys/kern/kern_intr.c	Thu Feb  7 04:49:28 2013	(r246451)
+++ head/sys/kern/kern_intr.c	Thu Feb  7 06:48:47 2013	(r246452)
@@ -336,7 +336,7 @@ intr_event_bind(struct intr_event *ie, u
 			if (ie->ie_cpu == NOCPU)
 				CPU_COPY(cpuset_root, &mask);
 			else
-				CPU_SET(cpu, &mask);
+				CPU_SET(ie->ie_cpu, &mask);
 			id = ie->ie_thread->it_thread->td_tid;
 			mtx_unlock(&ie->ie_lock);
 			(void)cpuset_setthread(id, &mask);