---

yaml
---
r: 305227
b: refs/heads/master
c: b2212ea
h: refs/heads/master
i:
  305225: c0ecfa6
  305223: 575056a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb56a91922463abec52a68e26b562c4503810d40
+refs/heads/master: b2212ea41dacda8cce0e7681a3a6ccc76c63802e

trunk/arch/sh/include/asm/processor_64.h

@@ -121,7 +121,6 @@ struct thread_struct {
 	   NULL for a kernel thread. */
 	struct pt_regs *uregs;
 
-	unsigned long trap_no, error_code;
 	unsigned long address;
 	/* Hardware debugging registers may come here */
 
@@ -138,8 +137,6 @@ struct thread_struct {
 	.pc		= 0,			\
         .kregs		= &fake_swapper_regs,	\
 	.uregs	        = NULL,			\
-	.trap_no	= 0,			\
-	.error_code	= 0,			\
 	.address	= 0,			\
 	.flags		= 0,			\
 }

trunk/arch/sh/kernel/cpu/sh5/fpu.c

@@ -107,8 +107,5 @@ asmlinkage void do_fpu_error(unsigned long ex, struct pt_regs *regs)
 
 	regs->pc += 4;
 
-	tsk->thread.trap_no = 11;
-	tsk->thread.error_code = 0;
-
 	force_sig(SIGFPE, tsk);
 }

trunk/arch/sh/kernel/traps_64.c

@@ -283,8 +283,6 @@ static void do_unhandled_exception(int trapnr, int signr, char *str, char *fn_na
 		unsigned long error_code, struct pt_regs *regs, struct task_struct *tsk)
 {
 	show_excp_regs(fn_name, trapnr, signr, regs);
-	tsk->thread.error_code = error_code;
-	tsk->thread.trap_no = trapnr;
 
 	if (user_mode(regs))
 		force_sig(signr, tsk);

trunk/arch/sh/mm/tlbflush_64.c

@@ -213,7 +213,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
 			panic("INIT had user mode bad_area\n");
 		}
 		tsk->thread.address = address;
-		tsk->thread.error_code = writeaccess;
 		info.si_signo = SIGSEGV;
 		info.si_errno = 0;
 		info.si_addr = (void *) address;
@@ -263,8 +262,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
 	 * or user mode.
 	 */
 	tsk->thread.address = address;
-	tsk->thread.error_code = writeaccess;
-	tsk->thread.trap_no = 14;
 	force_sig(SIGBUS, tsk);
 
 	/* Kernel mode? Handle exceptions or die */