From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757603AbeAHUj7 (ORCPT + 1 other); Mon, 8 Jan 2018 15:39:59 -0500 Received: from terminus.zytor.com ([65.50.211.136]:45733 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757089AbeAHUj2 (ORCPT ); Mon, 8 Jan 2018 15:39:28 -0500 Date: Mon, 8 Jan 2018 12:34:02 -0800 From: tip-bot for Bartosz Golaszewski Message-ID: Cc: frederic@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, hpa@zytor.com, andy.shevchenko@gmail.com, brgl@bgdev.pl, mingo@kernel.org, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, tglx@linutronix.de Reply-To: andy.shevchenko@gmail.com, hpa@zytor.com, peterz@infradead.org, torvalds@linux-foundation.org, frederic@kernel.org, tglx@linutronix.de, marc.zyngier@arm.com, mingo@kernel.org, linux-kernel@vger.kernel.org, brgl@bgdev.pl In-Reply-To: <1515125996-21564-1-git-send-email-frederic@kernel.org> References: <1515125996-21564-1-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irq/work: Improve the flag definitions Git-Commit-ID: 6baf9e67c9c5d738188b8490893c7e079d3deb7e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: 6baf9e67c9c5d738188b8490893c7e079d3deb7e Gitweb: https://git.kernel.org/tip/6baf9e67c9c5d738188b8490893c7e079d3deb7e Author: Bartosz Golaszewski AuthorDate: Fri, 5 Jan 2018 05:19:56 +0100 Committer: Ingo Molnar CommitDate: Mon, 8 Jan 2018 19:43:15 +0100 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: Bartosz Golaszewski Signed-off-by: Frederic Weisbecker Reviewed-by: Andy Shevchenko Cc: Linus Torvalds Cc: Marc Zyngier Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1515125996-21564-1-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- include/linux/irq_work.h | 11 +++++++---- kernel/irq_work.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h index 0e81035..b11fcdf 100644 --- a/include/linux/irq_work.h +++ b/include/linux/irq_work.h @@ -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; diff --git a/kernel/irq_work.c b/kernel/irq_work.c index 40e9d73..6b7cdf1 100644 --- a/kernel/irq_work.c +++ b/kernel/irq_work.c @@ -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;