diff options
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/asm-offsets.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/traps.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c index ca6c83218caa..6b30fb2caa67 100644 --- a/arch/mips/kernel/asm-offsets.c +++ b/arch/mips/kernel/asm-offsets.c | |||
@@ -126,7 +126,6 @@ void output_thread_defines(void) | |||
126 | thread.cp0_baduaddr); | 126 | thread.cp0_baduaddr); |
127 | OFFSET(THREAD_ECODE, task_struct, \ | 127 | OFFSET(THREAD_ECODE, task_struct, \ |
128 | thread.error_code); | 128 | thread.error_code); |
129 | OFFSET(THREAD_TRAPNO, task_struct, thread.trap_no); | ||
130 | OFFSET(THREAD_TRAMP, task_struct, \ | 129 | OFFSET(THREAD_TRAMP, task_struct, \ |
131 | thread.irix_trampoline); | 130 | thread.irix_trampoline); |
132 | OFFSET(THREAD_OLDCTX, task_struct, \ | 131 | OFFSET(THREAD_OLDCTX, task_struct, \ |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 4c6079f24958..6019e9ea9a6b 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -376,7 +376,7 @@ void __noreturn die(const char * str, struct pt_regs * regs) | |||
376 | mips_mt_regdump(dvpret); | 376 | mips_mt_regdump(dvpret); |
377 | #endif /* CONFIG_MIPS_MT_SMTC */ | 377 | #endif /* CONFIG_MIPS_MT_SMTC */ |
378 | 378 | ||
379 | if (notify_die(DIE_OOPS, str, regs, 0, current->thread.trap_no, SIGSEGV) == NOTIFY_STOP) | 379 | if (notify_die(DIE_OOPS, str, regs, 0, 0, SIGSEGV) == NOTIFY_STOP) |
380 | sig = 0; | 380 | sig = 0; |
381 | 381 | ||
382 | printk("%s[#%d]:\n", str, ++die_counter); | 382 | printk("%s[#%d]:\n", str, ++die_counter); |