From owner-svn-src-projects@FreeBSD.ORG  Tue Jul 10 00:54:25 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AD151106566B;
	Tue, 10 Jul 2012 00:54:25 +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 98F298FC14;
	Tue, 10 Jul 2012 00:54: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 q6A0sPvs049877;
	Tue, 10 Jul 2012 00:54:25 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6A0sPEM049875;
	Tue, 10 Jul 2012 00:54:25 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201207100054.q6A0sPEM049875@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 10 Jul 2012 00:54:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238322 - projects/altix2/sys/ia64/ia64
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jul 2012 00:54:25 -0000

Author: marcel
Date: Tue Jul 10 00:54:24 2012
New Revision: 238322
URL: http://svn.freebsd.org/changeset/base/238322

Log:
  Hack: IPI_STOP_HARD doesn't work, but IPI_STOP does. Force it...

Modified:
  projects/altix2/sys/ia64/ia64/mp_machdep.c

Modified: projects/altix2/sys/ia64/ia64/mp_machdep.c
==============================================================================
--- projects/altix2/sys/ia64/ia64/mp_machdep.c	Tue Jul 10 00:31:06 2012	(r238321)
+++ projects/altix2/sys/ia64/ia64/mp_machdep.c	Tue Jul 10 00:54:24 2012	(r238322)
@@ -434,6 +434,9 @@ cpu_mp_unleash(void *dummy)
 	ia64_ipi_nmi = (ia64_xiv_reserve(2, IA64_XIV_IPI, ia64_ih_stop) != 0)
 	    ? ia64_ipi_stop : 0x400;	/* DM=NMI, Vector=n/a */
 
+	/* XXX nmi doesn't work on Altix 350, but stop does... */
+	ia64_ipi_nmi = ia64_ipi_stop;
+
 	cpus = 0;
 	smp_cpus = 0;
 	STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {