commit a5eec0ef3f3285b0acecbf9cc5bb2a3817b2537a
Author: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun Nov 20 23:20:17 2011 +0100
stash
diff --git a/arch/lm32/include/asm/unistd.h b/arch/lm32/include/asm/unistd.h
index bef2328..bd51295 100644
--- a/arch/lm32/include/asm/unistd.h
+++ b/arch/lm32/include/asm/unistd.h
@@ -8,6 +8,4 @@
#include <asm-generic/unistd.h>
-#undef __NR_mmap
-
#endif /* _ASM_LM32_UNISTD_H */
diff --git a/arch/lm32/kernel/sys_call_table.c b/arch/lm32/kernel/sys_call_table.c
index e3f054e..9e84a06 100644
--- a/arch/lm32/kernel/sys_call_table.c
+++ b/arch/lm32/kernel/sys_call_table.c
@@ -5,7 +5,7 @@
#include <asm/syscalls.h>
#define sys_vfork sys_ni_syscall
-#define sys_mmap sys_ni_syscall
+/*#define sys_mmap sys_ni_syscall*/
#define sys_mmap2 sys_mmap_pgoff
#undef __SYSCALL
diff --git a/arch/lm32/kernel/sys_lm32.c b/arch/lm32/kernel/sys_lm32.c
index f1c11ed..5fd1131 100644
--- a/arch/lm32/kernel/sys_lm32.c
+++ b/arch/lm32/kernel/sys_lm32.c
@@ -39,6 +39,15 @@
#include <asm/uaccess.h>
#include <asm/unistd.h>
+asmlinkage long
+sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
+ unsigned long flags, unsigned long fd, off_t offset)
+{
+ if (unlikely(offset & ~PAGE_MASK))
+ return -EINVAL;
+ return sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
+}
+
asmlinkage int lm32_execve(const char __user *ufilename,
const char __user *const __user *uargv,
const char __user *const __user *uenvp,