kasan: respect CONFIG_KASAN_VMALLOC for kasan_flag_vmalloc

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

diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index 06141bb..80f11a3 100644 (file)
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -57,7 +57,11 @@ enum kasan_mode kasan_mode __ro_after_init;
 EXPORT_SYMBOL_GPL(kasan_mode);
 
 /* Whether to enable vmalloc tagging. */
+#ifdef CONFIG_KASAN_VMALLOC
 DEFINE_STATIC_KEY_TRUE(kasan_flag_vmalloc);
+#else
+DEFINE_STATIC_KEY_FALSE(kasan_flag_vmalloc);
+#endif
 
 #define PAGE_ALLOC_SAMPLE_DEFAULT      1
 #define PAGE_ALLOC_SAMPLE_ORDER_DEFAULT        3
@@ -119,6 +123,9 @@ static int __init early_kasan_flag_vmalloc(char *arg)
        if (!arg)
                return -EINVAL;
 
+       if (!IS_ENABLED(CONFIG_KASAN_VMALLOC))
+               return 0;
+
        if (!strcmp(arg, "off"))
                kasan_arg_vmalloc = KASAN_ARG_VMALLOC_OFF;
        else if (!strcmp(arg, "on"))