- Drop support for 32/32 fp register model

 - Fix siginfo structure definition
 - Ptrace fixes, one of them was an uninitialized pointer.
 - Header file fixes.
 - Fixes to linker scripts required for new binutils.

 - MIPS64.  Chainsaw edition.

Btw, Harald, why does the kernel no longer compile ...

14 files changed, 209 insertions, 251 deletions

diff --git a/include/asm-mips/asmmacro.h b/include/asm-mips/asmmacro.h
index ba4205dbd..fb3692dd7 100644
--- a/include/asm-mips/asmmacro.h
+++ b/include/asm-mips/asmmacro.h
@@ -4,157 +4,123 @@
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  * Copyright (C) 1998 Ralf Baechle
  *
- * $Id: asmmacro.h,v 1.3 1998/03/23 06:34:33 ralf Exp $
+ * $Id: asmmacro.h,v 1.3 1998/03/27 04:47:58 ralf Exp $
  */
 #ifndef __MIPS_ASMMACRO_H
 #define __MIPS_ASMMACRO_H
 
 #include <asm/offset.h>
 
-#define FPU_SAVE_16EVEN(thread, tmp) \
+#define FPU_SAVE_DOUBLE(thread, tmp) \
 	cfc1	tmp,  fcr31;                    \
-	sdc1	$f2,  (THREAD_FPU + 0x010)(thread); \
-	sdc1	$f4,  (THREAD_FPU + 0x020)(thread); \
-	sdc1	$f6,  (THREAD_FPU + 0x030)(thread); \
-	sdc1	$f8,  (THREAD_FPU + 0x040)(thread); \
-	sdc1	$f10, (THREAD_FPU + 0x050)(thread); \
-	sdc1	$f12, (THREAD_FPU + 0x060)(thread); \
-	sdc1	$f14, (THREAD_FPU + 0x070)(thread); \
-	sdc1	$f16, (THREAD_FPU + 0x080)(thread); \
-	sdc1	$f18, (THREAD_FPU + 0x090)(thread); \
-	sdc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
-	sdc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
-	sdc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
-	sdc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
-	sdc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
-	sdc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
-	sw	tmp,  (THREAD_FPU + 0x100)(thread)
+	sdc1	$f0,  (THREAD_FPU + 0x000)(thread); \
+	sdc1	$f2,  (THREAD_FPU + 0x008)(thread); \
+	sdc1	$f4,  (THREAD_FPU + 0x010)(thread); \
+	sdc1	$f6,  (THREAD_FPU + 0x018)(thread); \
+	sdc1	$f8,  (THREAD_FPU + 0x020)(thread); \
+	sdc1	$f10, (THREAD_FPU + 0x028)(thread); \
+	sdc1	$f12, (THREAD_FPU + 0x030)(thread); \
+	sdc1	$f14, (THREAD_FPU + 0x038)(thread); \
+	sdc1	$f16, (THREAD_FPU + 0x040)(thread); \
+	sdc1	$f18, (THREAD_FPU + 0x048)(thread); \
+	sdc1	$f20, (THREAD_FPU + 0x050)(thread); \
+	sdc1	$f22, (THREAD_FPU + 0x058)(thread); \
+	sdc1	$f24, (THREAD_FPU + 0x060)(thread); \
+	sdc1	$f26, (THREAD_FPU + 0x068)(thread); \
+	sdc1	$f28, (THREAD_FPU + 0x070)(thread); \
+	sdc1	$f30, (THREAD_FPU + 0x078)(thread); \
+	sw	tmp,  (THREAD_FPU + 0x080)(thread)
 
-#define FPU_SAVE_16ODD(thread) \
-	sdc1	$f1,  (THREAD_FPU + 0x08)(thread); \
-	sdc1	$f3,  (THREAD_FPU + 0x18)(thread); \
-	sdc1	$f5,  (THREAD_FPU + 0x28)(thread); \
-	sdc1	$f7,  (THREAD_FPU + 0x38)(thread); \
-	sdc1	$f9,  (THREAD_FPU + 0x48)(thread); \
-	sdc1	$f11, (THREAD_FPU + 0x58)(thread); \
-	sdc1	$f13, (THREAD_FPU + 0x68)(thread); \
-	sdc1	$f15, (THREAD_FPU + 0x78)(thread); \
-	sdc1	$f17, (THREAD_FPU + 0x88)(thread); \
-	sdc1	$f19, (THREAD_FPU + 0x98)(thread); \
-	sdc1	$f21, (THREAD_FPU + 0xa8)(thread); \
-	sdc1	$f23, (THREAD_FPU + 0xb8)(thread); \
-	sdc1	$f25, (THREAD_FPU + 0xc8)(thread); \
-	sdc1	$f27, (THREAD_FPU + 0xd8)(thread); \
-	sdc1	$f29, (THREAD_FPU + 0xe8)(thread); \
-	sdc1	$f31, (THREAD_FPU + 0xf8)(thread)
-
-#define FPU_SAVE(thread,tmp)                        \
+#define FPU_SAVE_SINGLE(thread,tmp)                 \
 	cfc1	tmp,  fcr31;                        \
 	swc1	$f0,  (THREAD_FPU + 0x000)(thread); \
