svn commit: r299939 - head/sys/arm64/arm64

[Andrew Turner]

Author: andrew
Date: Mon May 16 12:02:06 2016
New Revision: 299939
URL: https://svnweb.freebsd.org/changeset/base/299939

Log:
  Move the call to intr_pic_init_secondary to the same place as in the
  non-intrng case.
  
  Obtained from:	ABT Systems Ltd
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm64/arm64/mp_machdep.c

Modified: head/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- head/sys/arm64/arm64/mp_machdep.c	Mon May 16 11:48:43 2016	(r299938)
+++ head/sys/arm64/arm64/mp_machdep.c	Mon May 16 12:02:06 2016	(r299939)
@@ -275,7 +275,9 @@ init_secondary(uint64_t cpu)
 	 */
 	identify_cpu();
 
-#ifndef INTRNG
+#ifdef INTRNG
+	intr_pic_init_secondary();
+#else
 	/* Configure the interrupt controller */
 	arm_init_secondary();
 
@@ -306,10 +308,6 @@ init_secondary(uint64_t cpu)
 
 	mtx_unlock_spin(&ap_boot_mtx);
 
-#ifdef INTRNG
-	intr_pic_init_secondary();
-#endif
-
 	/* Enter the scheduler */
 	sched_throw(NULL);