diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
tree | e72d346172a30bbee165d7f585784724906da416 /arch/um/kernel/exec.c | |
parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) | |
download | kernel_samsung_crespo-4e83998f5af010a928495988c586ea2926624db9.zip kernel_samsung_crespo-4e83998f5af010a928495988c586ea2926624db9.tar.gz kernel_samsung_crespo-4e83998f5af010a928495988c586ea2926624db9.tar.bz2 |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/um/kernel/exec.c')
-rw-r--r-- | arch/um/kernel/exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index cd145ed..49b5e1e 100644 --- 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; |