Commit f00c2d36 authored by Xiantao Zhang's avatar Xiantao Zhang Committed by Tony Luck

[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: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent a7d57ecf
...@@ -421,7 +421,6 @@ efi_map_pal_code (void) ...@@ -421,7 +421,6 @@ efi_map_pal_code (void)
pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)), pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)),
IA64_GRANULE_SHIFT); IA64_GRANULE_SHIFT);
ia64_set_psr(psr); /* restore psr */ ia64_set_psr(psr); /* restore psr */
ia64_srlz_i();
} }
void __init void __init
......
...@@ -472,7 +472,7 @@ ia64_set_psr (__u64 psr) ...@@ -472,7 +472,7 @@ ia64_set_psr (__u64 psr)
{ {
ia64_stop(); ia64_stop();
ia64_setreg(_IA64_REG_PSR_L, psr); ia64_setreg(_IA64_REG_PSR_L, psr);
ia64_srlz_d(); ia64_srlz_i();
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment