| commit | 92d4c21e51fc12736c39c2a161a42f20e2be8a00 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| tree | 0ea63b023a85dff7aeb0895b46d3b22a65669ae1 | |
| parent | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 [diff] [blame] |
Update Linux to v5.10.157 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.157.tar.xz Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: I7b30d9e98d8c465d6b44de8e7433b4a40b3289ba
diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c index 0dd434e..71e5c58 100644 --- a/lib/kunit/try-catch.c +++ b/lib/kunit/try-catch.c
@@ -52,7 +52,7 @@ * If tests timeout due to exceeding sysctl_hung_task_timeout_secs, * the task will be killed and an oops generated. */ - return 300 * MSEC_PER_SEC; /* 5 min */ + return 300 * msecs_to_jiffies(MSEC_PER_SEC); /* 5 min */ } void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)