aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh/include/asm/processor_64.h3
-rw-r--r--arch/sh/kernel/cpu/sh5/fpu.c3
-rw-r--r--arch/sh/kernel/traps_64.c2
-rw-r--r--arch/sh/mm/tlbflush_64.c3
4 files changed, 0 insertions, 11 deletions
diff --git a/arch/sh/include/asm/processor_64.h b/arch/sh/include/asm/processor_64.h
index e25c4c7d6b63..740e26876596 100644
--- a/arch/sh/include/asm/processor_64.h
+++ b/arch/sh/include/asm/processor_64.h
@@ -121,7 +121,6 @@ struct thread_struct {
121 NULL for a kernel thread. */ 121 NULL for a kernel thread. */
122 struct pt_regs *uregs; 122 struct pt_regs *uregs;
123 123
124 unsigned long trap_no, error_code;
125 unsigned long address; 124 unsigned long address;
126 /* Hardware debugging registers may come here */ 125 /* Hardware debugging registers may come here */
127 126
@@ -138,8 +137,6 @@ struct thread_struct {
138 .pc = 0, \ 137 .pc = 0, \
139 .kregs = &fake_swapper_regs, \ 138 .kregs = &fake_swapper_regs, \
140 .uregs = NULL, \ 139 .uregs = NULL, \
141 .trap_no = 0, \
142 .error_code = 0, \
143 .address = 0, \ 140 .address = 0, \
144 .flags = 0, \ 141 .flags = 0, \
145} 142}
diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c
index 4b3bb35e99f3..9f8713aa7184 100644
--- a/arch/sh/kernel/cpu/sh5/fpu.c
+++ b/arch/sh/kernel/cpu/sh5/fpu.c
@@ -107,8 +107,5 @@ asmlinkage void do_fpu_error(unsigned long ex, struct pt_regs *regs)
107 107
108 regs->pc += 4; 108 regs->pc += 4;
109 109
110 tsk->thread.trap_no = 11;
111 tsk->thread.error_code = 0;
112
113 force_sig(SIGFPE, tsk); 110 force_sig(SIGFPE, tsk);
114} 111}
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index 6c0486094e48..8dae93ed8aff 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -283,8 +283,6 @@ static void do_unhandled_exception(int trapnr, int signr, char *str, char *fn_na
283 unsigned long error_code, struct pt_regs *regs, struct task_struct *tsk) 283 unsigned long error_code, struct pt_regs *regs, struct task_struct *tsk)
284{ 284{
285 show_excp_regs(fn_name, trapnr, signr, regs); 285 show_excp_regs(fn_name, trapnr, signr, regs);
286 tsk->thread.error_code = error_code;
287 tsk->thread.trap_no = trapnr;
288 286
289 if (user_mode(regs)) 287 if (user_mode(regs))
290 force_sig(signr, tsk); 288 force_sig(signr, tsk);
diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c
index 605dc65dc66d..be01f92f8c89 100644
--- a/arch/sh/mm/tlbflush_64.c
+++ b/arch/sh/mm/tlbflush_64.c
@@ -213,7 +213,6 @@ bad_area:
213 panic("INIT had user mode bad_area\n"); 213 panic("INIT had user mode bad_area\n");
214 } 214 }
215 tsk->thread.address = address; 215 tsk->thread.address = address;
216 tsk->thread.error_code = writeaccess;
217 info.si_signo = SIGSEGV; 216 info.si_signo = SIGSEGV;
218 info.si_errno = 0; 217 info.si_errno = 0;
219 info.si_addr = (void *) address; 218 info.si_addr = (void *) address;
@@ -263,8 +262,6 @@ do_sigbus:
263 * or user mode. 262 * or user mode.
264 */ 263 */
265 tsk->thread.address = address; 264 tsk->thread.address = address;
266 tsk->thread.error_code = writeaccess;
267 tsk->thread.trap_no = 14;
268 force_sig(SIGBUS, tsk); 265 force_sig(SIGBUS, tsk);
269 266
270 /* Kernel mode? Handle exceptions or die */ 267 /* Kernel mode? Handle exceptions or die */