From owner-svn-src-all@freebsd.org  Thu Apr  7 15:16:35 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07090B06F82;
 Thu,  7 Apr 2016 15:16:35 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C89341846;
 Thu,  7 Apr 2016 15:16:34 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u37FGXWV019132;
 Thu, 7 Apr 2016 15:16:33 GMT (envelope-from skra@FreeBSD.org)
Received: (from skra@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u37FGXRv019131;
 Thu, 7 Apr 2016 15:16:33 GMT (envelope-from skra@FreeBSD.org)
Message-Id: <201604071516.u37FGXRv019131@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: skra set sender to
 skra@FreeBSD.org using -f
From: Svatopluk Kraus <skra@FreeBSD.org>
Date: Thu, 7 Apr 2016 15:16:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297676 - 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-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Apr 2016 15:16:35 -0000

Author: skra
Date: Thu Apr  7 15:16:33 2016
New Revision: 297676
URL: https://svnweb.freebsd.org/changeset/base/297676

Log:
  Fix intr_irq_shuffle(). After r297539, ISRCs doing IPI may be also
  registered into global interrupt table. Thus, they must be filtered out
  like per-cpu interrupts. Fortunately, it does not influence anything
  on interrupt controllers which already use INTRNG.

Modified:
  head/sys/kern/subr_intr.c

Modified: head/sys/kern/subr_intr.c
==============================================================================
--- head/sys/kern/subr_intr.c	Thu Apr  7 15:11:24 2016	(r297675)
+++ head/sys/kern/subr_intr.c	Thu Apr  7 15:16:33 2016	(r297676)
@@ -1190,7 +1190,7 @@ intr_irq_shuffle(void *arg __unused)
 	for (i = 0; i < NIRQ; i++) {
 		isrc = irq_sources[i];
 		if (isrc == NULL || isrc->isrc_handlers == 0 ||
-		    isrc->isrc_flags & INTR_ISRCF_PPI)
+		    isrc->isrc_flags & (INTR_ISRCF_PPI | INTR_ISRCF_IPI))
 			continue;
 
 		if (isrc->isrc_event != NULL &&