This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / fs / binfmt_som.c

diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c
index ac64fa5..7ce202f 100644 (file)
--- a/fs/binfmt_som.c
+++ b/fs/binfmt_som.c
@@ -28,6 +28,7 @@
 #include <linux/shm.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -254,7 +255,7 @@ load_som_binary(struct linux_binprm * bprm, struct pt_regs * regs)
 
        set_binfmt(&som_format);
        compute_creds(bprm);
-       setup_arg_pages(bprm, EXSTACK_DEFAULT);
+       setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
 
        create_som_tables(bprm);
 
@@ -306,5 +307,5 @@ static void __exit exit_som_binfmt(void)
        unregister_binfmt(&som_format);
 }
 
-module_init(init_som_binfmt);
+core_initcall(init_som_binfmt);
 module_exit(exit_som_binfmt);