projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
kmemleak.c
diff --git
a/mm/kmemleak.c
b/mm/kmemleak.c
index
c8d7f31
..
e126b0e
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 =
k
strtoul(buf + 5, 0, &secs);
if (ret < 0)
goto out;
stop_scan_thread();