diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-08 23:51:05 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-08 23:51:05 (GMT) |
| commit | 0f386a7074aa758720a4fc1fa26123044849bcc6 (patch) | |
| tree | 5a38c79aeac28587548c8a6635269c1c6b3b5012 /arch | |
| parent | ce7613db2d8d4d5af2587ab5d7090055c4562201 (diff) | |
| parent | ffddc5fd19b219f557fd4a81168ce8784a4faced (diff) | |
| download | linux-0f386a7074aa758720a4fc1fa26123044849bcc6.tar.xz | |
Merge branch 'akpm' (incoming from Andrew)
Merge a few more patches from Andrew Morton:
"A few leftovers"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
fs/ncpfs/dir.c: fix indenting in ncp_lookup()
ncpfs/inode.c: fix mismatch printk formats and arguments
ncpfs: remove now unused PRINTK macro
ncpfs: convert PPRINTK to ncp_vdbg
ncpfs: convert DPRINTK/DDPRINTK to ncp_dbg
ncpfs: Add pr_fmt and convert printks to pr_<level>
arch/x86/mm/kmemcheck/kmemcheck.c: use kstrtoint() instead of sscanf()
lib/percpu_counter.c: fix bad percpu counter state during suspend
autofs4: check dev ioctl size before allocating
mm: vmscan: do not swap anon pages just because free+file is low
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/kmemcheck/kmemcheck.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c index d87dd6d..dd89a13 100644 --- a/arch/x86/mm/kmemcheck/kmemcheck.c +++ b/arch/x86/mm/kmemcheck/kmemcheck.c @@ -78,10 +78,16 @@ early_initcall(kmemcheck_init); */ static int __init param_kmemcheck(char *str) { + int val; + int ret; + if (!str) return -EINVAL; - sscanf(str, "%d", &kmemcheck_enabled); + ret = kstrtoint(str, 0, &val); + if (ret) + return ret; + kmemcheck_enabled = val; return 0; } |