diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-17 23:32:45 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-17 23:32:45 +0000 |
commit | bb382d1cd598a97151a0edf5ac26e36afb0a64ce (patch) | |
tree | fd9f0ca1b31e5af2faa0d7165e6fd0fbb5524ebf /arch/mips64/kernel/unaligned.c | |
parent | af38bda129551834653720f277a920d7d284bd3d (diff) |
- IOC3 driver now will panic when encountering a RX/TX PCI DMA error.
- IOC3 driver does no longer use GFP_DMA which given the _very_ small
number of available GFP_DMA pages might have deadlocked the system.
- First cut of Origin support. Last minute change: Do no longer use
ARC memory / MD hub memory configuration information but klconfig.h
stuff. Simpler, faster, shorter.
- Zillions of MIPS64 fixes.
Diffstat (limited to 'arch/mips64/kernel/unaligned.c')
-rw-r--r-- | arch/mips64/kernel/unaligned.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips64/kernel/unaligned.c b/arch/mips64/kernel/unaligned.c index 22c1819eb..5381642f1 100644 --- a/arch/mips64/kernel/unaligned.c +++ b/arch/mips64/kernel/unaligned.c @@ -377,7 +377,7 @@ sigill: unsigned long unaligned_instructions; -asmlinkage void do_ade(abi64_no_regargs, struct pt_regs regs) +asmlinkage void do_ade(struct pt_regs *regs) { unsigned long pc; @@ -386,16 +386,16 @@ asmlinkage void do_ade(abi64_no_regargs, struct pt_regs regs) * This also catches attempts to activate MIPS16 code on * CPUs which don't support it. */ - if (regs.cp0_badvaddr == regs.cp0_epc) + if (regs->cp0_badvaddr == regs->cp0_epc) goto sigbus; - pc = regs.cp0_epc + ((regs.cp0_cause & CAUSEF_BD) ? 4 : 0); - if (compute_return_epc(®s)) + pc = regs->cp0_epc + ((regs->cp0_cause & CAUSEF_BD) ? 4 : 0); + if (compute_return_epc(regs)) return; if ((current->thread.mflags & MF_FIXADE) == 0) goto sigbus; - emulate_load_store_insn(®s, regs.cp0_badvaddr, pc); + emulate_load_store_insn(regs, regs->cp0_badvaddr, pc); unaligned_instructions++; return; |