From: Frederic Weisbecker <[email protected]> Using the bottom-half masking APIs defined in linux/bottom-half.h won't be possible without passing the relevant softirq vectors that are currently defined in linux/interrupt.h
Yet we can't include linux/interrupt.h from linux/bottom-half.h due to circular dependencies. Now the vector bits belong to bottom halves anyway, so moving them there is more natural and avoid nasty header dances. Reviewed-by: David S. Miller <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Cc: Joel Fernandes <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Pavan Kondeti <[email protected]> Cc: Paul E . McKenney <[email protected]> Cc: David S . Miller <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Sebastian Andrzej Siewior <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> --- include/linux/bottom_half.h | 24 ++++++++++++++++++++++++ include/linux/interrupt.h | 21 --------------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h index a104f815efcf..39aaf9189226 100644 --- a/include/linux/bottom_half.h +++ b/include/linux/bottom_half.h @@ -4,6 +4,30 @@ #include <linux/preempt.h> + +/* + * PLEASE, avoid to allocate new softirqs, if you need not _really_ high + * frequency threaded job scheduling. For almost all the purposes + * tasklets are more than enough. F.e. all serial device BHs et + * al. should be converted to tasklets, not to softirqs. + */ +enum +{ +#define SOFTIRQ_VECTOR(__SVEC) \ + __SVEC##_SOFTIRQ, +#include <linux/softirq_vector.h> +#undef SOFTIRQ_VECTOR + NR_SOFTIRQS +}; + +#define SOFTIRQ_STOP_IDLE_MASK (~(1 << RCU_SOFTIRQ)) +#define SOFTIRQ_ALL_MASK (BIT(NR_SOFTIRQS) - 1) + +#define SOFTIRQ_ENABLED_SHIFT 16 +#define SOFTIRQ_PENDING_MASK (BIT(SOFTIRQ_ENABLED_SHIFT) - 1) + + + #ifdef CONFIG_TRACE_IRQFLAGS extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt); #else diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 0c3590e4fcac..1f4bd62ae218 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -457,27 +457,6 @@ extern bool force_irqthreads; #define hard_irq_disable() do { } while(0) #endif -/* PLEASE, avoid to allocate new softirqs, if you need not _really_ high - frequency threaded job scheduling. For almost all the purposes - tasklets are more than enough. F.e. all serial device BHs et - al. should be converted to tasklets, not to softirqs. - */ -enum -{ -#define SOFTIRQ_VECTOR(__SVEC) \ - __SVEC##_SOFTIRQ, -#include <linux/softirq_vector.h> -#undef SOFTIRQ_VECTOR - NR_SOFTIRQS -}; - -#define SOFTIRQ_STOP_IDLE_MASK (~(1 << RCU_SOFTIRQ)) -#define SOFTIRQ_ALL_MASK (BIT(NR_SOFTIRQS) - 1) - -#define SOFTIRQ_ENABLED_SHIFT 16 -#define SOFTIRQ_PENDING_MASK (BIT(SOFTIRQ_ENABLED_SHIFT) - 1) - - #ifndef local_softirq_data #ifndef local_softirq_data_ref -- 2.21.0