-	swc1	$f1,  (THREAD_FPU + 0x008)(thread); \
-	swc1	$f2,  (THREAD_FPU + 0x010)(thread); \
-	swc1	$f3,  (THREAD_FPU + 0x018)(thread); \
-	swc1	$f4,  (THREAD_FPU + 0x020)(thread); \
-	swc1	$f5,  (THREAD_FPU + 0x028)(thread); \
-	swc1	$f6,  (THREAD_FPU + 0x030)(thread); \
-	swc1	$f7,  (THREAD_FPU + 0x038)(thread); \
-	swc1	$f8,  (THREAD_FPU + 0x040)(thread); \
-	swc1	$f9,  (THREAD_FPU + 0x048)(thread); \
-	swc1	$f10, (THREAD_FPU + 0x050)(thread); \
-	swc1	$f11, (THREAD_FPU + 0x058)(thread); \
-	swc1	$f12, (THREAD_FPU + 0x060)(thread); \
-	swc1	$f13, (THREAD_FPU + 0x068)(thread); \
-	swc1	$f14, (THREAD_FPU + 0x070)(thread); \
-	swc1	$f15, (THREAD_FPU + 0x078)(thread); \
-	swc1	$f16, (THREAD_FPU + 0x080)(thread); \
-	swc1	$f17, (THREAD_FPU + 0x088)(thread); \
-	swc1	$f18, (THREAD_FPU + 0x090)(thread); \
-	swc1	$f19, (THREAD_FPU + 0x098)(thread); \
-	swc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
-	swc1	$f21, (THREAD_FPU + 0x0a8)(thread); \
-	swc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
-	swc1	$f23, (THREAD_FPU + 0x0b8)(thread); \
-	swc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
-	swc1	$f25, (THREAD_FPU + 0x0c8)(thread); \
-	swc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
-	swc1	$f27, (THREAD_FPU + 0x0d8)(thread); \
-	swc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
-	swc1	$f29, (THREAD_FPU + 0x0e8)(thread); \
-	swc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
-	swc1	$f31, (THREAD_FPU + 0x0f8)(thread); \
-	sw	tmp,  (THREAD_FPU + 0x100)(thread)
+	swc1	$f1,  (THREAD_FPU + 0x004)(thread); \
+	swc1	$f2,  (THREAD_FPU + 0x008)(thread); \
+	swc1	$f3,  (THREAD_FPU + 0x00c)(thread); \
+	swc1	$f4,  (THREAD_FPU + 0x010)(thread); \
+	swc1	$f5,  (THREAD_FPU + 0x014)(thread); \
+	swc1	$f6,  (THREAD_FPU + 0x018)(thread); \
+	swc1	$f7,  (THREAD_FPU + 0x01c)(thread); \
+	swc1	$f8,  (THREAD_FPU + 0x020)(thread); \
+	swc1	$f9,  (THREAD_FPU + 0x024)(thread); \
+	swc1	$f10, (THREAD_FPU + 0x028)(thread); \
+	swc1	$f11, (THREAD_FPU + 0x02c)(thread); \
+	swc1	$f12, (THREAD_FPU + 0x030)(thread); \
+	swc1	$f13, (THREAD_FPU + 0x034)(thread); \
+	swc1	$f14, (THREAD_FPU + 0x038)(thread); \
+	swc1	$f15, (THREAD_FPU + 0x03c)(thread); \
+	swc1	$f16, (THREAD_FPU + 0x040)(thread); \
+	swc1	$f17, (THREAD_FPU + 0x044)(thread); \
+	swc1	$f18, (THREAD_FPU + 0x048)(thread); \
+	swc1	$f19, (THREAD_FPU + 0x04c)(thread); \
+	swc1	$f20, (THREAD_FPU + 0x050)(thread); \
+	swc1	$f21, (THREAD_FPU + 0x054)(thread); \
+	swc1	$f22, (THREAD_FPU + 0x058)(thread); \
+	swc1	$f23, (THREAD_FPU + 0x05c)(thread); \
+	swc1	$f24, (THREAD_FPU + 0x060)(thread); \
+	swc1	$f25, (THREAD_FPU + 0x064)(thread); \
+	swc1	$f26, (THREAD_FPU + 0x068)(thread); \
+	swc1	$f27, (THREAD_FPU + 0x06c)(thread); \
+	swc1	$f28, (THREAD_FPU + 0x070)(thread); \
+	swc1	$f29, (THREAD_FPU + 0x074)(thread); \
+	swc1	$f30, (THREAD_FPU + 0x078)(thread); \
+	swc1	$f31, (THREAD_FPU + 0x07c)(thread); \
+	sw	tmp,  (THREAD_FPU + 0x080)(thread)
 
