kasan, mm: allow cache merging with no metadata

[linux-2.6-microblaze.git] / mm / kasan / common.c

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 0cd583d..b251676 100644 (file)
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -86,6 +86,17 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark)
 }
 #endif /* CONFIG_KASAN_STACK */
 
+/*
+ * Only allow cache merging when stack collection is disabled and no metadata
+ * is present.
+ */
+slab_flags_t __kasan_never_merge(void)
+{
+       if (kasan_stack_collection_enabled())
+               return SLAB_KASAN;
+       return 0;
+}
+
 void __kasan_alloc_pages(struct page *page, unsigned int order)
 {
        u8 tag;