From owner-svn-src-all@FreeBSD.ORG  Wed Aug 11 19:56:09 2010
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 AD2AA1065675;
	Wed, 11 Aug 2010 19:56:09 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D0E38FC23;
	Wed, 11 Aug 2010 19:56:09 +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 o7BJu9wg057011;
	Wed, 11 Aug 2010 19:56:09 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7BJu9ti057009;
	Wed, 11 Aug 2010 19:56:09 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201008111956.o7BJu9ti057009@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Wed, 11 Aug 2010 19:56:09 +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: r211191 - head/sys/mips/rmi
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: Wed, 11 Aug 2010 19:56:09 -0000

Author: jchandra
Date: Wed Aug 11 19:56:09 2010
New Revision: 211191
URL: http://svn.freebsd.org/changeset/base/211191

Log:
  Fix for 64 bit compile, with SMP enabled.

Modified:
  head/sys/mips/rmi/xlr_machdep.c

Modified: head/sys/mips/rmi/xlr_machdep.c
==============================================================================
--- head/sys/mips/rmi/xlr_machdep.c	Wed Aug 11 19:32:49 2010	(r211190)
+++ head/sys/mips/rmi/xlr_machdep.c	Wed Aug 11 19:56:09 2010	(r211191)
@@ -428,7 +428,8 @@ platform_start(__register_t a0 __unused,
 	/* Wakeup Other cpus, and put them in bsd park code. */
 	wakeup = ((void (*) (void *, void *, unsigned int))
 	    (unsigned long)(xlr_boot1_info.wakeup));
-	printf("Waking up CPUs 0x%llx.\n", xlr_boot1_info.cpu_online_map & ~(0x1U));
+	printf("Waking up CPUs 0x%jx.\n", 
+	    (intmax_t)xlr_boot1_info.cpu_online_map & ~(0x1U));
 	if (xlr_boot1_info.cpu_online_map & ~(0x1U))
 		wakeup(mpwait, 0,
 		    (unsigned int)xlr_boot1_info.cpu_online_map);
@@ -516,7 +517,7 @@ platform_init_ap(int cpuid)
 	stat |= MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT;
 	mips_wr_status(stat);
 
-	xlr_unmask_hard_irq((void *)platform_ipi_intrnum());
+	xlr_unmask_hard_irq((void *)IRQ_IPI);
 	xlr_unmask_hard_irq((void *)IRQ_TIMER);
 	if (xlr_thr_id() == 0) {
 		xlr_msgring_cpu_init();