-#define FPU_RESTORE_16EVEN(thread, tmp) \
-	lw	tmp,  (THREAD_FPU + 0x100)(thread); \
-	ldc1	$f2,  (THREAD_FPU + 0x010)(thread); \
-	ldc1	$f4,  (THREAD_FPU + 0x020)(thread); \
-	ldc1	$f6,  (THREAD_FPU + 0x030)(thread); \
-	ldc1	$f8,  (THREAD_FPU + 0x040)(thread); \
-	ldc1	$f10, (THREAD_FPU + 0x050)(thread); \
-	ldc1	$f12, (THREAD_FPU + 0x060)(thread); \
-	ldc1	$f14, (THREAD_FPU + 0x070)(thread); \
-	ldc1	$f16, (THREAD_FPU + 0x080)(thread); \
-	ldc1	$f18, (THREAD_FPU + 0x090)(thread); \
-	ldc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
-	ldc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
-	ldc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
-	ldc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
-	ldc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
-	ldc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
+#define FPU_RESTORE_DOUBLE(thread, tmp) \
+	lw	tmp,  (THREAD_FPU + 0x080)(thread); \
+	ldc1	$f0,  (THREAD_FPU + 0x000)(thread); \
+	ldc1	$f2,  (THREAD_FPU + 0x008)(thread); \
+	ldc1	$f4,  (THREAD_FPU + 0x010)(thread); \
+	ldc1	$f6,  (THREAD_FPU + 0x018)(thread); \
+	ldc1	$f8,  (THREAD_FPU + 0x020)(thread); \
+	ldc1	$f10, (THREAD_FPU + 0x028)(thread); \
+	ldc1	$f12, (THREAD_FPU + 0x030)(thread); \
+	ldc1	$f14, (THREAD_FPU + 0x038)(thread); \
+	ldc1	$f16, (THREAD_FPU + 0x040)(thread); \
+	ldc1	$f18, (THREAD_FPU + 0x048)(thread); \
+	ldc1	$f20, (THREAD_FPU + 0x050)(thread); \
+	ldc1	$f22, (THREAD_FPU + 0x058)(thread); \
+	ldc1	$f24, (THREAD_FPU + 0x060)(thread); \
+	ldc1	$f26, (THREAD_FPU + 0x068)(thread); \
+	ldc1	$f28, (THREAD_FPU + 0x070)(thread); \
+	ldc1	$f30, (THREAD_FPU + 0x078)(thread); \
 	ctc1	tmp,  fcr31
 
-#define FPU_RESTORE_16ODD(thread)  \
-	ldc1	$f1,  (THREAD_FPU + 0x08)(thread); \
-	ldc1	$f3,  (THREAD_FPU + 0x18)(thread); \
-	ldc1	$f5,  (THREAD_FPU + 0x28)(thread); \
-	ldc1	$f7,  (THREAD_FPU + 0x38)(thread); \
-	ldc1	$f9,  (THREAD_FPU + 0x48)(thread); \
-	ldc1	$f11, (THREAD_FPU + 0x58)(thread); \
-	ldc1	$f13, (THREAD_FPU + 0x68)(thread); \
-	ldc1	$f15, (THREAD_FPU + 0x78)(thread); \
-	ldc1	$f17, (THREAD_FPU + 0x88)(thread); \
-	ldc1	$f19, (THREAD_FPU + 0x98)(thread); \
-	ldc1	$f21, (THREAD_FPU + 0xa8)(thread); \
-	ldc1	$f23, (THREAD_FPU + 0xb8)(thread); \
-	ldc1	$f25, (THREAD_FPU + 0xc8)(thread); \
-	ldc1	$f27, (THREAD_FPU + 0xd8)(thread); \
-	ldc1	$f29, (THREAD_FPU + 0xe8)(thread); \
-	ldc1	$f31, (THREAD_FPU + 0xf8)(thread)
-
-#define FPU_RESTORE(thread,tmp)                     \
-	lw	tmp,  (THREAD_FPU + 0x100)(thread); \
+#define FPU_RESTORE_SINGLE(thread,tmp)              \
+	lw	tmp,  (THREAD_FPU + 0x080)(thread); \
 	lwc1	$f0,  (THREAD_FPU + 0x000)(thread); \
