Commit 06579b8e authored by Andrew Halaney's avatar Andrew Halaney Committed by Xia Fukun
Browse files

preempt/dynamic: Fix setup_preempt_mode() return value 

mainline inclusion
from mainline-v6.5-rc7
commit 9ed20baf
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8BAX7


CVE: NA

--------------------------------

__setup() callbacks expect 1 for success and 0 for failure. Correct the
usage here to reflect that.

Fixes: 826bfeb3 ("preempt/dynamic: Support dynamic preempt with preempt= boot option")
Reported-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20211203233203.133581-1-ahalaney@redhat.com


Signed-off-by: default avatarXia Fukun <xiafukun@huawei.com>
parent 3e491e57

kernel/sched/core.c

+2 −2
Original line number Diff line number Diff line
@@ -5794,11 +5794,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 1;

		return 0;

	}



	sched_dynamic_update(mode);

	return 0;

	return 1;

}

__setup("preempt=", setup_preempt_mode);