summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhijit Pawar <abhi.c.pawar@gmail.com>2012-12-18 14:23:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-18 15:02:15 -0800
commitdc053733ea44babedb20266300b984d6add8b9e5 (patch)
tree4206349761194b05f17c3d120b3b5dd1c110e729
parent79a4dcefd3256896416f5a94d2d1442a7f5aa9b8 (diff)
downloadlinux-stable-dc053733ea44babedb20266300b984d6add8b9e5.tar.gz
linux-stable-dc053733ea44babedb20266300b984d6add8b9e5.tar.bz2
linux-stable-dc053733ea44babedb20266300b984d6add8b9e5.zip
mm/kmemleak.c: remove obsolete simple_strtoul
Replace the obsolete simple_strtoul() with kstrtoul(). Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/kmemleak.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index a217cc544060..752a705c77c2 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1556,7 +1556,8 @@ static int dump_str_object_info(const char *str)
struct kmemleak_object *object;
unsigned long addr;
- addr= simple_strtoul(str, NULL, 0);
+ if (kstrtoul(str, 0, &addr))
+ return -EINVAL;
object = find_and_get_object(addr, 0);
if (!object) {
pr_info("Unknown object at 0x%08lx\n", addr);