Skip to content

Commit

Permalink
[IA64] ia64_set_psr should use srlz.i
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Xiantao Zhang authored and aegl committed Feb 4, 2008
1 parent a7d57ec commit f00c2d3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion arch/ia64/kernel/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/asm-ia64/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ ia64_set_psr (__u64 psr)
{
ia64_stop();
ia64_setreg(_IA64_REG_PSR_L, psr);
ia64_srlz_d();
ia64_srlz_i();
}

/*
Expand Down

0 comments on commit f00c2d3

Please sign in to comment.