diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 10:25:34 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 10:25:34 -0500 |
commit | 7e935c7ca1e6c398f11edac5beabfc4348e3b3a4 (patch) | |
tree | 86da864ba6341bd86b5f5450c611f918722237b2 /include/linux/kmemleak.h | |
parent | c62432b40b5e03c25faf2c8f8547bba4908b8945 (diff) | |
parent | e9d408e107db9a554b36c3a79f67b37dd3e16da0 (diff) | |
download | op-kernel-dev-7e935c7ca1e6c398f11edac5beabfc4348e3b3a4.zip op-kernel-dev-7e935c7ca1e6c398f11edac5beabfc4348e3b3a4.tar.gz |
Merge branch 'memdup_user_nul' into work.misc
Diffstat (limited to 'include/linux/kmemleak.h')
-rw-r--r-- | include/linux/kmemleak.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h index d0a1f99..4894c68 100644 --- a/include/linux/kmemleak.h +++ b/include/linux/kmemleak.h @@ -25,7 +25,7 @@ #ifdef CONFIG_DEBUG_KMEMLEAK -extern void kmemleak_init(void) __ref; +extern void kmemleak_init(void) __init; extern void kmemleak_alloc(const void *ptr, size_t size, int min_count, gfp_t gfp) __ref; extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size, |