From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752278AbdJMRIW (ORCPT ); Fri, 13 Oct 2017 13:08:22 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:54056 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751543AbdJMRIV (ORCPT ); Fri, 13 Oct 2017 13:08:21 -0400 X-Google-Smtp-Source: AOwi7QAxJ8sCNoOmrP4PSKNVkqCpYWpVp7/ikobWvkQKbmGpCxGUU4o0RqnP3mn8kAVb8ezCvHORDA== Date: Fri, 13 Oct 2017 13:09:17 -0400 From: Tim Hansen To: sagi@grimberg.me Cc: mingo@kernel.org, neilb@suse.com, devtimhansen@gmail.com, alexander.levin@one.verizon.com, thumshirn@suse.de, linux-kernel@vger.kernel.org Subject: [PATCH] kernel/softirq: use BUG_ON conditional instead of BUG in softirq. Message-ID: <20171013170917.GA144590@debian> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix BUG() usage to BUG_ON(conditional) usage in softirq. Found with make coccicheck M=kernel/ on linux-next tag next-20171012. Signed-off-by: Tim Hansen --- kernel/softirq.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 4e09821..3da3f12 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -513,9 +513,8 @@ static __latent_entropy void tasklet_action(struct softirq_action *a) if (tasklet_trylock(t)) { if (!atomic_read(&t->count)) { - if (!test_and_clear_bit(TASKLET_STATE_SCHED, - &t->state)) - BUG(); + BUG_ON(!test_and_clear_bit(TASKLET_STATE_SCHED, + &t->state)); t->func(t->data); tasklet_unlock(t); continue; @@ -549,9 +548,8 @@ static __latent_entropy void tasklet_hi_action(struct softirq_action *a) if (tasklet_trylock(t)) { if (!atomic_read(&t->count)) { - if (!test_and_clear_bit(TASKLET_STATE_SCHED, - &t->state)) - BUG(); + BUG_ON(!test_and_clear_bit(TASKLET_STATE_SCHED, + &t->state)); t->func(t->data); tasklet_unlock(t); continue; -- 2.1.4