From 03d83f6fd40114b2ed2420833beaebc01842b9d2 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 29 Dec 2006 16:47:10 -0800
Subject: [PATCH] --- yaml --- r: 45101 b: refs/heads/master c:
 52e88f5d4a6b06f3a945728dd3bc403632afe069 h: refs/heads/master i:   45099:
 6a64febe24876a7377bdf3989728bea39a923051 v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-generic/bug.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d6049b2f2c1d..0cf9d085ed96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76598ebe081b04132f272440183e0aeb6507a079
+refs/heads/master: 52e88f5d4a6b06f3a945728dd3bc403632afe069
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index a06eecd48292..14fae1fa87df 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/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();						\
 	}								\