diff options
author | Michal Simek <monstr@monstr.eu> | 2011-05-23 05:38:19 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-10-04 12:56:39 -0400 |
commit | 94fda49a948a5999699359313a2f857f9d11ff19 (patch) | |
tree | 795de5ee99e5d92437ad1bd992cae4129f41ad3b | |
parent | c74c8b1dcbaa890a064a5892e29cec5ce42d5b84 (diff) |
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>
-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) | |||
290 | case -ERESTARTNOINTR: | 290 | case -ERESTARTNOINTR: |
291 | do_restart: | 291 | do_restart: |
292 | /* offset of 4 bytes to re-execute trap (brki) instruction */ | 292 | /* offset of 4 bytes to re-execute trap (brki) instruction */ |
293 | #ifndef CONFIG_MMU | ||
294 | regs->pc -= 4; | 293 | regs->pc -= 4; |
295 | #else | ||
296 | /* offset of 8 bytes required = 4 for rtbd | ||
297 | offset, plus 4 for size of | ||
298 | "brki r14,8" | ||
299 | instruction. */ | ||
300 | regs->pc -= 8; | ||
301 | #endif | ||
302 | break; | 294 | break; |
303 | } | 295 | } |
304 | } | 296 | } |