From ec609e2c4a7290326560bde8c1bacee13536dc1e Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 26 May 2009 16:30:26 +0200
Subject: [PATCH] --- yaml --- r: 148636 b: refs/heads/master c:
 65504a47e02e4e6e58884376f4a700f83cc8234f h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/microblaze/kernel/entry-nommu.S   | 2 +-
 trunk/arch/microblaze/kernel/syscall_table.S | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3a06b70b5ac2..d4f08f2b232f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c1285ef0d6b005f4e7651ee1e7cf304b4e97dc
+refs/heads/master: 65504a47e02e4e6e58884376f4a700f83cc8234f
diff --git a/trunk/arch/microblaze/kernel/entry-nommu.S b/trunk/arch/microblaze/kernel/entry-nommu.S
index f24b1268baaf..1fce6b803f54 100644
--- a/trunk/arch/microblaze/kernel/entry-nommu.S
+++ b/trunk/arch/microblaze/kernel/entry-nommu.S
@@ -10,7 +10,7 @@
 
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/entry.h>
 #include <asm/asm-offsets.h>
 #include <asm/registers.h>
diff --git a/trunk/arch/microblaze/kernel/syscall_table.S b/trunk/arch/microblaze/kernel/syscall_table.S
index 3bb42ec924c2..376d1789f7c0 100644
--- a/trunk/arch/microblaze/kernel/syscall_table.S
+++ b/trunk/arch/microblaze/kernel/syscall_table.S
@@ -2,7 +2,11 @@ ENTRY(sys_call_table)
 	.long sys_restart_syscall	/* 0 - old "setup()" system call,
 					 * used for restarting */
 	.long sys_exit
-	.long sys_ni_syscall		/* was fork */
+#ifdef CONFIG_MMU
+	.long sys_fork_wrapper
+#else
+	.long sys_ni_syscall
+#endif
 	.long sys_read
 	.long sys_write
 	.long sys_open			/* 5 */