Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[net-next-2.6.git] / arch / um / kernel / exec.c

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 460ce86f4019d11791da552c22b4292ebda3ed00..340268be00b5a934f6fc3ac632c26e53b58623ec 100644 (file)
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -62,7 +62,7 @@ static long execve1(const char *file,
        return error;
 }
 
-long um_execve(const char *file, char __user *__user *argv, char __user *__user *env)
+long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env)
 {
        long err;
 
@@ -72,8 +72,8 @@ long um_execve(const char *file, char __user *__user *argv, char __user *__user
        return err;
 }
 
-long sys_execve(const char __user *file, char __user *__user *argv,
-               char __user *__user *env)
+long sys_execve(const char __user *file, const char __user *const __user *argv,
+               const char __user *const __user *env)
 {
        long error;
        char *filename;