aboutsummaryrefslogtreecommitdiffstats
path: root/mm/ksm.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-11 17:20:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 18:57:11 -0400
commit3dbb95f7895e378514ffefa93cc887fb1bc9df94 (patch)
tree486dc488c1179eba79a1c3a9e31552b62a03290b /mm/ksm.c
parent6df46865ff8715932e7d42e52cac17e8461758cb (diff)
mm: replace strict_strtoul() with kstrtoul()
The use of strict_strtoul() is not preferred, because strict_strtoul() is obsolete. Thus, kstrtoul() should be used. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/ksm.c')
-rw-r--r--mm/ksm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/ksm.c b/mm/ksm.c
index b6afe0c440d8..0bea2b262a47 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2194,7 +2194,7 @@ static ssize_t sleep_millisecs_store(struct kobject *kobj,
2194 unsigned long msecs; 2194 unsigned long msecs;
2195 int err; 2195 int err;
2196 2196
2197 err = strict_strtoul(buf, 10, &msecs); 2197 err = kstrtoul(buf, 10, &msecs);
2198 if (err || msecs > UINT_MAX) 2198 if (err || msecs > UINT_MAX)
2199 return -EINVAL; 2199 return -EINVAL;
2200 2200
@@ -2217,7 +2217,7 @@ static ssize_t pages_to_scan_store(struct kobject *kobj,
2217 int err; 2217 int err;
2218 unsigned long nr_pages; 2218 unsigned long nr_pages;
2219 2219
2220 err = strict_strtoul(buf, 10, &nr_pages); 2220 err = kstrtoul(buf, 10, &nr_pages);
2221 if (err || nr_pages > UINT_MAX) 2221 if (err || nr_pages > UINT_MAX)
2222 return -EINVAL; 2222 return -EINVAL;
2223 2223
@@ -2239,7 +2239,7 @@ static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
2239 int err; 2239 int err;
2240 unsigned long flags; 2240 unsigned long flags;
2241 2241
2242 err = strict_strtoul(buf, 10, &flags); 2242 err = kstrtoul(buf, 10, &flags);
2243 if (err || flags > UINT_MAX) 2243 if (err || flags > UINT_MAX)
2244 return -EINVAL; 2244 return -EINVAL;
2245 if (flags > KSM_RUN_UNMERGE) 2245 if (flags > KSM_RUN_UNMERGE)