Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / arch / x86 / kernel / dumpstack.c

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index b74ebc7c4402e7eff3b21f4b87ba514e0c017056..cf3df1d8d039e5d1689417e04c56bcb7057ae754 100644 (file)
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -265,7 +265,10 @@ int __die(const char *str, struct pt_regs *regs, long err)
        printk("SMP ");
 #endif
 #ifdef CONFIG_DEBUG_PAGEALLOC
-       printk("DEBUG_PAGEALLOC");
+       printk("DEBUG_PAGEALLOC ");
+#endif
+#ifdef CONFIG_KASAN
+       printk("KASAN");
 #endif
        printk("\n");
        if (notify_die(DIE_OOPS, str, regs, err,