diff options
author | Thomas Gleixner | 2010-10-12 16:41:22 +0200 |
---|---|---|
committer | Thomas Gleixner | 2010-10-12 16:41:26 +0200 |
commit | 7c5f13519a67aa7ba3a99155f128d4bdef87d087 (patch) | |
tree | e4d0537092930a53a85932de83a7861990c58607 /arch/um/kernel/exec.c | |
parent | Merge branch 'x86/cleanups' into irq/sparseirq (diff) | |
parent | x86, hpet: Fix bogus error check in hpet_assign_irq() (diff) | |
download | kernel-qcow2-linux-7c5f13519a67aa7ba3a99155f128d4bdef87d087.tar.gz kernel-qcow2-linux-7c5f13519a67aa7ba3a99155f128d4bdef87d087.tar.xz kernel-qcow2-linux-7c5f13519a67aa7ba3a99155f128d4bdef87d087.zip |
Merge branch 'x86/urgent' of into irq/sparseirq
Reason: Pull in the latest io_apic bugfixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 cd145eda3579..49b5e1eb3262 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; |