Merge with Linux 2.3.32.

5 files changed, 12 insertions, 10 deletions

diff --git a/arch/mips64/kernel/mips64_ksyms.c b/arch/mips64/kernel/mips64_ksyms.c
index d0647e4c5..4fc755e39 100644
--- a/arch/mips64/kernel/mips64_ksyms.c
+++ b/arch/mips64/kernel/mips64_ksyms.c
@@ -1,4 +1,4 @@
-/* $Id: mips64_ksyms.c,v 1.5 2000/01/17 23:32:46 ralf Exp $
+/* $Id: mips64_ksyms.c,v 1.6 2000/01/29 01:41:59 ralf Exp $
  *
  * Export MIPS64-specific functions needed for loadable modules.
  *
@@ -23,7 +23,7 @@
 #include <asm/floppy.h>
 #include <asm/io.h>
 #include <asm/page.h>
-#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
 #include <asm/softirq.h>
 #include <asm/uaccess.h>
 
diff --git a/arch/mips64/kernel/scall_o32.S b/arch/mips64/kernel/scall_o32.S
index f33a4afb2..f7490a4be 100644
--- a/arch/mips64/kernel/scall_o32.S
+++ b/arch/mips64/kernel/scall_o32.S
@@ -1,4 +1,4 @@
-/* $Id: scall_o32.S,v 1.3 2000/01/17 23:32:46 ralf Exp $
+/* $Id: scall_o32.S,v 1.4 2000/01/29 01:41:59 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
@@ -402,6 +402,9 @@ illegal_syscall:
 	sys	sys_ni_syscall	0
 	sys	sys_ni_syscall	0
 	sys	sys_getrlimit	2			/* 4210 */
+	sys	sys_mmap2	6
+	sys	sys_truncate64	2
+	sys	sys_ftruncate64	2
 	.endm
 
 	.macro	sys function, nargs
diff --git a/arch/mips64/kernel/setup.c b/arch/mips64/kernel/setup.c
index 35e5cb1dd..b42271b47 100644
--- a/arch/mips64/kernel/setup.c
+++ b/arch/mips64/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.3 1999/10/19 20:51:46 ralf Exp $
+/* $Id: setup.c,v 1.6 2000/01/27 01:05: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
@@ -93,7 +93,6 @@ unsigned char aux_device_present;
 extern int _end;
 
 extern void load_mmu(void);
-extern char empty_zero_page[PAGE_SIZE];
 
 static char command_line[CL_SIZE] = { 0, };
        char saved_command_line[CL_SIZE];
diff --git a/arch/mips64/kernel/signal.c b/arch/mips64/kernel/signal.c
index bc21e4d4c..7823efb3b 100644
--- a/arch/mips64/kernel/signal.c
+++ b/arch/mips64/kernel/signal.c
@@ -1,4 +1,4 @@
-/* $Id: signal.c,v 1.5 1999/10/19 20:51:46 ralf Exp $
+/* $Id: signal.c,v 1.4 2000/01/17 23:32:46 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
@@ -22,7 +22,7 @@
 
 #include <asm/asm.h>
 #include <asm/bitops.h>
-#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
 #include <asm/stackframe.h>
 #include <asm/uaccess.h>
 #include <asm/ucontext.h>
@@ -618,7 +618,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
 
 			case SIGQUIT: case SIGILL: case SIGTRAP:
 			case SIGABRT: case SIGFPE: case SIGSEGV:
-			case SIGBUS:
+			case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
 				if (do_coredump(signr, regs))
 					exit_code |= 0x80;
 				/* FALLTHRU */
diff --git a/arch/mips64/kernel/syscall.c b/arch/mips64/kernel/syscall.c
index 8273d5285..67d84f874 100644
--- a/arch/mips64/kernel/syscall.c
+++ b/arch/mips64/kernel/syscall.c
@@ -1,4 +1,4 @@
-/* $Id: syscall.c,v 1.1 1999/12/04 03:59:00 ralf Exp $
+/* $Id: syscall.c,v 1.2 2000/01/29 01:41:59 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
@@ -25,7 +25,7 @@
 #include <asm/ipc.h>
 #include <asm/cachectl.h>
 #include <asm/offset.h>
-#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
 #include <asm/ptrace.h>
 #include <asm/signal.h>
 #include <asm/stackframe.h>