diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 10:43:13 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 10:43:13 -0200 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /arch/um/kernel/exec_kern.c | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
| download | op-kernel-dev-b2faf597d93bdf5e2d12d93ea0815935a73f749e.zip op-kernel-dev-b2faf597d93bdf5e2d12d93ea0815935a73f749e.tar.gz | |
Merge branch 'origin'
Diffstat (limited to 'arch/um/kernel/exec_kern.c')
| -rw-r--r-- | arch/um/kernel/exec_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec_kern.c index 569fe8b..c264e1c 100644 --- a/arch/um/kernel/exec_kern.c +++ b/arch/um/kernel/exec_kern.c @@ -33,7 +33,7 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) extern void log_exec(char **argv, void *tty); static long execve1(char *file, char __user * __user *argv, - char *__user __user *env) + char __user *__user *env) { long error; |
