• James Hogan's avatar
    metag: move irq enable out of irqflags.h on SMP · fa771d02
    James Hogan authored
    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
    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: default avatarJames Hogan <james.hogan@imgtec.com>
traps.c 24.4 KB