fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/arm26/kernel/sys_arm.c b/arch/arm26/kernel/sys_arm.c
index e7edd20..dc05aba 100644 (file)
--- a/arch/arm26/kernel/sys_arm.c
+++ b/arch/arm26/kernel/sys_arm.c
@@ -64,10 +64,10 @@ inline long do_mmap2(
        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
        /*
-        * If we are doing a fixed mapping, and address < PAGE_SIZE,
+        * If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
         * then deny it.
         */
-       if (flags & MAP_FIXED && addr < PAGE_SIZE && vectors_base() == 0)
+       if (flags & MAP_FIXED && addr < FIRST_USER_ADDRESS)
                goto out;
 
        error = -EBADF;
@@ -121,11 +121,10 @@ sys_arm_mremap(unsigned long addr, unsigned long old_len,
        unsigned long ret = -EINVAL;
 
        /*
-        * If we are doing a fixed mapping, and address < PAGE_SIZE,
+        * If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
         * then deny it.
         */
-       if (flags & MREMAP_FIXED && new_addr < PAGE_SIZE &&
-           vectors_base() == 0)
+       if (flags & MREMAP_FIXED && new_addr < FIRST_USER_ADDRESS)
                goto out;
 
        down_write(&current->mm->mmap_sem);
@@ -284,7 +283,7 @@ out:
 }
 
 /* FIXME - see if this is correct for arm26 */
-long execve(const char *filename, char **argv, char **envp)
+int kernel_execve(const char *filename, char *const argv[], char *const envp[])
 {
        struct pt_regs regs;
         int ret;
@@ -321,4 +320,4 @@ long execve(const char *filename, char **argv, char **envp)
         return ret;
 }
 
-EXPORT_SYMBOL(execve);
+EXPORT_SYMBOL(kernel_execve);