This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / kernel / sys_arm.c

diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index f897ce2..154099a 100644 (file)
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -51,6 +51,13 @@ asmlinkage int sys_pipe(unsigned long __user *fildes)
        return error;
 }
 
+/*
+ * This is the lowest virtual address we can permit any user space
+ * mapping to be mapped at.  This is particularly important for
+ * non-high vector CPUs.
+ */
+#define MIN_MAP_ADDR   (PAGE_SIZE)
+
 /* common code for old and new mmaps */
 inline long do_mmap2(
        unsigned long addr, unsigned long len,
@@ -62,7 +69,7 @@ inline long do_mmap2(
 
        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
-       if (flags & MAP_FIXED && addr < FIRST_USER_ADDRESS)
+       if (flags & MAP_FIXED && addr < MIN_MAP_ADDR)
                goto out;
 
        error = -EBADF;
@@ -115,7 +122,7 @@ sys_arm_mremap(unsigned long addr, unsigned long old_len,
 {
        unsigned long ret = -EINVAL;
 
-       if (flags & MREMAP_FIXED && new_addr < FIRST_USER_ADDRESS)
+       if (flags & MREMAP_FIXED && new_addr < MIN_MAP_ADDR)
                goto out;
 
        down_write(&current->mm->mmap_sem);
@@ -162,11 +169,7 @@ asmlinkage int sys_ipc(uint call, int first, int second, int third,
 
        switch (call) {
        case SEMOP:
-               return sys_semtimedop (first, (struct sembuf __user *)ptr, second, NULL);
-       case SEMTIMEDOP:
-               return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
-                                       (const struct timespec __user *)fifth);
-
+               return sys_semop(first, (struct sembuf __user *)ptr, second);
        case SEMGET:
                return sys_semget (first, second, third);
        case SEMCTL: {
@@ -238,14 +241,18 @@ asmlinkage int sys_fork(struct pt_regs *regs)
 /* Clone a task - this clones the calling program thread.
  * This is called indirectly via a small wrapper
  */
-asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
-                        int __user *parent_tidptr, int tls_val,
-                        int __user *child_tidptr, struct pt_regs *regs)
+asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, struct pt_regs *regs)
 {
+       /*
+        * We don't support SETTID / CLEARTID
+        */
+       if (clone_flags & (CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID))
+               return -EINVAL;
+
        if (!newsp)
                newsp = regs->ARM_sp;
 
-       return do_fork(clone_flags, newsp, regs, 0, parent_tidptr, child_tidptr);
+       return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
 }
 
 asmlinkage int sys_vfork(struct pt_regs *regs)
@@ -302,7 +309,7 @@ long execve(const char *filename, char **argv, char **envp)
                "b      ret_to_user"
                :
                : "r" (current_thread_info()),
-                 "Ir" (THREAD_START_SP - sizeof(regs)),
+                 "Ir" (THREAD_SIZE - 8 - sizeof(regs)),
                  "r" (&regs),
                  "Ir" (sizeof(regs))
                : "r0", "r1", "r2", "r3", "ip", "memory");