svn commit: r348632 - stable/12/sys/riscv/riscv

[Mark Johnston]

Author: markj
Date: Tue Jun  4 17:19:16 2019
New Revision: 348632
URL: https://svnweb.freebsd.org/changeset/base/348632

Log:
  MFC r342766:
  Don't enable interrupts in init_secondary().

Modified:
  stable/12/sys/riscv/riscv/mp_machdep.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/riscv/riscv/mp_machdep.c
==============================================================================
--- stable/12/sys/riscv/riscv/mp_machdep.c	Tue Jun  4 16:40:18 2019	(r348631)
+++ stable/12/sys/riscv/riscv/mp_machdep.c	Tue Jun  4 17:19:16 2019	(r348632)
@@ -227,7 +227,6 @@ init_secondary(uint64_t cpu)
 	__asm __volatile("mv gp, %0" :: "r"(pcpup));
 
 	/* Workaround: make sure wfi doesn't halt the hart */
-	intr_disable();
 	csr_set(sie, SIE_SSIE);
 	csr_set(sip, SIE_SSIE);
 
@@ -252,9 +251,6 @@ init_secondary(uint64_t cpu)
 
 	/* Start per-CPU event timers. */
 	cpu_initclocks_ap();
-
-	/* Enable interrupts */
-	intr_enable();
 
 	/* Enable external (PLIC) interrupts */
 	csr_set(sie, SIE_SEIE);