From 94fbdba860a5016f22aec843fd9070620e476b12 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 30 Sep 2007 17:00:34 -0700 Subject: [PATCH] --- yaml --- r: 65250 b: refs/heads/master c: 8cc8c28a9acdceda0e60519167a052cc3408c5c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/binfmt_aout32.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea23c6b603fa..85f708ac5e08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c908f97d0f9aee32fa6d4b0a44c4c5d0ccab2b0 +refs/heads/master: 8cc8c28a9acdceda0e60519167a052cc3408c5c3 diff --git a/trunk/arch/sparc64/kernel/binfmt_aout32.c b/trunk/arch/sparc64/kernel/binfmt_aout32.c index f205fc7cbcd0..d208cc7804f2 100644 --- a/trunk/arch/sparc64/kernel/binfmt_aout32.c +++ b/trunk/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; }