[Devel] [PATCH RHEL7 COMMIT] mm, kasan: fix compilation for CONFIG_SLAB

Konstantin Khorenko khorenko at virtuozzo.com
Fri Sep 15 17:14:50 MSK 2017


The commit is pushed to "branch-rh7-3.10.0-693.1.1.vz7.37.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.1.1.vz7.37.4
------>
commit 58c1f79b33a79d9ac319c8d37b8c89f8a35c750b
Author: Alexander Potapenko <glider at google.com>
Date:   Fri Sep 15 17:14:50 2017 +0300

    mm, kasan: fix compilation for CONFIG_SLAB
    
    Add the missing argument to set_track().
    
    Fixes: cd11016e5f52 ("mm, kasan: stackdepot implementation. Enable stackdepot for SLAB")
    Signed-off-by: Alexander Potapenko <glider at google.com>
    Cc: Andrey Konovalov <adech.fo at gmail.com>
    Cc: Christoph Lameter <cl at linux.com>
    Cc: Dmitry Vyukov <dvyukov at google.com>
    Cc: Andrey Ryabinin <ryabinin.a.a at gmail.com>
    Cc: Steven Rostedt <rostedt at goodmis.org>
    Cc: Joonsoo Kim <iamjoonsoo.kim at lge.com>
    Cc: Konstantin Serebryany <kcc at google.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    
    https://jira.sw.ru/browse/PSBM-69081
    (cherry picked from commit 0b355eaaaae9bb8bb08b563ef55ecb23a4d743da)
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
---
 mm/kasan/kasan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c
index 82c8d58..8805ce6 100644
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
@@ -475,7 +475,7 @@ void kasan_slab_free(struct kmem_cache *cache, void *object)
 		struct kasan_alloc_meta *alloc_info =
 			get_alloc_info(cache, object);
 		alloc_info->state = KASAN_STATE_FREE;
-		set_track(&free_info->track);
+		set_track(&free_info->track, GFP_NOWAIT);
 	}
 #endif
 


More information about the Devel mailing list