vserver 1.9.5.x5

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

diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
index a302e03..1edbcca 100644 (file)
--- a/fs/binfmt_script.c
+++ b/fs/binfmt_script.c
@@ -50,7 +50,7 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
        if (*cp == '\0') 
                return -ENOEXEC; /* No interpreter name found */
        i_name = cp;
-       i_arg = 0;
+       i_arg = NULL;
        for ( ; *cp && (*cp != ' ') && (*cp != '\t'); cp++)
                /* nothing */ ;
        while ((*cp == ' ') || (*cp == '\t'))
@@ -96,7 +96,7 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
        return search_binary_handler(bprm,regs);
 }
 
-struct linux_binfmt script_format = {
+static struct linux_binfmt script_format = {
        .module         = THIS_MODULE,
        .load_binary    = load_script,
 };
@@ -111,6 +111,6 @@ static void __exit exit_script_binfmt(void)
        unregister_binfmt(&script_format);
 }
 
-module_init(init_script_binfmt)
-module_exit(exit_script_binfmt)
+core_initcall(init_script_binfmt);
+module_exit(exit_script_binfmt);
 MODULE_LICENSE("GPL");