mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Sebastian Andrzej Siewior" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	Thomas Gleixner <tglx@linutronix.de>, x86 <x86@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [tip: smp/urgent] smp: Remove superfluous cond_func check in smp_call_function_many_cond()
Date: Tue, 28 Jan 2020 14:46:38 -0000	[thread overview]
Message-ID: <158022279803.396.3667557782682322607.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200127083915.434tdkztorkklpdu@linutronix.de>

The following commit has been merged into the smp/urgent branch of tip:

Commit-ID:     25a3a15417cf4311f812f5a2b18c5fc2809f66d7
Gitweb:        https://git.kernel.org/tip/25a3a15417cf4311f812f5a2b18c5fc2809f66d7
Author:        Sebastian Andrzej Siewior <bigeasy@linutronix.de>
AuthorDate:    Mon, 27 Jan 2020 09:39:15 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 28 Jan 2020 15:43:00 +01:00

smp: Remove superfluous cond_func check in smp_call_function_many_cond()

It was requested to remove the cond_func check but the follow up patch was
overlooked. Remove it now.

Fixes: 67719ef25eeb ("smp: Add a smp_cond_func_t argument to smp_call_function_many()")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20200127083915.434tdkztorkklpdu@linutronix.de

---
 kernel/smp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/smp.c b/kernel/smp.c
index 3b7bedc..d0ada39 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -435,7 +435,7 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
 
 	/* Fastpath: do that cpu by itself. */
 	if (next_cpu >= nr_cpu_ids) {
-		if (!cond_func || (cond_func && cond_func(cpu, info)))
+		if (!cond_func || cond_func(cpu, info))
 			smp_call_function_single(cpu, func, info, wait);
 		return;
 	}

  reply	other threads:[~2020-01-28 14:46 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-17  9:01 [PATCH 0/3] smp: Avoid memory allocation in on_each_cpu_cond() Sebastian Andrzej Siewior
2020-01-17  9:01 ` [PATCH 1/3] smp: Use smp_cond_func_t as type for the conditional function Sebastian Andrzej Siewior
2020-01-24 19:45   ` [tip: smp/core] " tip-bot2 for Sebastian Andrzej Siewior
2020-01-17  9:01 ` [PATCH 2/3] smp: Add a smp_cond_func_t argument to smp_call_function_many() Sebastian Andrzej Siewior
2020-01-17 13:15   ` Peter Zijlstra
2020-01-17 14:41     ` [PATCH 2/3 v2] " Sebastian Andrzej Siewior
2020-01-24 19:45   ` [tip: smp/core] " tip-bot2 for Sebastian Andrzej Siewior
2020-01-27  8:39     ` [PATCH] smp: Remove superfluous cond_func check in smp_call_function_many_cond() Sebastian Andrzej Siewior
2020-01-28 14:46       ` tip-bot2 for Sebastian Andrzej Siewior [this message]
2020-01-17  9:01 ` [PATCH 3/3] smp: Remove allocation mask from on_each_cpu_cond.*() Sebastian Andrzej Siewior
2020-01-24 19:45   ` [tip: smp/core] " tip-bot2 for Sebastian Andrzej Siewior
2020-01-17 15:00 ` [PATCH 0/3] smp: Avoid memory allocation in on_each_cpu_cond() Peter Zijlstra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=158022279803.396.3667557782682322607.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bigeasy@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®