Gitweb: http://git.kernel.org/linus/8b28626a6b1522b39f75d0bf80d5dec23c931f5a
Commit: 8b28626a6b1522b39f75d0bf80d5dec23c931f5a
Parent: 17f3324c3eb271882b9e6b8fc3b1698290121801
Author: Michal Simek <monstr@monstr.eu>
AuthorDate: Tue May 26 16:30:28 2009 +0200
Committer: Michal Simek <monstr@monstr.eu>
CommitDate: Tue May 26 16:45:22 2009 +0200
microblaze_mmu_v2: Update signal returning address
Signed-off-by: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/kernel/signal.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index 3cdcbfe..4c0e652 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -388,7 +388,15 @@ 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;
}
}
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
