From ddd5b0b5b72608934d708355d5b8af19ac2ed543 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Thu, 11 Jan 2007 01:52:45 +0100
Subject: [PATCH] --- yaml --- r: 45466 b: refs/heads/master c:
 7401969907594ac9632368ec53528fbd9b18f339 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86_64/ia32/ia32_aout.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5b32a6aecc67..4ab1d6edccc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88d20328cd66ee05f9b7f4d414640700db69d82b
+refs/heads/master: 7401969907594ac9632368ec53528fbd9b18f339
diff --git a/trunk/arch/x86_64/ia32/ia32_aout.c b/trunk/arch/x86_64/ia32/ia32_aout.c
index be87df506f39..fe83edb93c10 100644
--- a/trunk/arch/x86_64/ia32/ia32_aout.c
+++ b/trunk/arch/x86_64/ia32/ia32_aout.c
@@ -241,7 +241,7 @@ static u32 __user *create_aout_tables(char __user *p, struct linux_binprm *bprm)
 			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;
@@ -250,7 +250,7 @@ static u32 __user *create_aout_tables(char __user *p, struct linux_binprm *bprm)
 			get_user(c,p++);
 		} while (c);
 	}
-	put_user(NULL,envp);
+	put_user(0, envp);
 	current->mm->env_end = (unsigned long) p;
 	return sp;
 }