The patch titled Use WARN() in kernel/panic.c has been added to the -mm tree. Its filename is use-warn-in-kernel-panicc.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Use WARN() in kernel/panic.c From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection. This allowed the if() to be folded entirely into the WARN() Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/panic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN kernel/panic.c~use-warn-in-kernel-panicc kernel/panic.c --- a/kernel/panic.c~use-warn-in-kernel-panicc +++ a/kernel/panic.c @@ -392,10 +392,8 @@ static int __stack_chk_test(void) printk(KERN_INFO "Testing -fstack-protector-all feature\n"); __stack_check_testing = (unsigned long)&__stack_chk_test_func; __stack_chk_test_func(); - if (__stack_check_testing) { - printk(KERN_ERR "-fstack-protector-all test failed\n"); - WARN_ON(1); - } + WARN(__stack_check_testing, + KERN_ERR "-fstack-protector-all test failed\n"); return 0; } /* _ Patches currently in -mm which might be from arjan@xxxxxxxxxxxxxxx are linux-next.patch via-velocity-fix-sleep-with-spinlock-bug-during-mtu-change.patch rename-warn-to-warning-to-clear-the-namespace.patch add-a-warn-macro-this-is-warn_on-printk-arguments.patch kernel-irq-managec-replace-a-printk-warn_on-to-a-warn.patch example-use-of-warn.patch use-warn-in-kernel-irq-managec.patch use-warn-in-kernel-panicc.patch use-warn-in-mm-vmallocc.patch use-warn-in-kernel-lockdepc.patch use-warn-in-kernel-irq-chipc.patch use-warn-in-arch-x86-mm-ioremapc.patch use-warn-in-arch-x86-mm-pageattrc.patch use-warn-in-arch-x86-kernel.patch use-warn-in-block.patch use-warn-in-drivers-base.patch use-warn-in-lib.patch use-warn-in-fs.patch usr-warn-in-fs-sysfs.patch use-warn-in-fs-proc.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html