projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
ksm.c
diff --git
a/mm/ksm.c
b/mm/ksm.c
index
b6afe0c
..
0bea2b2
100644
(file)
--- a/
mm/ksm.c
+++ b/
mm/ksm.c
@@
-2194,7
+2194,7
@@
static ssize_t sleep_millisecs_store(struct kobject *kobj,
unsigned long msecs;
int err;
unsigned long msecs;
int err;
- err =
strict_
strtoul(buf, 10, &msecs);
+ err =
k
strtoul(buf, 10, &msecs);
if (err || msecs > UINT_MAX)
return -EINVAL;
if (err || msecs > UINT_MAX)
return -EINVAL;
@@
-2217,7
+2217,7
@@
static ssize_t pages_to_scan_store(struct kobject *kobj,
int err;
unsigned long nr_pages;
int err;
unsigned long nr_pages;
- err =
strict_
strtoul(buf, 10, &nr_pages);
+ err =
k
strtoul(buf, 10, &nr_pages);
if (err || nr_pages > UINT_MAX)
return -EINVAL;
if (err || nr_pages > UINT_MAX)
return -EINVAL;
@@
-2239,7
+2239,7
@@
static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
int err;
unsigned long flags;
int err;
unsigned long flags;
- err =
strict_
strtoul(buf, 10, &flags);
+ err =
k
strtoul(buf, 10, &flags);
if (err || flags > UINT_MAX)
return -EINVAL;
if (flags > KSM_RUN_UNMERGE)
if (err || flags > UINT_MAX)
return -EINVAL;
if (flags > KSM_RUN_UNMERGE)