patch-2.3.99-pre1 linux/arch/mips/kernel/irixelf.c

• Lines: 87
• Date: Mon Mar 13 22:18:11 2000
• Orig file: v2.3.51/linux/arch/mips/kernel/irixelf.c
• Orig date: Sat Feb 26 22:31:40 2000

diff -u --recursive --new-file v2.3.51/linux/arch/mips/kernel/irixelf.c linux/arch/mips/kernel/irixelf.c
@@ -35,8 +35,6 @@
 #include <asm/mipsregs.h>
 #include <asm/prctl.h>
 
-#include <linux/config.h>
-
 #define DLINFO_ITEMS 12
 
 #include <linux/elf.h>
@@ -602,8 +600,7 @@
 /* These are the functions used to load ELF style executables and shared
  * libraries.  There is no binary dependent code anywhere else.
  */
-static inline int do_load_irix_binary(struct linux_binprm * bprm,
-				      struct pt_regs * regs)
+static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs)
 {
 	struct elfhdr elf_ex, interp_elf_ex;
 	struct dentry *interpreter_dentry;
@@ -748,14 +745,11 @@
 	sys_close(elf_exec_fileno);
 	current->personality = PER_IRIX32;
 
-	if (current->exec_domain && current->exec_domain->module)
-		__MOD_DEC_USE_COUNT(current->exec_domain->module);
+	put_exec_domain(current->exec_domain);
 	if (current->binfmt && current->binfmt->module)
 		__MOD_DEC_USE_COUNT(current->binfmt->module);
 	current->exec_domain = lookup_exec_domain(current->personality);
 	current->binfmt = &irix_format;
-	if (current->exec_domain && current->exec_domain->module)
-		__MOD_INC_USE_COUNT(current->exec_domain->module);
 	if (current->binfmt && current->binfmt->module)
 		__MOD_INC_USE_COUNT(current->binfmt->module);
 
@@ -823,16 +817,6 @@
 	goto out;
 }
 
-static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs)
-{
-	int retval;
-
-	MOD_INC_USE_COUNT;
-	retval = do_load_irix_binary(bprm, regs);
-	MOD_DEC_USE_COUNT;
-	return retval;
-}
-
 /* This is really simpleminded and specialized - we are loading an
  * a.out library that is given an ELF header.
  */
@@ -934,13 +918,11 @@
 	int retval = -EACCES;
 	struct file *file;
 
-	MOD_INC_USE_COUNT;
 	file = fget(fd);
 	if (file) {
 		retval = do_load_irix_library(file);
 		fput(file);
 	}
-	MOD_DEC_USE_COUNT;
 	return retval;
 }
 	
@@ -1143,10 +1125,6 @@
 	elf_fpregset_t fpu;		/* NT_PRFPREG */
 	struct elf_prpsinfo psinfo;	/* NT_PRPSINFO */
 
-#ifndef CONFIG_BINFMT_IRIX
-	MOD_INC_USE_COUNT;
-#endif
-
 	/* Count what's needed to dump, up to the limit of coredump size. */
 	segs = 0;
 	size = 0;
@@ -1356,9 +1334,6 @@
 
 end_coredump:
 	set_fs(fs);
-#ifndef CONFIG_BINFMT_IRIX
-	MOD_DEC_USE_COUNT;
-#endif
 	return has_dumped;
 }