---

yaml --- r: 24656 b: refs/heads/master c: 872345b h: refs/heads/master v: v3
git-mirror · Mar 28, 2006 · a8d58d1 · a8d58d1
1 parent 37041c0
commit a8d58d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d177fbfdadb011f1bac96f9ccba0cc9f21da8de
+refs/heads/master: 872345b715ee02f3b45528449f0d11b44ef9ebb8
diff --git a/trunk/include/asm-powerpc/bug.h b/trunk/include/asm-powerpc/bug.h
@@ -40,7 +40,7 @@ struct bug_entry *find_bug(unsigned long bugaddr);
 	__asm__ __volatile__(						 \
 		"1:	twi 31,0,0\n"					 \
 		".section __bug_table,\"a\"\n"				 \
-		"\t"PPC_LONG"	1b,%0,%1,%2\n"			 \
+		"\t"PPC_LONG"	1b,%0,%1,%2\n"				 \
 		".previous"						 \
 		: : "i" (__LINE__), "i" (__FILE__), "i" (__FUNCTION__)); \
 } while (0)
@@ -53,14 +53,14 @@ struct bug_entry *find_bug(unsigned long bugaddr);
 		__asm__ __volatile__(				\
 		"1:	"PPC_TLNEI"	%0,0\n"			\
 		".section __bug_table,\"a\"\n"			\
-		"\t"PPC_LONG"	1b,%1,%2,%3\n"		\
+		"\t"PPC_LONG"	1b,%1,%2,%3\n"			\
 		".previous"					\
 		: : "r" ((long)(x)), "i" (__LINE__),		\
 		    "i" (__FILE__), "i" (__FUNCTION__));	\
 	}							\
 } while (0)
 
-#define WARN() do {						\
+#define __WARN() do {						\
 	__asm__ __volatile__(					\
 		"1:	twi 31,0,0\n"				\
 		".section __bug_table,\"a\"\n"			\
@@ -73,12 +73,12 @@ struct bug_entry *find_bug(unsigned long bugaddr);
 #define WARN_ON(x) do {						\
 	if (__builtin_constant_p(x)) {				\
 		if (x)						\
-			WARN();					\
+			__WARN();				\
 	} else {						\
 		__asm__ __volatile__(				\
 		"1:	"PPC_TLNEI"	%0,0\n"			\
 		".section __bug_table,\"a\"\n"			\
-		"\t"PPC_LONG"	1b,%1,%2,%3\n"		\
+		"\t"PPC_LONG"	1b,%1,%2,%3\n"			\
 		".previous"					\
 		: : "r" ((long)(x)),				\
 		    "i" (__LINE__ + BUG_WARNING_TRAP),		\