aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiantao Zhang <xiantao.zhang@intel.com>2008-01-31 04:46:09 -0500
committerTony Luck <tony.luck@intel.com>2008-02-04 18:50:13 -0500
commitf00c2d36bf6d7efece79713930763d9a0460283e (patch)
tree828623c11460982211a20252155759e1135644a0
parenta7d57ecf4216ed29328f8e701bd65ebb66a0284c (diff)
[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>
-rw-r--r--arch/ia64/kernel/efi.c1
-rw-r--r--include/asm-ia64/processor.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index d59134d7e73c..919070a9aed7 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -421,7 +421,6 @@ efi_map_pal_code (void)
421 pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)), 421 pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)),
422 IA64_GRANULE_SHIFT); 422 IA64_GRANULE_SHIFT);
423 ia64_set_psr(psr); /* restore psr */ 423 ia64_set_psr(psr); /* restore psr */
424 ia64_srlz_i();
425} 424}
426 425
427void __init 426void __init
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index be3b0ae43270..038642f6d19e 100644
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -472,7 +472,7 @@ ia64_set_psr (__u64 psr)
472{ 472{
473 ia64_stop(); 473 ia64_stop();
474 ia64_setreg(_IA64_REG_PSR_L, psr); 474 ia64_setreg(_IA64_REG_PSR_L, psr);
475 ia64_srlz_d(); 475 ia64_srlz_i();
476} 476}
477 477
478/* 478/*