svn commit: r320979 - stable/11/sys/powerpc/booke

[Justin Hibbits]

Author: jhibbits
Date: Fri Jul 14 01:45:43 2017
New Revision: 320979
URL: https://svnweb.freebsd.org/changeset/base/320979

Log:
  MFC r320489:
  
    Use the more common Book-E idiom for disabling interrupts.

Modified:
  stable/11/sys/powerpc/booke/pmap.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/powerpc/booke/pmap.c
==============================================================================
--- stable/11/sys/powerpc/booke/pmap.c	Fri Jul 14 01:22:27 2017	(r320978)
+++ stable/11/sys/powerpc/booke/pmap.c	Fri Jul 14 01:45:43 2017	(r320979)
@@ -3156,7 +3156,7 @@ tlb1_read_entry(tlb_entry_t *entry, unsigned int slot)
 	KASSERT((entry != NULL), ("%s(): Entry is NULL!", __func__));
 
 	msr = mfmsr();
-	mtmsr(msr & ~PSL_EE);
+	__asm __volatile("wrteei 0");
 
 	mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(slot);
 	mtspr(SPR_MAS0, mas0);
@@ -3202,7 +3202,7 @@ tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
 	//debugf("tlb1_write_entry: mas0 = 0x%08x\n", mas0);
 
 	msr = mfmsr();
-	mtmsr(msr & ~PSL_EE);
+	__asm __volatile("wrteei 0");
 
 	mtspr(SPR_MAS0, mas0);
 	__asm __volatile("isync");