aboutsummaryrefslogtreecommitdiff
path: root/sys/arm64/arm64/mp_machdep.c
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2016-05-16 12:02:06 +0000
committerAndrew Turner <andrew@FreeBSD.org>2016-05-16 12:02:06 +0000
commit2b48ec8e6dc7edacbd55819b7fbe2d0d1c4738ea (patch)
tree109716bd5cbe6d4f82e40ded27bf38b3d0795f18 /sys/arm64/arm64/mp_machdep.c
parent20ec8b0f9b4863f583181ddf024cdba2a4e36589 (diff)
downloadsrc-2b48ec8e6dc7edacbd55819b7fbe2d0d1c4738ea.tar.gz
src-2b48ec8e6dc7edacbd55819b7fbe2d0d1c4738ea.zip
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
Notes
Notes: svn path=/head/; revision=299939
Diffstat (limited to 'sys/arm64/arm64/mp_machdep.c')
-rw-r--r--sys/arm64/arm64/mp_machdep.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c
index df9afdc55b43..c90d59ad6911 100644
--- a/sys/arm64/arm64/mp_machdep.c
+++ b/sys/arm64/arm64/mp_machdep.c
@@ -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);