svn commit: r211191 - head/sys/mips/rmi

[Jayachandran C.]

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();