[RFC,14/86] Revert "preempt/dynamic: Fix setup_preempt_mode() return value"

Commit Message

Ankur Arora Nov. 7, 2023, 9:57 p.m. UTC

This reverts commit 9ed20bafc85806ca6c97c9128cec46c3ef80ae86.

Signed-off-by: Ankur Arora <[e-mail]>
---
 kernel/sched/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Steven Rostedt Nov. 7, 2023, 11:20 p.m. UTC | #1

On Tue,  7 Nov 2023 13:57:00 -0800
Ankur Arora <[e-mail]> wrote:

> This reverts commit 9ed20bafc85806ca6c97c9128cec46c3ef80ae86.

Note, it's better to just do a big revert of related code than to have to
revert every individual commit.

You can do one big commit that states:

This reverts commits:

  ....

And list the commits.

That is, for commits that affect a single file, do not cherry-pick commits
to remove, just remove them all in one go.

-- Steve


> 
> Signed-off-by: Ankur Arora <[e-mail]>
> ---
>  kernel/sched/core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index f8bbddd729db..50e1133cacc9 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -7062,11 +7062,11 @@ static int __init setup_preempt_mode(char *str)
>  	int mode = sched_dynamic_mode(str);
>  	if (mode < 0) {
>  		pr_warn("Dynamic Preempt: unsupported mode: %s\n", str);
> -		return 0;
> +		return 1;
>  	}
>  
>  	sched_dynamic_update(mode);
> -	return 1;
> +	return 0;
>  }
>  __setup("preempt=", setup_preempt_mode);
>

Patch

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f8bbddd729db..50e1133cacc9 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7062,11 +7062,11 @@  static int __init setup_preempt_mode(char *str)
 	int mode = sched_dynamic_mode(str);
 	if (mode < 0) {
 		pr_warn("Dynamic Preempt: unsupported mode: %s\n", str);
-		return 0;
+		return 1;
 	}
 
 	sched_dynamic_update(mode);
-	return 1;
+	return 0;
 }
 __setup("preempt=", setup_preempt_mode);