Messages in this thread Patch in this message | | | From | Frederic Weisbecker <> | Subject | [RFC PATCH 04/30] softirq: Normalize softirq_pending naming scheme | Date | Thu, 11 Oct 2018 01:11:51 +0200 |
| |
From: Frederic Weisbecker <fweisbec@gmail.com>
Use the subsystem as the prefix to name the __softirq_data accessors. They are going to be extended and want a more greppable and standard naming sheme.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: David S. Miller <davem@davemloft.net> Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> --- arch/s390/include/asm/hardirq.h | 4 ++-- include/linux/interrupt.h | 4 ++-- kernel/softirq.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h index e26325f..3103680 100644 --- a/arch/s390/include/asm/hardirq.h +++ b/arch/s390/include/asm/hardirq.h @@ -14,8 +14,8 @@ #include <asm/lowcore.h> #define local_softirq_pending() (S390_lowcore.softirq_data) -#define set_softirq_pending(x) (S390_lowcore.softirq_data = (x)) -#define or_softirq_pending(x) (S390_lowcore.softirq_data |= (x)) +#define softirq_pending_set(x) (S390_lowcore.softirq_data = (x)) +#define softirq_pending_or(x) (S390_lowcore.softirq_data |= (x)) #define __ARCH_IRQ_STAT #define __ARCH_HAS_DO_SOFTIRQ diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 1de87ec..fc88f0d 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -474,8 +474,8 @@ enum #endif #define local_softirq_pending() (__this_cpu_read(local_softirq_data_ref)) -#define set_softirq_pending(x) (__this_cpu_write(local_softirq_data_ref, (x))) -#define or_softirq_pending(x) (__this_cpu_or(local_softirq_data_ref, (x))) +#define softirq_pending_set(x) (__this_cpu_write(local_softirq_data_ref, (x))) +#define softirq_pending_or(x) (__this_cpu_or(local_softirq_data_ref, (x))) #endif /* local_softirq_pending */ diff --git a/kernel/softirq.c b/kernel/softirq.c index 6f58486..c39af4a 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -271,7 +271,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void) restart: /* Reset the pending bitmask before enabling irqs */ - set_softirq_pending(0); + softirq_pending_set(0); local_irq_enable(); @@ -448,7 +448,7 @@ void raise_softirq(unsigned int nr) void __raise_softirq_irqoff(unsigned int nr) { trace_softirq_raise(nr); - or_softirq_pending(1UL << nr); + softirq_pending_or(1UL << nr); } void open_softirq(int nr, void (*action)(struct softirq_action *)) -- 2.7.4
| |