]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
metag: move irq enable out of irqflags.h on SMP
authorJames Hogan <james.hogan@imgtec.com>
Tue, 12 Feb 2013 16:04:53 +0000 (16:04 +0000)
committerJames Hogan <james.hogan@imgtec.com>
Sat, 2 Mar 2013 20:11:14 +0000 (20:11 +0000)
commitfa771d029af8f8a23089c97b6ab6a5745e98ad7e
tree949fbbe9278e5da6711d2da055888e82772c2a62
parent97c3ec63089fdcd2abf66619b913900909841dc0
metag: move irq enable out of irqflags.h on SMP

The SMP version of arch_local_irq_enable() uses preempt_disable(), but
<asm/irqflags.h> doesn't include <linux/preempt.h> causing the following
errors on SMP when pstore/ftrace is enabled (caught by buildbot smp
allyesconfig):

In file included from include/linux/irqflags.h:15,
                 from fs/pstore/ftrace.c:16:
arch/metag/include/asm/irqflags.h: In function 'arch_local_irq_enable':
arch/metag/include/asm/irqflags.h:84: error: implicit declaration of function 'preempt_disable'
arch/metag/include/asm/irqflags.h:86: error: implicit declaration of function 'preempt_enable_no_resched'

However <linux/preempt.h> cannot be easily included from
<asm/irqflags.h> as it can cause circular include dependencies in the
!SMP case, and potentially in the SMP case in the future. Therefore move
the SMP implementation of arch_local_irq_enable() into traps.c and use
an inline version of get_trigger_mask() which is also defined in traps.c
for SMP.

This adds an extra layer of function call / stack push when
preempt_disable needs to call other functions, however in the
non-preemptive SMP case it should be about as fast, as it was already
calling the get_trigger_mask() function which is now used inline.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
arch/metag/include/asm/irqflags.h
arch/metag/kernel/traps.c