diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-05-07 20:41:26 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-05-07 20:41:26 +0100 |
| commit | fcdd204cc402413f9cdec9ffe3052a05eae23bc1 (patch) | |
| tree | 8c1db3b4ad98f671d3501e2283cbd2ed9246410d | |
| parent | f77fc1afab6e5679bc9049ccdebe6ded258c9e42 (diff) | |
Clean up do_undefinstr - it only needs to take the pt_regs pointer
argument.
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 6 | ||||
| -rw-r--r-- | arch/arm/kernel/traps.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 01f69a9a7b1b..b2c4f0e28af5 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -799,8 +799,7 @@ __und_svc: sub sp, sp, #S_FRAME_SIZE adrsvc al, r9, 1f @ r9 = normal FP return bl call_fpe @ lr = undefined instr return - mov r0, r5 @ unsigned long pc - mov r1, sp @ struct pt_regs *regs + mov r0, sp @ struct pt_regs *regs bl do_undefinstr 1: set_cpsr_c r0, #PSR_I_BIT | MODE_SVC @@ -926,8 +925,7 @@ call_fpe: get_thread_info r10 @ get current thread ldr pc, [r4] @ Call FP module USR entry point fpundefinstr: set_cpsr_c r0, #MODE_SVC @ Enable interrupts - mov r0, lr - mov r1, sp + mov r0, sp adrsvc al, lr, ret_from_exception b do_undefinstr diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 897a43f48a27..6e4e33d6d614 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -201,7 +201,7 @@ void die_if_kernel(const char *str, struct pt_regs *regs, int err) die(str, regs, err); } -asmlinkage void do_undefinstr(int address, struct pt_regs *regs, int mode) +asmlinkage void do_undefinstr(struct pt_regs *regs) { unsigned long *pc; siginfo_t info; @@ -229,7 +229,7 @@ asmlinkage void do_undefinstr(int address, struct pt_regs *regs, int mode) force_sig_info(SIGILL, &info, current); - die_if_kernel("Oops - undefined instruction", regs, mode); + die_if_kernel("Oops - undefined instruction", regs, 0); } #ifdef CONFIG_CPU_26 |