patch-2.3.13 linux/fs/exec.c

• Lines: 62
• Date: Fri Aug 6 11:11:03 1999
• Orig file: v2.3.12/linux/fs/exec.c
• Orig date: Wed Jul 28 14:47:42 1999

diff -u --recursive --new-file v2.3.12/linux/fs/exec.c linux/fs/exec.c
@@ -50,36 +50,6 @@
 
 static struct linux_binfmt *formats = (struct linux_binfmt *) NULL;
 
-void __init binfmt_setup(void)
-{
-#ifdef CONFIG_BINFMT_MISC
-	init_misc_binfmt();
-#endif
-
-#ifdef CONFIG_BINFMT_ELF
-	init_elf_binfmt();
-#endif
-
-#ifdef CONFIG_BINFMT_ELF32
-	init_elf32_binfmt();
-#endif
-
-#ifdef CONFIG_BINFMT_AOUT
-	init_aout_binfmt();
-#endif
-
-#ifdef CONFIG_BINFMT_AOUT32
-	init_aout32_binfmt();
-#endif
-
-#ifdef CONFIG_BINFMT_EM86
-	init_em86_binfmt();
-#endif
-
-	/* This cannot be configured out of the kernel */
-	init_script_binfmt();
-}
-
 int register_binfmt(struct linux_binfmt * fmt)
 {
 	struct linux_binfmt ** tmp = &formats;
@@ -98,7 +68,6 @@
 	return 0;	
 }
 
-#ifdef CONFIG_MODULES
 int unregister_binfmt(struct linux_binfmt * fmt)
 {
 	struct linux_binfmt ** tmp = &formats;
@@ -112,7 +81,6 @@
 	}
 	return -EINVAL;
 }
-#endif	/* CONFIG_MODULES */
 
 /* N.B. Error returns must be < 0 */
 int open_dentry(struct dentry * dentry, int mode)
@@ -382,7 +350,7 @@
 
 		current->mm = mm;
 		current->active_mm = mm;
-		switch_mm(active_mm, mm, smp_processor_id());
+		activate_mm(active_mm, mm);
 		mm_release();
 		if (old_mm) {
 			if (active_mm != old_mm) BUG();