summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/arc/console.c3
-rw-r--r--arch/mips/arc/init.c3
-rw-r--r--arch/mips/arc/memory.c3
-rw-r--r--arch/mips/arc/printf.c3
-rw-r--r--arch/mips/baget/balo_supp.S3
-rw-r--r--arch/mips/baget/prom/init.c3
-rw-r--r--arch/mips/baget/setup.c3
-rw-r--r--arch/mips/ddb5074/irq.c3
-rw-r--r--arch/mips/ddb5074/pci.c4
-rw-r--r--arch/mips/dec/prom/cmdline.c3
-rw-r--r--arch/mips/dec/prom/identify.c3
-rw-r--r--arch/mips/kernel/irixelf.c25
-rw-r--r--arch/mips/kernel/r2300_misc.S4
-rw-r--r--arch/mips/kernel/syscall.c4
-rw-r--r--arch/mips/kernel/sysirix.c4
-rw-r--r--arch/mips/kernel/time.c3
-rw-r--r--arch/mips/mm/loadmmu.c3
-rw-r--r--arch/mips/sgi/kernel/indy_int.c3
18 files changed, 39 insertions, 41 deletions
diff --git a/arch/mips/arc/console.c b/arch/mips/arc/console.c
index 4675eb4a1..4de5130fb 100644
--- a/arch/mips/arc/console.c
+++ b/arch/mips/arc/console.c
@@ -4,8 +4,9 @@
* Copyright (C) 1996 David S. Miller (dm@sgi.com)
* Compability with board caches, Ulf Carlsson
*
- * $Id: console.c,v 1.2 1999/06/12 18:42:38 ulfc Exp $
+ * $Id: console.c,v 1.3 1999/10/09 00:00:57 ralf Exp $
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <asm/sgialib.h>
#include <asm/bcache.h>
diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c
index 32117b858..81cf6cf74 100644
--- a/arch/mips/arc/init.c
+++ b/arch/mips/arc/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.3 1999/08/20 21:59:01 ralf Exp $
+/* $Id: init.c,v 1.4 1999/10/09 00:00:57 ralf Exp $
* This file is subject to the terms and conditions of the GNU General Public+
* License. See the file "COPYING" in the main directory of this archive
* for more details.
@@ -9,7 +9,6 @@
*/
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/config.h>
#include <asm/sgialib.h>
diff --git a/arch/mips/arc/memory.c b/arch/mips/arc/memory.c
index 4582297c2..d1c530fda 100644
--- a/arch/mips/arc/memory.c
+++ b/arch/mips/arc/memory.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*
- * $Id: memory.c,v 1.9 2000/01/27 01:05:23 ralf Exp $
+ * $Id: memory.c,v 1.10 2000/01/27 23:21:57 ralf Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
@@ -13,7 +13,6 @@
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <linux/swap.h>
-#include <linux/config.h>
#include <asm/sgialib.h>
#include <asm/page.h>
diff --git a/arch/mips/arc/printf.c b/arch/mips/arc/printf.c
index 17e5fe352..78b1b5937 100644
--- a/arch/mips/arc/printf.c
+++ b/arch/mips/arc/printf.c
@@ -4,8 +4,9 @@
*
* Copyright (C) 1996 David S. Miller (dm@sgi.com)
*
- * $Id: printf.c,v 1.2 1999/06/12 18:42:38 ulfc Exp $
+ * $Id: printf.c,v 1.3 1999/10/09 00:00:57 ralf Exp $
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
diff --git a/arch/mips/baget/balo_supp.S b/arch/mips/baget/balo_supp.S
index 6b79d22d3..96f2a8f50 100644
--- a/arch/mips/baget/balo_supp.S
+++ b/arch/mips/baget/balo_supp.S
@@ -1,10 +1,9 @@
-/* $Id$
+/* $Id: balo_supp.S,v 1.1 1999/01/17 03:49:38 ralf Exp $
* balo_supp.S: BAget Loader supplement
*
* Copyright (C) 1998 Gleb Raiko & Vladimir Roganov
*/
-#include <linux/config.h>
#include <asm/asm.h>
#include <asm/regdef.h>
#include <asm/stackframe.h>
diff --git a/arch/mips/baget/prom/init.c b/arch/mips/baget/prom/init.c
index ad576f984..a87c004ec 100644
--- a/arch/mips/baget/prom/init.c
+++ b/arch/mips/baget/prom/init.c
@@ -3,10 +3,9 @@
*
* Copyright (C) 1998 Gleb Raiko & Vladimir Roganov
*
- * $Id: init.c,v 1.2 1999/08/17 22:18:38 ralf Exp $
+ * $Id: init.c,v 1.3 1999/10/09 00:00:57 ralf Exp $
*/
#include <linux/init.h>
-#include <linux/config.h>
#include <asm/bootinfo.h>
char arcs_cmdline[CL_SIZE];
diff --git a/arch/mips/baget/setup.c b/arch/mips/baget/setup.c
index 07a7ede00..dd0a7733e 100644
--- a/arch/mips/baget/setup.c
+++ b/arch/mips/baget/setup.c
@@ -1,11 +1,10 @@
-/* $Id: setup.c,v 1.3 1999/08/13 17:07:26 harald Exp $
+/* $Id: setup.c,v 1.4 1999/10/09 00:00:57 ralf Exp $
*
* setup.c: Baget/MIPS specific setup, including init of the feature struct.
*
* Copyright (C) 1998 Gleb Raiko & Vladimir Roganov
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
diff --git a/arch/mips/ddb5074/irq.c b/arch/mips/ddb5074/irq.c
index 1faba4c5c..4fee350e2 100644
--- a/arch/mips/ddb5074/irq.c
+++ b/arch/mips/ddb5074/irq.c
@@ -4,9 +4,10 @@
* Copyright (C) 2000 Geert Uytterhoeven <geert@sonycom.com>
* Sony Suprastructure Center Europe (SUPC-E), Brussels
*
- * $Id$
+ * $Id: irq.c,v 1.1 2000/01/26 00:07:44 ralf Exp $
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/signal.h>
#include <linux/sched.h>
diff --git a/arch/mips/ddb5074/pci.c b/arch/mips/ddb5074/pci.c
index 50dffdcc2..e0f39c666 100644
--- a/arch/mips/ddb5074/pci.c
+++ b/arch/mips/ddb5074/pci.c
@@ -5,16 +5,14 @@
* Albert Dorofeev <albert@sonycom.com>
* Sony Suprastructure Center Europe (SUPC-E), Brussels
*
- * $Id: pci.c,v 1.3 2000/02/16 01:45:55 ralf Exp $
+ * $Id: pci.c,v 1.4 2000/02/18 00:02:17 ralf Exp $
*/
#include <linux/init.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <linux/sched.h>
-#include <linux/pci.h>
#include <linux/ioport.h>
#include <asm-mips/nile4.h>
diff --git a/arch/mips/dec/prom/cmdline.c b/arch/mips/dec/prom/cmdline.c
index 421d4058b..27b31818a 100644
--- a/arch/mips/dec/prom/cmdline.c
+++ b/arch/mips/dec/prom/cmdline.c
@@ -3,11 +3,10 @@
*
* Copyright (C) 1998 Harald Koerfgen
*
- * $Id: cmdline.c,v 1.1 1999/01/17 03:49:44 ralf Exp $
+ * $Id: cmdline.c,v 1.2 1999/10/09 00:00:57 ralf Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/config.h>
#include <linux/string.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/dec/prom/identify.c b/arch/mips/dec/prom/identify.c
index dbb1e98bc..6acacc1c4 100644
--- a/arch/mips/dec/prom/identify.c
+++ b/arch/mips/dec/prom/identify.c
@@ -3,10 +3,9 @@
*
* Copyright (C) 1998 Harald Koerfgen and Paul M. Antoine
*
- * $Id: identify.c,v 1.1 1999/01/17 03:49:44 ralf Exp $
+ * $Id: identify.c,v 1.2 1999/10/09 00:00:58 ralf Exp $
*/
#include <linux/init.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index 41ea11b98..fa9e68e6f 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -1,4 +1,4 @@
-/* $Id: irixelf.c,v 1.24 2000/02/04 07:40:23 ralf Exp $
+/* $Id: irixelf.c,v 1.25 2000/03/02 02:36:50 ralf Exp $
*
* irixelf.c: Code to load IRIX ELF executables which conform to
* the MIPS ABI.
@@ -29,6 +29,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <linux/elfcore.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/pgalloc.h>
@@ -449,29 +450,31 @@ static inline int look_for_irix_interpreter(char **name,
*name = NULL;
for(i = 0; i < pnum; i++, epp++) {
- if(epp->p_type != PT_INTERP)
+ if (epp->p_type != PT_INTERP)
continue;
/* It is illegal to have two interpreters for one executable. */
- if(*name != NULL)
+ if (*name != NULL)
goto out;
*name = (char *) kmalloc((epp->p_filesz +
strlen(IRIX_INTERP_PREFIX)),
GFP_KERNEL);
- if(!*name)
+ if (!*name)
return -ENOMEM;
strcpy(*name, IRIX_INTERP_PREFIX);
retval = read_exec(bprm->dentry, epp->p_offset, (*name + 16),
epp->p_filesz, 1);
- if(retval < 0)
+ if (retval < 0)
goto out;
old_fs = get_fs(); set_fs(get_ds());
+ lock_kernel();
dentry = namei(*name);
+ unlock_kernel();
set_fs(old_fs);
- if(IS_ERR(dentry)) {
+ if (IS_ERR(dentry)) {
retval = PTR_ERR(dentry);
goto out;
}
@@ -485,7 +488,9 @@ static inline int look_for_irix_interpreter(char **name,
return 0;
dput_and_out:
+ lock_kernel();
dput(dentry);
+ unlock_kernel();
out:
kfree(*name);
return retval;
@@ -566,7 +571,9 @@ static inline int map_interpreter(struct elf_phdr *epp, struct elfhdr *ihp,
old_fs = get_fs();
set_fs(get_ds());
+ lock_kernel();
dput(identry);
+ unlock_kernel();
if(*eentry == 0xffffffff)
return -1;
@@ -682,10 +689,10 @@ static inline int do_load_irix_binary(struct linux_binprm * bprm,
&interpreter_dentry,
&interp_elf_ex, elf_phdata, bprm,
elf_ex.e_phnum);
- if(retval)
+ if (retval)
goto out_free_file;
- if(elf_interpreter) {
+ if (elf_interpreter) {
retval = verify_irix_interpreter(&interp_elf_ex);
if(retval)
goto out_free_interp;
@@ -811,7 +818,9 @@ out:
return retval;
out_free_dentry:
+ lock_kernel();
dput(interpreter_dentry);
+ unlock_kernel();
out_free_interp:
if (elf_interpreter)
kfree(elf_interpreter);
diff --git a/arch/mips/kernel/r2300_misc.S b/arch/mips/kernel/r2300_misc.S
index 149012a1f..30031e295 100644
--- a/arch/mips/kernel/r2300_misc.S
+++ b/arch/mips/kernel/r2300_misc.S
@@ -1,4 +1,4 @@
-/* $Id: r2300_misc.S,v 1.7 1999/10/09 00:00:58 ralf Exp $
+/* $Id: r2300_misc.S,v 1.8 1999/12/08 22:05:10 harald Exp $
* misc.S: Misc. exception handling code for R3000/R2000.
*
* Copyright (C) 1994, 1995, 1996 by Ralf Baechle and Andreas Busse
@@ -10,8 +10,6 @@
* Copyright (c) 1998 Harald Koerfgen
* Copyright (c) 1998, 1999 Gleb Raiko & Vladimir Roganov
*/
-#include <linux/config.h>
-
#include <asm/asm.h>
#include <asm/current.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 0f5124280..d2df0dc20 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -1,4 +1,4 @@
-/* $Id: syscall.c,v 1.12 1999/12/04 03:59:00 ralf Exp $
+/* $Id: syscall.c,v 1.13 2000/02/04 07:40:23 ralf Exp $
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
@@ -129,7 +129,6 @@ asmlinkage int sys_execve(struct pt_regs regs)
int error;
char * filename;
- lock_kernel();
filename = getname((char *) (long)regs.regs[4]);
error = PTR_ERR(filename);
if (IS_ERR(filename))
@@ -139,7 +138,6 @@ asmlinkage int sys_execve(struct pt_regs regs)
putname(filename);
out:
- unlock_kernel();
return error;
}
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index 362d6a760..0c07b8dd6 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -1,4 +1,4 @@
-/* $Id: sysirix.c,v 1.23 2000/02/04 07:40:23 ralf Exp $
+/* $Id: sysirix.c,v 1.24 2000/02/05 06:47:08 ralf Exp $
*
* sysirix.c: IRIX system call emulation.
*
@@ -878,7 +878,6 @@ asmlinkage int irix_exec(struct pt_regs *regs)
int error, base = 0;
char *filename;
- lock_kernel();
if(regs->regs[2] == 1000)
base = 1;
filename = getname((char *) (long)regs->regs[base + 4]);
@@ -890,7 +889,6 @@ asmlinkage int irix_exec(struct pt_regs *regs)
putname(filename);
out:
- unlock_kernel();
return error;
}
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index a35da14d2..ea36ed5b2 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.13 1999/10/09 00:00:58 ralf Exp $
+/* $Id: time.c,v 1.14 2000/01/26 00:07:44 ralf Exp $
*
* Copyright (C) 1991, 1992, 1995 Linus Torvalds
* Copyright (C) 1996, 1997, 1998 Ralf Baechle
@@ -6,6 +6,7 @@
* This file contains the time handling details for PC-style clocks as
* found in some MIPS systems.
*/
+#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/sched.h>
diff --git a/arch/mips/mm/loadmmu.c b/arch/mips/mm/loadmmu.c
index afbbef5eb..cb5e1e66d 100644
--- a/arch/mips/mm/loadmmu.c
+++ b/arch/mips/mm/loadmmu.c
@@ -3,8 +3,9 @@
*
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*
- * $Id: loadmmu.c,v 1.14 2000/01/27 01:05:23 ralf Exp $
+ * $Id: loadmmu.c,v 1.15 2000/02/24 00:12:40 ralf Exp $
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
diff --git a/arch/mips/sgi/kernel/indy_int.c b/arch/mips/sgi/kernel/indy_int.c
index cab112c29..06d8573cb 100644
--- a/arch/mips/sgi/kernel/indy_int.c
+++ b/arch/mips/sgi/kernel/indy_int.c
@@ -1,4 +1,4 @@
-/* $Id: indy_int.c,v 1.17 2000/02/04 07:40:23 ralf Exp $
+/* $Id: indy_int.c,v 1.18 2000/03/02 02:36:50 ralf Exp $
*
* indy_int.c: Routines for generic manipulation of the INT[23] ASIC
* found on INDY workstations..
@@ -9,7 +9,6 @@
* - Indigo2 changes
* - Interrupt handling fixes
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/errno.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 17:25:30 +0000