-	lwc1	$f1,  (THREAD_FPU + 0x008)(thread); \
-	lwc1	$f2,  (THREAD_FPU + 0x010)(thread); \
-	lwc1	$f3,  (THREAD_FPU + 0x018)(thread); \
-	lwc1	$f4,  (THREAD_FPU + 0x020)(thread); \
-	lwc1	$f5,  (THREAD_FPU + 0x028)(thread); \
-	lwc1	$f6,  (THREAD_FPU + 0x030)(thread); \
-	lwc1	$f7,  (THREAD_FPU + 0x038)(thread); \
-	lwc1	$f8,  (THREAD_FPU + 0x040)(thread); \
-	lwc1	$f9,  (THREAD_FPU + 0x048)(thread); \
-	lwc1	$f10, (THREAD_FPU + 0x050)(thread); \
-	lwc1	$f11, (THREAD_FPU + 0x058)(thread); \
-	lwc1	$f12, (THREAD_FPU + 0x060)(thread); \
-	lwc1	$f13, (THREAD_FPU + 0x068)(thread); \
-	lwc1	$f14, (THREAD_FPU + 0x070)(thread); \
-	lwc1	$f15, (THREAD_FPU + 0x078)(thread); \
-	lwc1	$f16, (THREAD_FPU + 0x080)(thread); \
-	lwc1	$f17, (THREAD_FPU + 0x088)(thread); \
-	lwc1	$f18, (THREAD_FPU + 0x090)(thread); \
-	lwc1	$f19, (THREAD_FPU + 0x098)(thread); \
-	lwc1	$f20, (THREAD_FPU + 0x0a0)(thread); \
-	lwc1	$f21, (THREAD_FPU + 0x0a8)(thread); \
-	lwc1	$f22, (THREAD_FPU + 0x0b0)(thread); \
-	lwc1	$f23, (THREAD_FPU + 0x0b8)(thread); \
-	lwc1	$f24, (THREAD_FPU + 0x0c0)(thread); \
-	lwc1	$f25, (THREAD_FPU + 0x0c8)(thread); \
-	lwc1	$f26, (THREAD_FPU + 0x0d0)(thread); \
-	lwc1	$f27, (THREAD_FPU + 0x0d8)(thread); \
-	lwc1	$f28, (THREAD_FPU + 0x0e0)(thread); \
-	lwc1	$f29, (THREAD_FPU + 0x0e8)(thread); \
-	lwc1	$f30, (THREAD_FPU + 0x0f0)(thread); \
-	lwc1	$f31, (THREAD_FPU + 0x0f8)(thread); \
+	lwc1	$f1,  (THREAD_FPU + 0x004)(thread); \
+	lwc1	$f2,  (THREAD_FPU + 0x008)(thread); \
+	lwc1	$f3,  (THREAD_FPU + 0x00c)(thread); \
+	lwc1	$f4,  (THREAD_FPU + 0x010)(thread); \
+	lwc1	$f5,  (THREAD_FPU + 0x014)(thread); \
+	lwc1	$f6,  (THREAD_FPU + 0x018)(thread); \
+	lwc1	$f7,  (THREAD_FPU + 0x01c)(thread); \
+	lwc1	$f8,  (THREAD_FPU + 0x020)(thread); \
+	lwc1	$f9,  (THREAD_FPU + 0x024)(thread); \
+	lwc1	$f10, (THREAD_FPU + 0x028)(thread); \
+	lwc1	$f11, (THREAD_FPU + 0x02c)(thread); \
+	lwc1	$f12, (THREAD_FPU + 0x030)(thread); \
+	lwc1	$f13, (THREAD_FPU + 0x034)(thread); \
+	lwc1	$f14, (THREAD_FPU + 0x038)(thread); \
+	lwc1	$f15, (THREAD_FPU + 0x03c)(thread); \
+	lwc1	$f16, (THREAD_FPU + 0x040)(thread); \
+	lwc1	$f17, (THREAD_FPU + 0x044)(thread); \
+	lwc1	$f18, (THREAD_FPU + 0x048)(thread); \
+	lwc1	$f19, (THREAD_FPU + 0x04c)(thread); \
+	lwc1	$f20, (THREAD_FPU + 0x050)(thread); \
+	lwc1	$f21, (THREAD_FPU + 0x054)(thread); \
+	lwc1	$f22, (THREAD_FPU + 0x058)(thread); \
+	lwc1	$f23, (THREAD_FPU + 0x05c)(thread); \
+	lwc1	$f24, (THREAD_FPU + 0x060)(thread); \
+	lwc1	$f25, (THREAD_FPU + 0x064)(thread); \
+	lwc1	$f26, (THREAD_FPU + 0x068)(thread); \
+	lwc1	$f27, (THREAD_FPU + 0x06c)(thread); \
+	lwc1	$f28, (THREAD_FPU + 0x070)(thread); \
+	lwc1	$f29, (THREAD_FPU + 0x074)(thread); \
+	lwc1	$f30, (THREAD_FPU + 0x078)(thread); \
+	lwc1	$f31, (THREAD_FPU + 0x07c)(thread); \
 	ctc1	tmp,  fcr31
 
 #define CPU_SAVE_NONSCRATCH(thread) \
