From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 8 May 2007 03:14:54 +0000 (+0900)
Subject: sh: Always define TRAPA_BUG_OPCODE.
X-Git-Tag: v2.6.22-rc1~143^2~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44530c696b3fc2c8a45bdc798af85528e065ed80;p=linux-2.6

sh: Always define TRAPA_BUG_OPCODE.

Previously this was only set when CONFIG_BUG=y. While we rely
on that for handle_BUG() dispatch, we still want to hand the
opcode off to the die chain notifier for determining the trap
value.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index 794c36daf0..46f925c815 100644
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -1,12 +1,12 @@
 #ifndef __ASM_SH_BUG_H
 #define __ASM_SH_BUG_H
 
+#define TRAPA_BUG_OPCODE	0xc33e	/* trapa #0x3e */
+
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
 #define HAVE_ARCH_WARN_ON
 
-#define TRAPA_BUG_OPCODE	0xc33e	/* trapa #0x3e */
-
 /**
  * _EMIT_BUG_ENTRY
  * %1 - __FILE__