aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Pennucci <decimalman@gmail.com>2016-07-06 11:12:43 -0400
committerMister Oyster <oysterized@gmail.com>2017-04-11 10:57:22 +0200
commit282aa3a65f391e48f4158b3ce6d7a14808e2beed (patch)
treea9fecd70261a1d2e00a2a4f6583cb29b1038baaf
parentcaf69bed3586dbc7e52e11ddd516aad261639b69 (diff)
mm: limit UKSM sleep time instead of failing
-rw-r--r--mm/uksm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/uksm.c b/mm/uksm.c
index a9ecc739b..85ce60edf 100644
--- a/mm/uksm.c
+++ b/mm/uksm.c
@@ -4927,9 +4927,12 @@ static ssize_t sleep_millisecs_store(struct kobject *kobj,
int err;
err = strict_strtoul(buf, 10, &msecs);
- if (err || msecs > MSEC_PER_SEC)
+ if (err)
return -EINVAL;
+ if (msecs > MSEC_PER_SEC)
+ msecs = MSEC_PER_SEC;
+
uksm_sleep_jiffies = msecs_to_jiffies(msecs);
return count;