---

yaml --- r: 231644 b: refs/heads/master c: e2609f6 h: refs/heads/master v: v3
git-mirror · Jan 17, 2011 · 02d082a · 02d082a
1 parent 5d162f2
commit 02d082a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00649643b1f4e1644f644f612c6bb390e69196ad
+refs/heads/master: e2609f6aa2dce5d960ea1fe32f57524c315dede5
diff --git a/trunk/arch/alpha/include/asm/io.h b/trunk/arch/alpha/include/asm/io.h
@@ -37,16 +37,18 @@
  */
 extern inline void __set_hae(unsigned long new_hae)
 {
-	unsigned long flags;
-	local_irq_save(flags);
+	unsigned long flags = swpipl(IPL_MAX);
+
+	barrier();
 
 	alpha_mv.hae_cache = new_hae;
 	*alpha_mv.hae_register = new_hae;
 	mb();
 	/* Re-read to make sure it was written.  */
 	new_hae = *alpha_mv.hae_register;
 
-	local_irq_restore(flags);
+	setipl(flags);
+	barrier();
 }
 
 extern inline void set_hae(unsigned long new_hae)