diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-05-23 13:38:19 +0400 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-10-04 20:56:39 +0400 |
| commit | 94fda49a948a5999699359313a2f857f9d11ff19 (patch) | |
| tree | 795de5ee99e5d92437ad1bd992cae4129f41ad3b /arch/microblaze | |
| parent | c74c8b1dcbaa890a064a5892e29cec5ce42d5b84 (diff) | |
| download | linux-94fda49a948a5999699359313a2f857f9d11ff19.tar.xz | |
Revert "microblaze_mmu_v2: Update signal returning address"
This reverts commit 8b28626a6b1522b39f75d0bf80d5dec23c931f5a.
Offset -8 is wrong because when it is applied then one instruction
before brki r14, 8 is called again when we return.
Offset -4 is correct and brki instruction is called again.
This change came from ancient MMU kernel.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/signal.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index 76b9722557db..c1220dbf87cd 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c @@ -290,15 +290,7 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler) case -ERESTARTNOINTR: do_restart: /* offset of 4 bytes to re-execute trap (brki) instruction */ -#ifndef CONFIG_MMU regs->pc -= 4; -#else - /* offset of 8 bytes required = 4 for rtbd - offset, plus 4 for size of - "brki r14,8" - instruction. */ - regs->pc -= 8; -#endif break; } } |