From 78aa3715a697d2b72ddbb2a31ada740a40e1e37e Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 17 Dec 2008 15:56:06 +0900
Subject: [PATCH] --- yaml --- r: 120153 b: refs/heads/master c:
 5d2685d0b3edc51ecc92604d5b7f5ca9b29b90bb h: refs/heads/master i:   120151:
 58085efd69fe6cf43125d0af874487a86f1e21b9 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/sh/Kconfig.debug              | 12 ++++++++++++
 trunk/arch/sh/include/asm/processor_32.h |  8 ++++++++
 trunk/arch/sh/kernel/Makefile_32         |  3 ++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a54a4d1a789f..5f31e2d7cabc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe58cac35f48a9598c2a1360c2204c73f7bca2d2
+refs/heads/master: 5d2685d0b3edc51ecc92604d5b7f5ca9b29b90bb
diff --git a/trunk/arch/sh/Kconfig.debug b/trunk/arch/sh/Kconfig.debug
index 0dc340d5795e..0d62681f72a0 100644
--- a/trunk/arch/sh/Kconfig.debug
+++ b/trunk/arch/sh/Kconfig.debug
@@ -98,6 +98,18 @@ config IRQSTACKS
 	  for handling hard and soft interrupts.  This can help avoid
 	  overflowing the process kernel stacks.
 
+config DUMP_CODE
+	bool "Show disassembly of nearby code in register dumps"
+	depends on DEBUG_KERNEL && SUPERH32
+	default y if DEBUG_BUGVERBOSE
+	default n
+	help
+	  This prints out a code trace of the instructions leading up to
+	  the faulting instruction as a debugging aid. As this does grow
+	  the kernel in size a bit, most users will want to say N here.
+
+	  Those looking for more verbose debugging output should say Y.
+
 config SH_NO_BSS_INIT
 	bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
 	depends on DEBUG_KERNEL
diff --git a/trunk/arch/sh/include/asm/processor_32.h b/trunk/arch/sh/include/asm/processor_32.h
index 2bfb7353493a..d79063c5eb9c 100644
--- a/trunk/arch/sh/include/asm/processor_32.h
+++ b/trunk/arch/sh/include/asm/processor_32.h
@@ -175,7 +175,15 @@ static __inline__ void enable_fpu(void)
 
 void show_trace(struct task_struct *tsk, unsigned long *sp,
 		struct pt_regs *regs);
+
+#ifdef CONFIG_DUMP_CODE
 void show_code(struct pt_regs *regs);
+#else
+static inline void show_code(struct pt_regs *regs)
+{
+}
+#endif
+
 extern unsigned long get_wchan(struct task_struct *p);
 
 #define KSTK_EIP(tsk)  (task_pt_regs(tsk)->pc)
diff --git a/trunk/arch/sh/kernel/Makefile_32 b/trunk/arch/sh/kernel/Makefile_32
index 3c975ab45590..2e1b86e16ab5 100644
--- a/trunk/arch/sh/kernel/Makefile_32
+++ b/trunk/arch/sh/kernel/Makefile_32
@@ -9,7 +9,7 @@ ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_ftrace.o = -pg
 endif
 
-obj-y	:= debugtraps.o disassemble.o idle.o io.o io_generic.o irq.o	\
+obj-y	:= debugtraps.o idle.o io.o io_generic.o irq.o			\
 	   machvec.o process_32.o ptrace_32.o setup.o signal_32.o	\
 	   sys_sh.o sys_sh32.o syscalls_32.o time_32.o topology.o	\
 	   traps.o traps_32.o
@@ -29,5 +29,6 @@ obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_GENERIC_GPIO)	+= gpio.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
+obj-$(CONFIG_DUMP_CODE)		+= disassemble.o
 
 EXTRA_CFLAGS += -Werror