X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Fia32%2Fia32_aout.c;h=b7b698c68cad7efdfcd7ad1bc3e9f198ad7a595b;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=fe6bae25eb2201bf0815b852525904465c879bc2;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c
index fe6bae25e..b7b698c68 100644
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86_64/ia32/ia32_aout.c
@@ -25,7 +25,6 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
-#include <linux/vs_memory.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -217,19 +216,18 @@ end_coredump:
  * memory and creates the pointer tables from them, and puts their
  * addresses on the "stack", returning the new stack pointer value.
  */
-static u32 __user *create_aout_tables(char __user *p, struct linux_binprm *bprm)
+static u32 * create_aout_tables(char * p, struct linux_binprm * bprm)
 {
-	u32 __user *argv;
-	u32 __user *envp;
-	u32 __user *sp;
+	u32 *argv, *envp;
+	u32 * sp;
 	int argc = bprm->argc;
 	int envc = bprm->envc;
 
-	sp = (u32 __user *) ((-(unsigned long)sizeof(u32)) & (unsigned long) p);
+	sp = (u32 *) ((-(unsigned long)sizeof(u32)) & (unsigned long) p);
 	sp -= envc+1;
-	envp = sp;
+	envp = (u32 *) sp;
 	sp -= argc+1;
-	argv = sp;
+	argv = (u32 *) sp;
 	put_user((unsigned long) envp,--sp);
 	put_user((unsigned long) argv,--sp);
 	put_user(argc,--sp);
@@ -406,7 +404,7 @@ beyond_if:
 	}
 
 	current->mm->start_stack =
-		(unsigned long)create_aout_tables((char __user *)bprm->p, bprm);
+		(unsigned long) create_aout_tables((char *) bprm->p, bprm);
 	/* start thread */
 	asm volatile("movl %0,%%fs" :: "r" (0)); \
 	asm volatile("movl %0,%%es; movl %0,%%ds": :"r" (__USER32_DS));