diff --git a/include/asm-mips/bugs.h b/include/asm-mips/bugs.h
index 5c04e9bf0..9195f9fd3 100644
--- a/include/asm-mips/bugs.h
+++ b/include/asm-mips/bugs.h
@@ -1,10 +1,7 @@
-/*
- *  include/asm-mips/bugs.h
- *
- *  Copyright (C) 1995  Waldorf Electronics
- *  Copyright (C) 1997  Ralf Baechle
+/* $Id: bugs.h,v 1.3 1997/12/01 18:00:36 ralf Exp $
  *
- * $Id: bugs.h,v 1.2 1997/09/07 04:13:53 ralf Exp $
+ * Copyright (C) 1995  Waldorf Electronics
+ * Copyright (C) 1997, 1999  Ralf Baechle
  */
 #include <asm/bootinfo.h>
 
@@ -37,7 +34,8 @@ static inline void check_wait(void)
 	}
 }
 
-static void check_bugs(void)
+static void __init
+check_bugs(void)
 {
 	check_wait();
 }
diff --git a/include/asm-mips/delay.h b/include/asm-mips/delay.h
index 0f5660a83..3c4769a29 100644
--- a/include/asm-mips/delay.h
+++ b/include/asm-mips/delay.h
@@ -1,4 +1,4 @@
-/* $Id: delay.h,v 1.3 1998/10/27 21:46:33 ralf Exp $
+/* $Id: delay.h,v 1.2 1999/01/04 16:09:20 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,10 +7,11 @@
  * Copyright (C) 1994 by Waldorf Electronics
  * Copyright (C) 1995 - 1998 by Ralf Baechle
  */
-#ifndef __ASM_MIPS_DELAY_H
-#define __ASM_MIPS_DELAY_H
+#ifndef _ASM_DELAY_H
+#define _ASM_DELAY_H
 
