From owner-svn-src-all@FreeBSD.ORG  Tue Nov 24 01:35:21 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F140A1065692;
	Tue, 24 Nov 2009 01:35:21 +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 E12A48FC18;
	Tue, 24 Nov 2009 01:35:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAO1ZLSm087400;
	Tue, 24 Nov 2009 01:35:21 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO1ZLbg087398;
	Tue, 24 Nov 2009 01:35:21 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200911240135.nAO1ZLbg087398@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 24 Nov 2009 01:35:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199727 - head/sys/ia64/ia64
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 01:35:22 -0000

Author: marcel
Date: Tue Nov 24 01:35:21 2009
New Revision: 199727
URL: http://svn.freebsd.org/changeset/base/199727

Log:
  Improve upon revision 196196 by removing the newly added comment
  in the wrong place and instead add a KASSERT in the right place.

Modified:
  head/sys/ia64/ia64/interrupt.c

Modified: head/sys/ia64/ia64/interrupt.c
==============================================================================
--- head/sys/ia64/ia64/interrupt.c	Mon Nov 23 23:45:26 2009	(r199726)
+++ head/sys/ia64/ia64/interrupt.c	Tue Nov 24 01:35:21 2009	(r199727)
@@ -145,8 +145,6 @@ interrupt(struct trapframe *tf)
 	/*
 	 * Handle ExtINT interrupts by generating an INTA cycle to
 	 * read the vector.
-	 * IPI_STOP_HARD is mapped to IPI_STOP so it is not necessary
-	 * to add it to this switch-like construct.
 	 */
 	if (vector == 0) {
 		inta = ib->ib_inta;
@@ -226,6 +224,10 @@ interrupt(struct trapframe *tf)
 	} else if (vector == ipi_vector[IPI_STOP]) {
 		cpumask_t mybit = PCPU_GET(cpumask);
 
+		/* Make sure IPI_STOP_HARD is mapped to IPI_STOP. */
+		KASSERT(IPI_STOP == IPI_STOP_HARD,
+		    ("%s: IPI_STOP_HARD not handled.", __func__));
+
 		savectx(PCPU_PTR(pcb));
 		atomic_set_int(&stopped_cpus, mybit);
 		while ((started_cpus & mybit) == 0)