Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6baf9e67 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Ingo Molnar
Browse files

irq/work: Improve the flag definitions 



IRQ_WORK_FLAGS is defined simply to 3UL. This is confusing as it
says nothing about its purpose. Define IRQ_WORK_FLAGS as a bitwise
OR of IRQ_WORK_PENDING and IRQ_WORK_BUSY and change its name to
IRQ_WORK_CLAIMED.

While we're at it: use the BIT() macro for all flags.

Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1515125996-21564-1-git-send-email-frederic@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b2cd1df6

include/linux/irq_work.h

+7 −4
Original line number Diff line number Diff line
@@ -13,10 +13,13 @@ 
 * busy      NULL, 2 -> {free, claimed} : callback in progress, can be claimed

 */



#define IRQ_WORK_PENDING	1UL

#define IRQ_WORK_BUSY		2UL

#define IRQ_WORK_FLAGS		3UL

#define IRQ_WORK_LAZY		4UL /* Doesn't want IPI, wait for tick */

#define IRQ_WORK_PENDING	BIT(0)

#define IRQ_WORK_BUSY		BIT(1)



/* Doesn't want IPI, wait for tick: */

#define IRQ_WORK_LAZY		BIT(2)



#define IRQ_WORK_CLAIMED	(IRQ_WORK_PENDING | IRQ_WORK_BUSY)



struct irq_work {

	unsigned long flags;

kernel/irq_work.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static bool irq_work_claim(struct irq_work *work) 
	 */

	flags = work->flags & ~IRQ_WORK_PENDING;

	for (;;) {

		nflags = flags | IRQ_WORK_FLAGS;

		nflags = flags | IRQ_WORK_CLAIMED;

		oflags = cmpxchg(&work->flags, flags, nflags);

		if (oflags == flags)

			break;