---

yaml --- r: 148638 b: refs/heads/master c: 8b28626 h: refs/heads/master v: v3
git-mirror · May 26, 2009 · 1b16025 · 1b16025
1 parent ac1b54a
commit 1b16025
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17f3324c3eb271882b9e6b8fc3b1698290121801
+refs/heads/master: 8b28626a6b1522b39f75d0bf80d5dec23c931f5a
diff --git a/trunk/arch/microblaze/kernel/signal.c b/trunk/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;
 	}
 }