This commit was manufactured by cvs2svn to create tag

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

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index ddbc390..465133c 100644 (file)
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -723,7 +723,7 @@ static int load_flat_file(struct linux_binprm * bprm,
                                return -ENOEXEC;
 
                        /* Get the pointer's value.  */
-                       addr = flat_get_addr_from_rp(rp, relval);
+                       addr = flat_get_addr_from_rp(rp, relval, flags);
                        if (addr != 0) {
                                /*
                                 * Do the relocation.  PIC relocs in the data section are
@@ -896,7 +896,7 @@ static void __exit exit_flat_binfmt(void)
 
 /****************************************************************************/
 
-module_init(init_flat_binfmt);
+core_initcall(init_flat_binfmt);
 module_exit(exit_flat_binfmt);
 
 /****************************************************************************/