2021-04-10 07:36:21

by Zhouyi Zhou

Subject: [PATCH] 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.

This patch fix this typo.

Signed-off-by: Zhouyi Zhou <[email protected]>
---
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 8442e5c9cfa2..2003d69bd6d5 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();
--
2.25.1

2021-04-19 09:56:27

by Peter Zijlstra

Subject: Re: [PATCH] preempt/dynamic: fix typo in macro conditional statement

On Sat, Apr 10, 2021 at 03:35:23PM +0800, Zhouyi Zhou wrote:
> 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.
>
> This patch fix this typo.
>
> Signed-off-by: Zhouyi Zhou <[email protected]>

Fixes: 40607ee97e4e ("preempt/dynamic: Provide irqentry_exit_cond_resched() static call")

Thanks!

2021-04-20 10:44:03

by tip-bot2 for Alexey Makhalov

Subject: [tip: sched/urgent] preempt/dynamic: Fix typo in macro conditional statement

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 <[email protected]>
AuthorDate: Sat, 10 Apr 2021 15:35:23 +08:00
Committer: Peter Zijlstra <[email protected]>
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 <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
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();