Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus

[linux-drm-fsl-dcu.git] / mm / kmemleak.c

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index c8d7f3110fd0002cc1c2b85061c163ba7183bfc4..e126b0ef9ad20023d6a8d3ff505ae71ad96fdaa0 100644 (file)
--- 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,
        else if (strncmp(buf, "scan=", 5) == 0) {
                unsigned long secs;
 
-               ret = strict_strtoul(buf + 5, 0, &secs);
+               ret = kstrtoul(buf + 5, 0, &secs);
                if (ret < 0)
                        goto out;
                stop_scan_thread();