Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mirror_ubuntu-bionic-kernel.git] / include / asm-generic / bug.h

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index a06eecd48292a68d4611b43e263390b4320f7c15..14fae1fa87dfa3e177b46b0a830a2f01beb12f91 100644 (file)
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -35,7 +35,7 @@ struct bug_entry {
 #define WARN_ON(condition) ({                                          \
        typeof(condition) __ret_warn_on = (condition);                  \
        if (unlikely(__ret_warn_on)) {                                  \
-               printk("WARNING at %s:%d %s()\n", __FILE__,     \
+               printk("BUG: at %s:%d %s()\n", __FILE__,                \
                        __LINE__, __FUNCTION__);                        \
                dump_stack();                                           \
        }                                                               \