summaryrefslogtreecommitdiffstats
path: root/arch/mips64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips64')
-rw-r--r--arch/mips64/arc/init.c3
-rw-r--r--arch/mips64/arc/memory.c4
-rw-r--r--arch/mips64/defconfig-ip221
-rw-r--r--arch/mips64/kernel/signal32.c3
-rw-r--r--arch/mips64/kernel/syscall.c5
-rw-r--r--arch/mips64/sgi-ip27/ip27-init.c1
-rw-r--r--arch/mips64/sgi-ip27/ip27-irq.c3
-rw-r--r--arch/mips64/sgi-ip27/ip27-rtc.c13
-rw-r--r--arch/mips64/sgi-ip27/ip27-setup.c3
-rw-r--r--arch/mips64/sgi-ip27/ip27-timer.c5
10 files changed, 11 insertions, 30 deletions
diff --git a/arch/mips64/arc/init.c b/arch/mips64/arc/init.c
index 496f296ef..b961fc899 100644
--- a/arch/mips64/arc/init.c
+++ b/arch/mips64/arc/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.3 1999/10/19 20:51:45 ralf Exp $
+/* $Id: init.c,v 1.3 1999/11/19 23:29:05 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
@@ -10,7 +10,6 @@
*/
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/config.h>
#include <asm/sgialib.h>
diff --git a/arch/mips64/arc/memory.c b/arch/mips64/arc/memory.c
index 78a37a841..58d4835ea 100644
--- a/arch/mips64/arc/memory.c
+++ b/arch/mips64/arc/memory.c
@@ -1,4 +1,4 @@
-/* $Id: memory.c,v 1.4 2000/01/17 23:32:46 ralf Exp $
+/* $Id: memory.c,v 1.5 2000/01/27 23:21: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
@@ -13,7 +13,6 @@
* because on some machines like SGI IP27 the ARC memory configuration data
* completly bogus and alternate easier to use mechanisms are available.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@ -21,7 +20,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/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22
index b40469cfc..4caa8e70d 100644
--- a/arch/mips64/defconfig-ip22
+++ b/arch/mips64/defconfig-ip22
@@ -134,6 +134,7 @@ CONFIG_NETDEVICES=y
#
# CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_NET_SB1000 is not set
diff --git a/arch/mips64/kernel/signal32.c b/arch/mips64/kernel/signal32.c
index 6983cfdc2..109c4d37b 100644
--- a/arch/mips64/kernel/signal32.c
+++ b/arch/mips64/kernel/signal32.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: signal32.c,v 1.2 2000/02/18 00:03:48 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
@@ -8,7 +8,6 @@
* Copyright (C) 1994 - 1999 Ralf Baechle
* Copyright (C) 1999 Silicon Graphics, Inc.
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/smp.h>
diff --git a/arch/mips64/kernel/syscall.c b/arch/mips64/kernel/syscall.c
index 67d84f874..ea225ff08 100644
--- a/arch/mips64/kernel/syscall.c
+++ b/arch/mips64/kernel/syscall.c
@@ -1,4 +1,4 @@
-/* $Id: syscall.c,v 1.2 2000/01/29 01:41:59 ralf Exp $
+/* $Id: syscall.c,v 1.3 2000/02/04 07:40:24 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
@@ -7,7 +7,6 @@
* Copyright (C) 1995 - 1999 by Ralf Baechle
* Copyright (C) 1999 Silicon Graphics, Inc.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/linkage.h>
#include <linux/mm.h>
@@ -109,7 +108,6 @@ asmlinkage int sys_execve(abi64_no_regargs, 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))
@@ -119,7 +117,6 @@ asmlinkage int sys_execve(abi64_no_regargs, struct pt_regs regs)
putname(filename);
out:
- unlock_kernel();
return error;
}
diff --git a/arch/mips64/sgi-ip27/ip27-init.c b/arch/mips64/sgi-ip27/ip27-init.c
index f6b3d6e09..e09bc6036 100644
--- a/arch/mips64/sgi-ip27/ip27-init.c
+++ b/arch/mips64/sgi-ip27/ip27-init.c
@@ -7,7 +7,6 @@
#include <asm/sn/klconfig.h>
#include <asm/ioc3.h>
#include <asm/mipsregs.h>
-#include <asm/sn/klconfig.h>
#include <asm/sn/gda.h>
typedef unsigned long cpumask_t; /* into asm/sn/types.h */
diff --git a/arch/mips64/sgi-ip27/ip27-irq.c b/arch/mips64/sgi-ip27/ip27-irq.c
index c9e6fe150..d7ddb8682 100644
--- a/arch/mips64/sgi-ip27/ip27-irq.c
+++ b/arch/mips64/sgi-ip27/ip27-irq.c
@@ -1,11 +1,10 @@
-/* $Id: ip27-irq.c,v 1.6 2000/02/10 05:58:56 dagum Exp $
+/* $Id: ip27-irq.c,v 1.7 2000/03/02 02:36:50 ralf Exp $
*
* ip27-irq.c: Highlevel interrupt handling for IP27 architecture.
*
* Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
* Copyright (C) 1999 Silicon Graphics, Inc.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/errno.h>
diff --git a/arch/mips64/sgi-ip27/ip27-rtc.c b/arch/mips64/sgi-ip27/ip27-rtc.c
index bf85c06f2..e5f174ab1 100644
--- a/arch/mips64/sgi-ip27/ip27-rtc.c
+++ b/arch/mips64/sgi-ip27/ip27-rtc.c
@@ -192,16 +192,9 @@ static int rtc_release(struct inode *inode, struct file *file)
*/
static struct file_operations rtc_fops = {
- NULL, /* No llseek (yet) */
- NULL, /* No read (yet) */
- NULL, /* No write */
- NULL, /* No readdir */
- NULL, /* No poll (yet) */
- rtc_ioctl,
- NULL, /* No mmap */
- rtc_open,
- NULL, /* flush */
- rtc_release
+ ioctl: rtc_ioctl,
+ open: rtc_open,
+ release: rtc_release,
};
static struct miscdevice rtc_dev=
diff --git a/arch/mips64/sgi-ip27/ip27-setup.c b/arch/mips64/sgi-ip27/ip27-setup.c
index c97eeb8b6..f0d7d66ab 100644
--- a/arch/mips64/sgi-ip27/ip27-setup.c
+++ b/arch/mips64/sgi-ip27/ip27-setup.c
@@ -1,4 +1,4 @@
-/* $Id: ip27-setup.c,v 1.3 2000/01/21 22:34:03 ralf Exp $
+/* $Id: ip27-setup.c,v 1.6 2000/02/05 02:12:32 kanoj 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
@@ -19,7 +19,6 @@
#include <asm/sn/klconfig.h>
#include <asm/ioc3.h>
#include <asm/mipsregs.h>
-#include <asm/sn/klconfig.h>
/* Check against user dumbness. */
#ifdef CONFIG_VT
diff --git a/arch/mips64/sgi-ip27/ip27-timer.c b/arch/mips64/sgi-ip27/ip27-timer.c
index c75fa725f..ff6ea60e7 100644
--- a/arch/mips64/sgi-ip27/ip27-timer.c
+++ b/arch/mips64/sgi-ip27/ip27-timer.c
@@ -1,4 +1,4 @@
-/* $Id: ip27-timer.c,v 1.2 2000/01/27 01:05:24 ralf Exp $
+/* $Id: ip27-timer.c,v 1.3 2000/02/18 09:54:40 ulfc Exp $
*
* Copytight (C) 1999 Ralf Baechle (ralf@gnu.org)
* Copytight (C) 1999 Silicon Graphics, Inc.
@@ -148,13 +148,10 @@ void do_settimeofday(struct timeval *tv)
}
/* Includes for ioc3_init(). */
-#include <linux/init.h>
#include <asm/sn/types.h>
#include <asm/sn/sn0/addrs.h>
#include <asm/sn/sn0/hubni.h>
#include <asm/sn/sn0/hubio.h>
-#include <asm/sn/klconfig.h>
-#include <asm/ioc3.h>
#include <asm/pci/bridge.h>
/* Converts Gregorian date to seconds since 1970-01-01 00:00:00.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 17:53:25 +0000