---

yaml --- r: 366151 b: refs/heads/master c: 2412aa1 h: refs/heads/master i: 366149: d676afd 366147: 81b5131 366143: 3b986dd v: v3
git-mirror · Apr 17, 2013 · 25f6ca7 · 25f6ca7
1 parent 8c1cf2c
commit 25f6ca7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87fa05aeb3a5e8e21b1a5510eef6983650eff092
+refs/heads/master: 2412aa1293a4159c610616305c17efd237c8208d
diff --git a/trunk/arch/ia64/include/asm/irqflags.h b/trunk/arch/ia64/include/asm/irqflags.h
@@ -89,6 +89,7 @@ static inline bool arch_irqs_disabled(void)
 
 static inline void arch_safe_halt(void)
 {
+	arch_local_irq_enable();
 	ia64_pal_halt_light();	/* PAL_HALT_LIGHT */
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,6 +89,7 @@ static inline bool arch_irqs_disabled(void) @@
     static inline void arch_safe_halt(void)
     {
+    	arch_local_irq_enable();
     	ia64_pal_halt_light();	/* PAL_HALT_LIGHT */
     }
@@ Expand Down @@