aboutsummaryrefslogtreecommitdiffstats
path: root/mm
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
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')
-rw-r--r--mm/huge_memory.c8
-rw-r--r--mm/hugetlb.c4
-rw-r--r--mm/kmemleak.c2
-rw-r--r--mm/ksm.c6
-rw-r--r--mm/slub.c8
5 files changed, 14 insertions, 14 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index a92012a71702..8b7fc2025e04 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -417,7 +417,7 @@ static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
417 unsigned long msecs; 417 unsigned long msecs;
418 int err; 418 int err;
419 419
420 err = strict_strtoul(buf, 10, &msecs); 420 err = kstrtoul(buf, 10, &msecs);
421 if (err || msecs > UINT_MAX) 421 if (err || msecs > UINT_MAX)
422 return -EINVAL; 422 return -EINVAL;
423 423
@@ -444,7 +444,7 @@ static ssize_t alloc_sleep_millisecs_store(struct kobject *kobj,
444 unsigned long msecs; 444 unsigned long msecs;
445 int err; 445 int err;
446 446
447 err = strict_strtoul(buf, 10, &msecs); 447 err = kstrtoul(buf, 10, &msecs);
448 if (err || msecs > UINT_MAX) 448 if (err || msecs > UINT_MAX)
449 return -EINVAL; 449 return -EINVAL;
450 450
@@ -470,7 +470,7 @@ static ssize_t pages_to_scan_store(struct kobject *kobj,
470 int err; 470 int err;
471 unsigned long pages; 471 unsigned long pages;
472 472
473 err = strict_strtoul(buf, 10, &pages); 473 err = kstrtoul(buf, 10, &pages);
474 if (err || !pages || pages > UINT_MAX) 474 if (err || !pages || pages > UINT_MAX)
475 return -EINVAL; 475 return -EINVAL;
476 476
@@ -538,7 +538,7 @@ static ssize_t khugepaged_max_ptes_none_store(struct kobject *kobj,
538 int err; 538 int err;
539 unsigned long max_ptes_none; 539 unsigned long max_ptes_none;
540 540
541 err = strict_strtoul(buf, 10, &max_ptes_none); 541 err = kstrtoul(buf, 10, &max_ptes_none);
542 if (err || max_ptes_none > HPAGE_PMD_NR-1) 542 if (err || max_ptes_none > HPAGE_PMD_NR-1)
543 return -EINVAL; 543 return -EINVAL;
544 544
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index b60f33080a28..6e514831bda5 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1526,7 +1526,7 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy,
1526 struct hstate *h; 1526 struct hstate *h;
1527 NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); 1527 NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY);
1528 1528
1529 err = strict_strtoul(buf, 10, &count); 1529 err = kstrtoul(buf, 10, &count);
1530 if (err) 1530 if (err)
1531 goto out; 1531 goto out;
1532 1532
@@ -1617,7 +1617,7 @@ static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj,
1617 if (h->order >= MAX_ORDER) 1617 if (h->order >= MAX_ORDER)
1618 return -EINVAL; 1618 return -EINVAL;
1619 1619
1620 err = strict_strtoul(buf, 10, &input); 1620 err = kstrtoul(buf, 10, &input);
1621 if (err) 1621 if (err)
1622 return err; 1622 return err;
1623 1623
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index c8d7f3110fd0..e126b0ef9ad2 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1639,7 +1639,7 @@ static ssize_t kmemleak_write(struct file *file, const char __user *user_buf,
1639 else if (strncmp(buf, "scan=", 5) == 0) { 1639 else if (strncmp(buf, "scan=", 5) == 0) {
1640 unsigned long secs; 1640 unsigned long secs;
1641 1641
1642 ret = strict_strtoul(buf + 5, 0, &secs); 1642 ret = kstrtoul(buf + 5, 0, &secs);
1643 if (ret < 0) 1643 if (ret < 0)
1644 goto out; 1644 goto out;
1645 stop_scan_thread(); 1645 stop_scan_thread();
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)
diff --git a/mm/slub.c b/mm/slub.c
index e3ba1f2cf60c..51df8272cfaf 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4420,7 +4420,7 @@ static ssize_t order_store(struct kmem_cache *s,
4420 unsigned long order; 4420 unsigned long order;
4421 int err; 4421 int err;
4422 4422
4423 err = strict_strtoul(buf, 10, &order); 4423 err = kstrtoul(buf, 10, &order);
4424 if (err) 4424 if (err)
4425 return err; 4425 return err;
4426 4426
@@ -4448,7 +4448,7 @@ static ssize_t min_partial_store(struct kmem_cache *s, const char *buf,
4448 unsigned long min; 4448 unsigned long min;
4449 int err; 4449 int err;
4450 4450
4451 err = strict_strtoul(buf, 10, &min); 4451 err = kstrtoul(buf, 10, &min);
4452 if (err) 4452 if (err)
4453 return err; 4453 return err;
4454 4454
@@ -4468,7 +4468,7 @@ static ssize_t cpu_partial_store(struct kmem_cache *s, const char *buf,
4468 unsigned long objects; 4468 unsigned long objects;
4469 int err; 4469 int err;
4470 4470
4471 err = strict_strtoul(buf, 10, &objects); 4471 err = kstrtoul(buf, 10, &objects);
4472 if (err) 4472 if (err)
4473 return err; 4473 return err;
4474 if (objects && !kmem_cache_has_cpu_partial(s)) 4474 if (objects && !kmem_cache_has_cpu_partial(s))
@@ -4784,7 +4784,7 @@ static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s,
4784 unsigned long ratio; 4784 unsigned long ratio;
4785 int err; 4785 int err;
4786 4786
4787 err = strict_strtoul(buf, 10, &ratio); 4787 err = kstrtoul(buf, 10, &ratio);
4788 if (err) 4788 if (err)
4789 return err; 4789 return err;
4790 4790