Merge pull request #15 from sched-ext/scx-6.7.6-scx2

v6.7.6-scx2
sched-ext · Feb 26, 2024 · f9bc69a · f9bc69a
2 parents 6fb3d13 + 73acd11
commit f9bc69a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 7
 SUBLEVEL = 6
-EXTRAVERSION = -scx1
+EXTRAVERSION = -scx2
 NAME = Hurr durr I'ma ninja sloth
 
 # *DOCUMENTATION*

diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
@@ -4057,7 +4057,8 @@ static int bpf_scx_init_member(const struct btf_type *t,
 			return -EINVAL;
 		return 1;
 	case offsetof(struct sched_ext_ops, timeout_ms):
-		if (*(u32 *)(udata + moff) > SCX_WATCHDOG_MAX_TIMEOUT)
+		if (msecs_to_jiffies(*(u32 *)(udata + moff)) >
+		    SCX_WATCHDOG_MAX_TIMEOUT)
 			return -E2BIG;
 		ops->timeout_ms = *(u32 *)(udata + moff);
 		return 1;