diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-14 20:34:50 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-14 20:34:50 +0100 |
| commit | 9ea26e897dad9f186a37346cceba380c81fa7e9a (patch) | |
| tree | ee1d39fe7c66cc996f282d9b162f3efd7cf72ebd /arch/arm/kernel/traps.c | |
| parent | 9cd722820c1211157199154242bb6b4baf90e86d (diff) | |
| parent | 764df269b7e4e2784ab4acb841e503b364552641 (diff) | |
| download | kernel_samsung_smdk4412-9ea26e897dad9f186a37346cceba380c81fa7e9a.zip kernel_samsung_smdk4412-9ea26e897dad9f186a37346cceba380c81fa7e9a.tar.gz kernel_samsung_smdk4412-9ea26e897dad9f186a37346cceba380c81fa7e9a.tar.bz2 | |
Merge remote-tracking branch 'cyanogen/cm-13.0' into replicant-6.0
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 56b2715..599ea93 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -365,6 +365,19 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) if (call_undef_hook(regs, instr) == 0) return; + /* STARGO: hack for DIV emulation */ + if ((processor_mode(regs) != SVC_MODE) && thumb_mode(regs)) { + if ((instr & 0x0310) == 0x0310) { /* Retry for division */ + unsigned int instr2; + get_user(instr2, (u16 __user *)pc + 1); + instr <<= 16; + instr |= instr2; + if (call_undef_hook(regs, instr) == 0) + return; + } + } + /* END: STARGO: hack for DIV emulation */ + #ifdef CONFIG_DEBUG_USER if (user_debug & UDBG_UNDEFINED) { printk(KERN_INFO "%s (%d): undefined instruction: pc=%p\n", |