-extern __inline__ void __delay(int loops)
+extern __inline__ void
+__delay(unsigned long loops)
 {
 	__asm__ __volatile__ (
 		".set\tnoreorder\n"
@@ -49,4 +50,4 @@ extern __inline__ void __udelay(unsigned long usecs, unsigned long lps)
 
 #define udelay(usecs) __udelay((usecs),__udelay_val)
 
-#endif /* __ASM_MIPS_DELAY_H */
+#endif /* _ASM_DELAY_H */
diff --git a/include/asm-mips/floppy.h b/include/asm-mips/floppy.h
index a1343749d..67d8051a8 100644
--- a/include/asm-mips/floppy.h
+++ b/include/asm-mips/floppy.h
@@ -1,4 +1,4 @@
-/* $Id: floppy.h,v 1.5 1998/06/30 00:23:09 ralf Exp $
+/* $Id: floppy.h,v 1.6 1999/01/04 16:09:21 ralf Exp $
  *
  * Architecture specific parts of the Floppy driver
  *
@@ -8,13 +8,12 @@
  *
  * Copyright (C) 1995, 1996, 1997, 1998 Ralf Baechle
  */
-#ifndef __ASM_MIPS_FLOPPY_H
-#define __ASM_MIPS_FLOPPY_H
+#ifndef _ASM_FLOPPY_H
+#define _ASM_FLOPPY_H
 
 #include <asm/bootinfo.h>
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
-#include <asm/mipsconfig.h>
 
 struct fd_ops {
 	unsigned char (*fd_inb)(unsigned int port);
@@ -102,4 +101,4 @@ static int FDC2=-1;
  */
 #define CROSS_64KB(a,s) ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)
 
-#endif /* __ASM_MIPS_FLOPPY_H */
+#endif /* _ASM_FLOPPY_H */
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index 7d97af3f6..d13fe3f48 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -8,7 +8,6 @@
 
 #include <linux/config.h>
 
-#include <asm/mipsconfig.h>
 #include <asm/addrspace.h>
 
 /*
diff --git a/include/asm-mips/mipsconfig.h b/include/asm-mips/mipsconfig.h
deleted file mode 100644
index 28d608c07..000000000
--- a/include/asm-mips/mipsconfig.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * include/asm-mips/mipsconfig.h
- *
- * 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.
- *
- * Copyright (C) 1994, 1995, 1996, 1997 by Ralf Baechle
- */
-#ifndef __ASM_MIPS_MIPSCONFIG_H
-#define __ASM_MIPS_MIPSCONFIG_H
-
-/* Pgdir is 1 page mapped at 0xff800000. */
-#define TLBMAP			0xff800000
-
-/* The virtual address where we'll map the pgdir. */
-#define TLB_ROOT		0xff000000
-
-#endif /* __ASM_MIPS_MIPSCONFIG_H */
diff --git a/include/asm-mips/offset.h b/include/asm-mips/offset.h
index de9a40a2a..6ed304016 100644
--- a/include/asm-mips/offset.h
+++ b/include/asm-mips/offset.h
@@ -51,7 +51,8 @@
 #define TASK_NEED_RESCHED  20
 #define TASK_COUNTER       24
 #define TASK_PRIORITY      28
-#define TASK_MM            928
+#define TASK_MM            800
+#define TASK_STRUCT_SIZE   856
 
 /* MIPS specific thread_struct offsets. */
 #define THREAD_REG16   568
@@ -67,15 +68,15 @@
 #define THREAD_REG31   608
 #define THREAD_STATUS  612
 #define THREAD_FPU     616
-#define THREAD_BVADDR  880
-#define THREAD_BUADDR  884
-#define THREAD_ECODE   888
-#define THREAD_TRAPNO  892
-#define THREAD_PGDIR   896
-#define THREAD_MFLAGS  900
-#define THREAD_CURDS   904
-#define THREAD_TRAMP   908
-#define THREAD_OLDCTX  912
+#define THREAD_BVADDR  752
+#define THREAD_BUADDR  756
+#define THREAD_ECODE   760
+#define THREAD_TRAPNO  764
+#define THREAD_PGDIR   768
+#define THREAD_MFLAGS  772
+#define THREAD_CURDS   776
+#define THREAD_TRAMP   780
+#define THREAD_OLDCTX  784
 
 /* Linux mm_struct offsets. */
 #define MM_COUNT      16
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h
index fd0860ca1..2a724ddde 100644
--- a/include/asm-mips/pgtable.h
+++ b/include/asm-mips/pgtable.h
@@ -1,4 +1,4 @@
-/* $Id: pgtable.h,v 1.22 1999/08/09 19:43:17 harald Exp $
+/* $Id: pgtable.h,v 1.23 1999/08/13 17:07:27 harald 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
@@ -6,11 +6,10 @@
  *
  * Copyright (C) 1994 - 1998 by Ralf Baechle at alii
  */
-#ifndef __ASM_MIPS_PGTABLE_H
-#define __ASM_MIPS_PGTABLE_H
+#ifndef _ASM_PGTABLE_H
+#define _ASM_PGTABLE_H
 
 #include <asm/addrspace.h>
-#include <asm/mipsconfig.h>
 
 #ifndef _LANGUAGE_ASSEMBLY
 
@@ -865,4 +864,4 @@ extern inline void set_context(unsigned long val)
 
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
-#endif /* __ASM_MIPS_PGTABLE_H */
+#endif /* _ASM_PGTABLE_H */
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h
index 3075f66c4..3a06bea80 100644
--- a/include/asm-mips/processor.h
+++ b/include/asm-mips/processor.h
@@ -1,4 +1,4 @@
-/* $Id: processor.h,v 1.16 1999/06/17 13:30:37 ralf Exp $
+/* $Id: processor.h,v 1.17 1999/08/09 19:43:17 harald 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
@@ -90,9 +90,9 @@ extern struct task_struct *last_task_used_math;
 #define NUM_FPU_REGS	32
 
 struct mips_fpu_hard_struct {
-	double fp_regs[NUM_FPU_REGS];
+	unsigned int fp_regs[NUM_FPU_REGS];
 	unsigned int control;
-};
+} __attribute__((aligned(8)));
 
 /*
  * FIXME: no fpu emulator yet (but who cares anyway?)
diff --git a/include/asm-mips/reg.h b/include/asm-mips/reg.h
index 5fd97c23c..35505b70f 100644
--- a/include/asm-mips/reg.h
+++ b/include/asm-mips/reg.h
@@ -6,7 +6,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995 by Ralf Baechle
+ * Copyright (C) 1995, 1999 by Ralf Baechle
  */
 #ifndef __ASM_MIPS_REG_H
 #define __ASM_MIPS_REG_H
@@ -55,14 +55,12 @@
  */
 #define EF_LO			38
 #define EF_HI			39
-#define EF_ORIG_REG2		40
-#define EF_ORIG_REG7		41
 
-#define EF_CP0_EPC		42
-#define EF_CP0_BADVADDR		43
-#define EF_CP0_STATUS		44
-#define EF_CP0_CAUSE		45
+#define EF_CP0_EPC		40
+#define EF_CP0_BADVADDR		41
+#define EF_CP0_STATUS		42
+#define EF_CP0_CAUSE		44
 
-#define EF_SIZE			180
+#define EF_SIZE			180	/* size in bytes */
 
 #endif /* __ASM_MIPS_REG_H */
diff --git a/include/asm-mips/siginfo.h b/include/asm-mips/siginfo.h
index 5eb837e00..ef8ea8765 100644
--- a/include/asm-mips/siginfo.h
+++ b/include/asm-mips/siginfo.h
@@ -1,30 +1,33 @@
-/* $Id: siginfo.h,v 1.3 1998/09/19 19:19:39 ralf Exp $
+/* $Id: siginfo.h,v 1.4 1999/06/13 16:35:54 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.
  *
- * Copyright (C) 1998 by Ralf Baechle
+ * Copyright (C) 1998, 1999 by Ralf Baechle
  */
-#ifndef __ASM_MIPS_SIGINFO_H
-#define __ASM_MIPS_SIGINFO_H
+#ifndef _ASM_SIGINFO_H
+#define _ASM_SIGINFO_H
 
 #include <linux/types.h>
 
-/* This structure matches OSF/1 for binary compatibility. */
+/* This structure matches IRIX 32/n32 ABIs for binary compatibility. */
 
 typedef union sigval {
 	int sival_int;
 	void *sival_ptr;
 } sigval_t;
 
+/* This structure matches IRIX 32/n32 ABIs for binary compatibility but
+   has Linux extensions.  */
+
 #define SI_MAX_SIZE	128
-#define SI_PAD_SIZE	((SI_MAX_SIZE/sizeof(int)) - 4)
+#define SI_PAD_SIZE	((SI_MAX_SIZE/sizeof(int)) - 3)
 
 typedef struct siginfo {
 	int si_signo;
-	int si_errno;
 	int si_code;
+	int si_errno;
 
 	union {
 		int _pad[SI_PAD_SIZE];
@@ -35,38 +38,47 @@ typedef struct siginfo {
 			uid_t _uid;		/* sender's uid */
 		} _kill;
 
-		/* POSIX.1b timers */
-		struct {
-			unsigned int _timer1;
-			unsigned int _timer2;
-		} _timer;
-
-		/* POSIX.1b signals */
-		struct {
-			pid_t _pid;		/* sender's pid */
-			uid_t _uid;		/* sender's uid */
-			sigval_t _sigval;
-		} _rt;
-
 		/* SIGCHLD */
 		struct {
 			pid_t _pid;		/* which child */
 			uid_t _uid;		/* sender's uid */
-			int _status;		/* exit code */
 			clock_t _utime;
+			int _status;		/* exit code */
 			clock_t _stime;
 		} _sigchld;
 
+		/* IRIX SIGCHLD */
+		struct {
+			pid_t _pid;		/* which child */
+			clock_t _utime;
+			int _status;		/* exit code */
+			clock_t _stime;
+		} _irix_sigchld;
+
 		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
 		struct {
 			void *_addr; /* faulting insn/memory ref. */
 		} _sigfault;
 
-		/* SIGPOLL */
+		/* SIGPOLL, SIGXFSZ (To do ...)  */
 		struct {
 			int _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
 			int _fd;
 		} _sigpoll;
+
+		/* POSIX.1b timers */
+		struct {
+			unsigned int _timer1;
+			unsigned int _timer2;
+		} _timer;
+
+		/* POSIX.1b signals */
+		struct {
+			pid_t _pid;		/* sender's pid */
+			uid_t _uid;		/* sender's uid */
+			sigval_t _sigval;
+		} _rt;
+
 	} _sifields;
 } siginfo_t;
 
@@ -87,7 +99,7 @@ typedef struct siginfo {
 
 /*
  * si_code values
- * Digital reserves positive values for kernel-generated signals.
+ * Again these have been choosen to be IRIX compatible.
  */
 #define SI_USER		0	/* sent by kill, sigsend, raise */
 #define SI_KERNEL	0x80	/* sent by the kernel from somewhere */
@@ -157,7 +169,7 @@ typedef struct siginfo {
 #define CLD_TRAPPED	4	/* traced child has trapped */
 #define CLD_STOPPED	5	/* child has stopped */
 #define CLD_CONTINUED	6	/* stopped child has continued */
-#define NSIGCHLD
+#define NSIGCLD		6
 
 /*
  * SIGPOLL si_codes
@@ -165,7 +177,7 @@ typedef struct siginfo {
 #define POLL_IN		1	/* data input available */
 #define POLL_OUT	2	/* output buffers available */
 #define POLL_MSG	3	/* input message available */
-#define POLL_ERR	4	/* i/o error */
+#define POLL_ERR	4	/* I/O error */
 #define POLL_PRI	5	/* high priority input available */
 #define POLL_HUP	6	/* device disconnected */
 #define NSIGPOLL	6
@@ -178,17 +190,19 @@ typedef struct siginfo {
  * thread manager then catches and does the appropriate nonsense.
  * However, everything is written out here so as to not get lost.
  */
-#define SIGEV_SIGNAL	0	/* notify via signal */
-#define SIGEV_NONE	1	/* other notification: meaningless */
-#define SIGEV_THREAD	2	/* deliver via thread creation */
+#define SIGEV_NONE	128	/* other notification: meaningless */
+#define SIGEV_SIGNAL	129	/* notify via signal */
+#define SIGEV_CALLBACK	130	/* ??? */
+#define SIGEV_THREAD	131	/* deliver via thread creation */
 
 #define SIGEV_MAX_SIZE	64
 #define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE/sizeof(int)) - 4)
 
+/* XXX This one isn't yet IRIX / ABI compatible.  */
 typedef struct sigevent {
+	int sigev_notify;
 	sigval_t sigev_value;
 	int sigev_signo;
-	int sigev_notify;
 	union {
 		int _pad[SIGEV_PAD_SIZE];
 
@@ -202,4 +216,4 @@ typedef struct sigevent {
 #define sigev_notify_function	_sigev_un._sigev_thread._function
 #define sigev_notify_attributes	_sigev_un._sigev_thread._attribute
 
-#endif /* __ASM_MIPS_SIGINFO_H */
+#endif /* _ASM_SIGINFO_H */
diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h
index e195bc6b2..3571a30de 100644
--- a/include/asm-mips/signal.h
+++ b/include/asm-mips/signal.h
@@ -1,4 +1,4 @@
-/* $Id: signal.h,v 1.4 1998/08/18 20:46:42 ralf Exp $
+/* $Id: signal.h,v 1.5 1998/08/25 09:22:01 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
@@ -16,7 +16,7 @@
 #define _NSIG_WORDS	(_NSIG / _NSIG_BPW)
 
 typedef struct {
-	unsigned long sig[_NSIG_WORDS];
+	__u32 sig[_NSIG_WORDS];
 } sigset_t;
 
 typedef unsigned long old_sigset_t;		/* at least 32 bits */
diff --git a/include/asm-mips/termios.h b/include/asm-mips/termios.h
index e06bde493..82823ab40 100644
--- a/include/asm-mips/termios.h
+++ b/include/asm-mips/termios.h
@@ -8,6 +8,7 @@
  * Copyright (C) 1995, 1996 by Ralf Baechle
  */
 #ifndef __ASM_MIPS_TERMIOS_H
+#define __ASM_MIPS_TERMIOS_H
 
 #include <asm/termbits.h>
 #include <asm/ioctls.h>
diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h
index 5bbc1a4b8..99b23a1e9 100644
--- a/include/asm-mips/types.h
+++ b/include/asm-mips/types.h
@@ -1,14 +1,14 @@
-/*
- * include/asm-mips/types.h
+/* $Id$
  *
  * 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.
  *
- * Copyright (C) 1994, 1995, 1996 by Ralf Baechle
+ * Copyright (C) 1994, 1995, 1996, 1999 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
  */
-#ifndef __ASM_MIPS_TYPES_H
-#define __ASM_MIPS_TYPES_H
+#ifndef _ASM_TYPES_H
+#define _ASM_TYPES_H
 
 typedef unsigned long umode_t;
 
@@ -26,18 +26,18 @@ typedef unsigned short __u16;
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if ((~0UL) == 0xffffffff)
+#if (_MIPS_SZLONG == 64)
 
+typedef __signed__ long __s64;
+typedef unsigned long __u64;
+
+#else
+ 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
-  
-#else
-  
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
-
+ 
 #endif
 
 /*
@@ -54,21 +54,22 @@ typedef unsigned short u16;
 typedef __signed int s32;
 typedef unsigned int u32;
 
-#if ((~0UL) == 0xffffffff)
+#if (_MIPS_SZLONG == 64)
+
+typedef __signed__ long s64;
+typedef unsigned long u64;
+
+#else
 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 typedef __signed__ long long s64;
 typedef unsigned long long u64;
 #endif
-  
-#else
-  
-typedef __signed__ long s64;
-typedef unsigned long u64;
 
 #endif
+
 #define BITS_PER_LONG _MIPS_SZLONG
 
 #endif /* __KERNEL__ */
 
-#endif /* __ASM_MIPS_TYPES_H */
+#endif /* _ASM_TYPES_H */