---

yaml --- r: 120075 b: refs/heads/master c: 9cfc9a9 h: refs/heads/master i: 120073: 1aa79c4 120071: 711bede v: v3
git-mirror · Dec 22, 2008 · 39673d3 · 39673d3
1 parent 6ff9d66
commit 39673d3
Show file tree

Hide file tree

Showing 5 changed files with 580 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edfd6da0405520b147ab1473ad183a5b32be7082
+refs/heads/master: 9cfc9a9b6fff9ea7a19814b4472b3cb18b7bbdcc
diff --git a/trunk/arch/sh/include/asm/processor_32.h b/trunk/arch/sh/include/asm/processor_32.h
@@ -175,6 +175,7 @@ static __inline__ void enable_fpu(void)
 
 void show_trace(struct task_struct *tsk, unsigned long *sp,
 		struct pt_regs *regs);
+void show_code(struct pt_regs *regs);
 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
@@ -9,9 +9,10 @@ ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_ftrace.o = -pg
 endif
 
-obj-y	:= debugtraps.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
+obj-y	:= debugtraps.o disassemble.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
 
 obj-y				+= cpu/ timers/
 obj-$(CONFIG_VSYSCALL)		+= vsyscall/