From 6205d40d3dc3feea9e92c8faccf6255c77419aba Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Tue, 12 Feb 2013 16:04:53 +0000
Subject: [PATCH] --- yaml --- r: 360677 b: refs/heads/master c:
 fa771d029af8f8a23089c97b6ab6a5745e98ad7e h: refs/heads/master i:   360675:
 adac3aadb95d1e761a44f1096ba4f2b2ddd5ce71 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/metag/include/asm/irqflags.h | 11 +++++------
 trunk/arch/metag/kernel/traps.c         | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index abe0091b1c85..b4c2497054a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97c3ec63089fdcd2abf66619b913900909841dc0
+refs/heads/master: fa771d029af8f8a23089c97b6ab6a5745e98ad7e
diff --git a/trunk/arch/metag/include/asm/irqflags.h b/trunk/arch/metag/include/asm/irqflags.h
index cba5e135bc9a..339b16f062eb 100644
--- a/trunk/arch/metag/include/asm/irqflags.h
+++ b/trunk/arch/metag/include/asm/irqflags.h
@@ -78,16 +78,15 @@ static inline void arch_local_irq_disable(void)
 	asm volatile("MOV TXMASKI,%0\n" : : "r" (flags) : "memory");
 }
 
-static inline void arch_local_irq_enable(void)
-{
 #ifdef CONFIG_SMP
-	preempt_disable();
-	arch_local_irq_restore(get_trigger_mask());
-	preempt_enable_no_resched();
+/* Avoid circular include dependencies through <linux/preempt.h> */
+void arch_local_irq_enable(void);
 #else
+static inline void arch_local_irq_enable(void)
+{
 	arch_local_irq_restore(get_trigger_mask());
-#endif
 }
+#endif
 
 #endif /* (__ASSEMBLY__) */
 
diff --git a/trunk/arch/metag/kernel/traps.c b/trunk/arch/metag/kernel/traps.c
index 1ad363ce1ee9..202be405771e 100644
--- a/trunk/arch/metag/kernel/traps.c
+++ b/trunk/arch/metag/kernel/traps.c
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/preempt.h>
 #include <linux/ptrace.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
@@ -776,17 +777,30 @@ int traps_restore_context(void)
 #endif
 
 #ifdef CONFIG_SMP
-unsigned int get_trigger_mask(void)
+static inline unsigned int _get_trigger_mask(void)
 {
 	unsigned long cpu = smp_processor_id();
 	return per_cpu(trigger_mask, cpu);
 }
 
+unsigned int get_trigger_mask(void)
+{
+	return _get_trigger_mask();
+}
+
 static void set_trigger_mask(unsigned int mask)
 {
 	unsigned long cpu = smp_processor_id();
 	per_cpu(trigger_mask, cpu) = mask;
 }
+
+void arch_local_irq_enable(void)
+{
+	preempt_disable();
+	arch_local_irq_restore(_get_trigger_mask());
+	preempt_enable_no_resched();
+}
+EXPORT_SYMBOL(arch_local_irq_enable);
 #else
 static void set_trigger_mask(unsigned int mask)
 {