There is no point in having PREEMPT_ACTIVE and HARDIRQ_BITS defined by an architecture. The PREEMPT_ACTIVE bit manipulation in the low level entry code is historical and has been replaced by preempt_schedule_irq(). The HARDIRQ_BITS constant could be 1 in theory because we run all interrupt handlers with interrupts disabled nowadays. Though we have some palaeontolical drivers (IDE) which still enable interrupts in the interrupt handler, so we need to allow at least some limited nesting. This series converts the remaining low level PREEMPT_ACTIVE users to utilize preempt_schedule_irq() and moves the PREEMPT_ACTIVE and HARDIRQ_BITS defines to the core code. I stumbled over this historical left overs while trying to implement a lazy interrupt disable scheme (which still has some rough edges due to completely braindamaged hardware). Peter, it would be nice if you could pick that up into your preempt/need_resched series. Thanks, tglx --- arch/alpha/include/asm/thread_info.h | 2 - arch/arc/include/asm/thread_info.h | 2 - arch/arm/include/asm/thread_info.h | 6 ---- arch/arm64/include/asm/thread_info.h | 6 ---- arch/avr32/include/asm/thread_info.h | 2 - arch/blackfin/include/asm/hardirq.h | 3 -- arch/blackfin/include/asm/thread_info.h | 2 - arch/c6x/include/asm/thread_info.h | 2 - arch/cris/include/asm/hardirq.h | 12 -------- arch/cris/include/asm/thread_info.h | 2 - arch/frv/include/asm/thread_info.h | 2 - arch/h8300/include/asm/hardirq.h | 12 -------- arch/h8300/include/asm/thread_info.h | 2 - arch/h8300/kernel/entry.S | 6 ---- arch/hexagon/include/asm/thread_info.h | 4 -- arch/ia64/include/asm/thread_info.h | 3 -- arch/ia64/kernel/entry.S | 15 ---------- arch/m32r/include/asm/hardirq.h | 16 ----------- arch/m32r/include/asm/thread_info.h | 2 - arch/m32r/kernel/entry.S | 8 ----- arch/m68k/include/asm/hardirq.h | 11 -------- arch/m68k/include/asm/thread_info.h | 2 - arch/metag/include/asm/thread_info.h | 2 - arch/microblaze/include/asm/thread_info.h | 2 - arch/mips/include/asm/thread_info.h | 2 - arch/mn10300/include/asm/thread_info.h | 2 - arch/parisc/include/asm/thread_info.h | 3 -- arch/powerpc/include/asm/thread_info.h | 2 - arch/s390/include/asm/hardirq.h | 2 - arch/s390/include/asm/thread_info.h | 2 - arch/score/include/asm/thread_info.h | 2 - arch/sh/include/asm/thread_info.h | 2 - arch/sh/kernel/entry-common.S | 6 +--- arch/sparc/include/asm/hardirq_32.h | 1 arch/sparc/include/asm/hardirq_64.h | 2 - arch/sparc/include/asm/thread_info_32.h | 2 - arch/sparc/include/asm/thread_info_64.h | 2 - arch/sparc/kernel/rtrap_64.S | 5 --- arch/tile/include/asm/hardirq.h | 2 - arch/tile/include/asm/thread_info.h | 2 - arch/um/include/asm/thread_info.h | 2 - arch/unicore32/include/asm/thread_info.h | 6 ---- arch/x86/include/asm/thread_info.h | 2 - arch/xtensa/include/asm/thread_info.h | 2 - include/linux/preempt_mask.h | 41 ++++++++---------------------- 45 files changed, 17 insertions(+), 201 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html