Bladeren bron

[IA64] ia64_set_psr should use srlz.i

The only in kernel use of ia64_set_psr() needs to follow
it with a srlz.i (since it is changing state for PSR.ic).
So it is pointless to issue srlz.d inside this function.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Xiantao Zhang 17 jaren geleden
bovenliggende
commit
f00c2d36bf
2 gewijzigde bestanden met toevoegingen van 1 en 2 verwijderingen
  1. 0 1
      arch/ia64/kernel/efi.c
  2. 1 1
      include/asm-ia64/processor.h

+ 0 - 1
arch/ia64/kernel/efi.c

@@ -421,7 +421,6 @@ efi_map_pal_code (void)
 		 pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)),
 		 IA64_GRANULE_SHIFT);
 	ia64_set_psr(psr);		/* restore psr */
-	ia64_srlz_i();
 }
 
 void __init

+ 1 - 1
include/asm-ia64/processor.h

@@ -472,7 +472,7 @@ ia64_set_psr (__u64 psr)
 {
 	ia64_stop();
 	ia64_setreg(_IA64_REG_PSR_L, psr);
-	ia64_srlz_d();
+	ia64_srlz_i();
 }
 
 /*