---

yaml --- r: 83321 b: refs/heads/master c: f00c2d3 h: refs/heads/master i: 83319: 3d20ee2 v: v3
git-mirror · Feb 4, 2008 · c0700cc · c0700cc
1 parent 0c3d95d
commit c0700cc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7d57ecf4216ed29328f8e701bd65ebb66a0284c
+refs/heads/master: f00c2d36bf6d7efece79713930763d9a0460283e
diff --git a/trunk/arch/ia64/kernel/efi.c b/trunk/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

diff --git a/trunk/include/asm-ia64/processor.h b/trunk/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();
 }
 
 /*