summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Murzin <vladimir.murzin@arm.com>2015-09-08 22:00:16 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-08 22:35:28 (GMT)
commit06f805965fc205e27681eee99fd2376fafd8da65 (patch)
treecc2d05c52272cad4e45889a77e7fd4f86cc2f441
parent83b4b0bb635eee2b8e075062e4e008d1bc110ed7 (diff)
downloadlinux-06f805965fc205e27681eee99fd2376fafd8da65.tar.xz
memtest: use kstrtouint instead of simple_strtoul
Since simple_strtoul is obsolete and memtest_pattern is type of int, use kstrtouint instead. Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Cc: Leon Romanovsky <leon@leon.nu> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memtest.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mm/memtest.c b/mm/memtest.c
index 0a1cc13..20e8361 100644
--- a/mm/memtest.c
+++ b/mm/memtest.c
@@ -89,16 +89,18 @@ static void __init do_one_pass(u64 pattern, phys_addr_t start, phys_addr_t end)
}
/* default is disabled */
-static int memtest_pattern __initdata;
+static unsigned int memtest_pattern __initdata;
static int __init parse_memtest(char *arg)
{
+ int ret = 0;
+
if (arg)
- memtest_pattern = simple_strtoul(arg, NULL, 0);
+ ret = kstrtouint(arg, 0, &memtest_pattern);
else
memtest_pattern = ARRAY_SIZE(patterns);
- return 0;
+ return ret;
}
early_param("memtest", parse_memtest);