From 25f6ca730277b16e6097c47a5cee44af67224dee Mon Sep 17 00:00:00 2001
From: "Luck, Tony" <tony.luck@intel.com>
Date: Tue, 16 Apr 2013 11:35:56 -0700
Subject: [PATCH] --- yaml --- r: 366151 b: refs/heads/master c:
 2412aa1293a4159c610616305c17efd237c8208d h: refs/heads/master i:   366149:
 d676afdae144961ab9eeaec070a97a0a13812486   366147:
 81b51310fe14ec61ec1f66f5bf67068972d0bb9c   366143:
 3b986dd0adab48195158050bde6ab15015ce9bbd v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/ia64/include/asm/irqflags.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 84d075e00416..65c3f65e4b47 100644
--- 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
index 2b68d856dc78..1bf2cf2f4ab4 100644
--- 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 */
 }