diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-03 07:33:17 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 07:33:17 +0200 |
| commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
| tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /arch/sparc64/kernel/binfmt_aout32.c | |
| parent | [POWERPC] Fix panic in RTAS code (diff) | |
| parent | Merge branch 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarz... (diff) | |
| download | linux-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.tar.xz linux-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.zip | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/sparc64/kernel/binfmt_aout32.c')
| -rw-r--r-- | arch/sparc64/kernel/binfmt_aout32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c index f205fc7cbcd0..d208cc7804f2 100644 --- a/arch/sparc64/kernel/binfmt_aout32.c +++ b/arch/sparc64/kernel/binfmt_aout32.c @@ -177,7 +177,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr get_user(c,p++); } while (c); } - put_user(NULL,argv); + put_user(0,argv); current->mm->arg_end = current->mm->env_start = (unsigned long) p; while (envc-->0) { char c; @@ -186,7 +186,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr get_user(c,p++); } while (c); } - put_user(NULL,envp); + put_user(0,envp); current->mm->env_end = (unsigned long) p; return sp; } |