diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /arch/mips/kernel/unaligned.c | |
parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) |
Merge commit 'v2.6.28-rc3' into sched/core
Diffstat (limited to 'arch/mips/kernel/unaligned.c')
-rw-r--r-- | arch/mips/kernel/unaligned.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index 20709669e592..bf4c4a979abb 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c | |||
@@ -499,22 +499,10 @@ sigill: | |||
499 | 499 | ||
500 | asmlinkage void do_ade(struct pt_regs *regs) | 500 | asmlinkage void do_ade(struct pt_regs *regs) |
501 | { | 501 | { |
502 | extern int do_dsemulret(struct pt_regs *); | ||
503 | unsigned int __user *pc; | 502 | unsigned int __user *pc; |
504 | mm_segment_t seg; | 503 | mm_segment_t seg; |
505 | 504 | ||
506 | /* | 505 | /* |
507 | * Address errors may be deliberately induced by the FPU emulator to | ||
508 | * retake control of the CPU after executing the instruction in the | ||
509 | * delay slot of an emulated branch. | ||
510 | */ | ||
511 | /* Terminate if exception was recognized as a delay slot return */ | ||
512 | if (do_dsemulret(regs)) | ||
513 | return; | ||
514 | |||
515 | /* Otherwise handle as normal */ | ||
516 | |||
517 | /* | ||
518 | * Did we catch a fault trying to load an instruction? | 506 | * Did we catch a fault trying to load an instruction? |
519 | * Or are we running in MIPS16 mode? | 507 | * Or are we running in MIPS16 mode? |
520 | */ | 508 | */ |