Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 18:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

sh: Fix up fpu emu build.

Browse Source 
The addition of the kprobes code pushed down a variable declaration,
clean it up.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2008-09-17 23:12:11 +09:00
parent 5a89f1adbc
commit b3d765f5df
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sh/kernel/traps_32.c
View File

@ -742,15 +742,13 @@ asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
struct pt_regs __regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0); struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
unsigned long error_code; unsigned long inst;
struct task_struct *tsk = current; struct task_struct *tsk = current;
if (kprobe_handle_illslot(regs->pc) == 0) if (kprobe_handle_illslot(regs->pc) == 0)
return; return;
#ifdef CONFIG_SH_FPU_EMU #ifdef CONFIG_SH_FPU_EMU
unsigned short inst = 0;
get_user(inst, (unsigned short *)regs->pc + 1); get_user(inst, (unsigned short *)regs->pc + 1);
if (!do_fpu_inst(inst, regs)) { if (!do_fpu_inst(inst, regs)) {
get_user(inst, (unsigned short *)regs->pc); get_user(inst, (unsigned short *)regs->pc);
@ -761,12 +759,12 @@ asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
/* not a FPU inst. */ /* not a FPU inst. */
#endif #endif
lookup_exception_vector(error_code); lookup_exception_vector(inst);
local_irq_enable(); local_irq_enable();
CHK_REMOTE_DEBUG(regs); CHK_REMOTE_DEBUG(regs);
force_sig(SIGILL, tsk); force_sig(SIGILL, tsk);
die_if_no_fixup("illegal slot instruction", regs, error_code); die_if_no_fixup("illegal slot instruction", regs, inst);
} }
asmlinkage void do_exception_error(unsigned long r4, unsigned long r5, asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,