[Devel] [PATCH RHEL7 COMMIT] ms/include/linux/kmemleak.h: needs slab.h

Konstantin Khorenko khorenko at virtuozzo.com
Wed Nov 18 07:06:19 PST 2015


The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.9.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.9.10
------>
commit fc1f580f2f91a79f1e3d3d9ea261adf0b5aafd3b
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed Nov 18 19:06:19 2015 +0400

    ms/include/linux/kmemleak.h: needs slab.h
    
    include/linux/kmemleak.h: In function 'kmemleak_alloc_recursive':
    include/linux/kmemleak.h:43: error: 'SLAB_NOLEAKTRACE' undeclared (first use in this function)
    
    Cc: Joonsoo Kim <iamjoonsoo.kim at lge.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    (cherry picked from commit 66f2ca7e3f59312888131546176b42d6e248558a)
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
---
 include/linux/kmemleak.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
index 2a5e554..3345de3 100644
--- a/include/linux/kmemleak.h
+++ b/include/linux/kmemleak.h
@@ -21,6 +21,8 @@
 #ifndef __KMEMLEAK_H
 #define __KMEMLEAK_H
 
+#include <linux/slab.h>
+
 #ifdef CONFIG_DEBUG_KMEMLEAK
 
 extern void kmemleak_init(void) __ref;


More information about the Devel mailing list