Title: [8689] trunk/arch/blackfin/kernel/trace.c: As Mike pointed out, without this patch, this fails when CONFIG_BUG is
Revision
8689
Author
rgetz
Date
2010-05-05 15:13:02 -0400 (Wed, 05 May 2010)

Log Message

As Mike pointed out, without this patch, this fails when CONFIG_BUG is
not set. Fix it.

Modified Paths

Diff

Modified: trunk/arch/blackfin/kernel/trace.c (8688 => 8689)


--- trunk/arch/blackfin/kernel/trace.c	2010-05-05 07:21:38 UTC (rev 8688)
+++ trunk/arch/blackfin/kernel/trace.c	2010-05-05 19:13:02 UTC (rev 8689)
@@ -587,9 +587,12 @@
 static void decode_opcode(unsigned int opcode)
 {
 
+#ifdef CONFIG_BUG
 	if (opcode == BFIN_BUG_OPCODE)
 		pr_cont("BUG");
-	else if ((opcode & 0xffffff00) == ProgCtrl_opcode)
+	else
+#endif
+	if ((opcode & 0xffffff00) == ProgCtrl_opcode)
 		decode_ProgCtrl_0(opcode);
 	else if ((opcode & 0xfffff000) == BRCC_opcode)
 		decode_BRCC_0(opcode);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to