From e8ce33ba67ec1cc84d357069b20b59712a5506ed Mon Sep 17 00:00:00 2001
From: Chen Liqin <liqin.chen@sunplusct.com>
Date: Sun, 30 Aug 2009 12:33:30 +0800
Subject: [PATCH] --- yaml --- r: 163609 b: refs/heads/master c:
 cf52c468352993ca420fe0b4ada976dc1f614026 h: refs/heads/master i:   163607:
 5084272c634fdaafa5eba5746b6ef0214710d91a v: v3

---
 [refs]                                |  2 +-
 trunk/arch/score/include/asm/unistd.h |  5 +++++
 trunk/arch/score/kernel/entry.S       | 13 +++++++++++++
 trunk/arch/score/kernel/sys_score.c   | 24 ++++++++++++++++++++++--
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bfe869ceefd2..2bf34f1c34df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 324f40fbb02ed9339ddbdc450ff8ba614a92a630
+refs/heads/master: cf52c468352993ca420fe0b4ada976dc1f614026
diff --git a/trunk/arch/score/include/asm/unistd.h b/trunk/arch/score/include/asm/unistd.h
index 0d98b72f462a..4aa957364d4d 100644
--- a/trunk/arch/score/include/asm/unistd.h
+++ b/trunk/arch/score/include/asm/unistd.h
@@ -3,6 +3,11 @@
 
 #define __ARCH_HAVE_MMU
 
+#define __ARCH_WANT_SYSCALL_NO_AT
+#define __ARCH_WANT_SYSCALL_NO_FLAGS
+#define __ARCH_WANT_SYSCALL_OFF_T
+#define __ARCH_WANT_SYSCALL_DEPRECATED
+
 #include <asm-generic/unistd.h>
 
 #endif /* _ASM_SCORE_UNISTD_H */
diff --git a/trunk/arch/score/kernel/entry.S b/trunk/arch/score/kernel/entry.S
index 10e859ddefd1..577abba3fac6 100644
--- a/trunk/arch/score/kernel/entry.S
+++ b/trunk/arch/score/kernel/entry.S
@@ -499,3 +499,16 @@ ENTRY(sys_sigaltstack)
 	mv	r4, r0
 	la	r8, score_sigaltstack
 	br	r8
+
+#ifdef __ARCH_WANT_SYSCALL_DEPRECATED
+ENTRY(sys_fork)
+	mv	r4, r0
+	la	r8, score_fork
+	br	r8
+
+ENTRY(sys_vfork)
+	mv	r4, r0
+	la	r8, score_vfork
+	br	r8
+#endif /* __ARCH_WANT_SYSCALL_DEPRECATED */
+
diff --git a/trunk/arch/score/kernel/sys_score.c b/trunk/arch/score/kernel/sys_score.c
index 61aff8a93443..001249469866 100644
--- a/trunk/arch/score/kernel/sys_score.c
+++ b/trunk/arch/score/kernel/sys_score.c
@@ -25,6 +25,7 @@
 
 #include <linux/file.h>
 #include <linux/fs.h>
+#include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/module.h>
 #include <linux/unistd.h>
@@ -49,8 +50,7 @@ sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
 	}
 
 	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags,
-			pgoff >> (PAGE_SHIFT - 12));
+	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
 	up_write(&current->mm->mmap_sem);
 
 	if (file)
@@ -59,6 +59,19 @@ sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
 	return error;
 }
 
+asmlinkage long
+sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
+	unsigned long flags, unsigned long fd, off_t pgoff)
+{
+	return sys_mmap2(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
+}
+
+asmlinkage long
+score_fork(struct pt_regs *regs)
+{
+	return do_fork(SIGCHLD, regs->regs[0], regs, 0, NULL, NULL);
+}
+
 /*
  * Clone a task - this clones the calling program thread.
  * This is called indirectly via a small wrapper
@@ -81,6 +94,13 @@ score_clone(struct pt_regs *regs)
 			parent_tidptr, child_tidptr);
 }
 
+asmlinkage long
+score_vfork(struct pt_regs *regs)
+{
+	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,
+			regs->regs[0], regs, 0, NULL, NULL);
+}
+
 /*
  * sys_execve() executes a new program.
  * This is called indirectly via a small wrapper