diff options
| -rw-r--r-- | arch/metag/include/asm/irqflags.h | 11 | ||||
| -rw-r--r-- | arch/metag/kernel/traps.c | 16 |
2 files changed, 20 insertions, 7 deletions
diff --git a/arch/metag/include/asm/irqflags.h b/arch/metag/include/asm/irqflags.h index cba5e135bc9a..339b16f062eb 100644 --- a/arch/metag/include/asm/irqflags.h +++ b/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/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c index 1ad363ce1ee9..202be405771e 100644 --- a/arch/metag/kernel/traps.c +++ b/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) { |