From: "tip-bot2 for Zhouyi Zhou" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Zhouyi Zhou <zhouzhouyi@gmail.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/urgent] preempt/dynamic: Fix typo in macro conditional statement
Date: Tue, 20 Apr 2021 10:40:44 -0000 [thread overview]
Message-ID: <161891524495.29796.16697487389176619561.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210410073523.5493-1-zhouzhouyi@gmail.com>
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 0c89d87d1d43d9fa268d1dc489518564d58bf497
Gitweb: https://git.kernel.org/tip/0c89d87d1d43d9fa268d1dc489518564d58bf497
Author: Zhouyi Zhou <zhouzhouyi@gmail.com>
AuthorDate: Sat, 10 Apr 2021 15:35:23 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Mon, 19 Apr 2021 20:02:57 +02:00
preempt/dynamic: Fix typo in macro conditional statement
Commit 40607ee97e4e ("preempt/dynamic: Provide irqentry_exit_cond_resched()
static call") tried to provide irqentry_exit_cond_resched() static call
in irqentry_exit, but has a typo in macro conditional statement.
Fixes: 40607ee97e4e ("preempt/dynamic: Provide irqentry_exit_cond_resched() static call")
Signed-off-by: Zhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210410073523.5493-1-zhouzhouyi@gmail.com
---
kernel/entry/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index 8442e5c..2003d69 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -422,7 +422,7 @@ noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
instrumentation_begin();
if (IS_ENABLED(CONFIG_PREEMPTION)) {
-#ifdef CONFIG_PREEMT_DYNAMIC
+#ifdef CONFIG_PREEMPT_DYNAMIC
static_call(irqentry_exit_cond_resched)();
#else
irqentry_exit_cond_resched();
prev parent reply other threads:[~2021-04-20 10:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-10 7:35 [PATCH] preempt/dynamic: fix typo in macro conditional statement Zhouyi Zhou
2021-04-19 8:39 ` Peter Zijlstra
2021-04-20 10:40 ` tip-bot2 for Zhouyi Zhou [this message]
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=161891524495.29796.16697487389176619561.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
--cc=zhouzhouyi@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).