Merge with Linux 2.4.0-test10.

5 files changed, 23 insertions, 14 deletions

diff --git a/include/asm-mips64/init.h b/include/asm-mips64/init.h
index fdc132807..34c50b586 100644
--- a/include/asm-mips64/init.h
+++ b/include/asm-mips64/init.h
@@ -15,8 +15,6 @@
 	__arginit __init; \
 	__arginit
 
-#define __initlocaldata  __initdata
-
 /* For assembly routines */
 #define __INIT		.section	.text.init,"ax"
 #define __FINIT		.previous
diff --git a/include/asm-mips64/param.h b/include/asm-mips64/param.h
index 5354eeb7d..81481bfed 100644
--- a/include/asm-mips64/param.h
+++ b/include/asm-mips64/param.h
@@ -29,4 +29,8 @@
 
 #define MAXHOSTNAMELEN	64	/* max length of hostname */
 
+#ifdef __KERNEL__
+# define CLOCKS_PER_SEC	100	/* frequency at which times() counts */
+#endif
+
 #endif /* _ASM_PARAM_H */
diff --git a/include/asm-mips64/pgalloc.h b/include/asm-mips64/pgalloc.h
index d9a766097..198b0bb3b 100644
--- a/include/asm-mips64/pgalloc.h
+++ b/include/asm-mips64/pgalloc.h
@@ -1,5 +1,4 @@
-/* $Id: pgalloc.h,v 1.3 2000/02/24 00:13: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
  * for more details.
@@ -203,10 +202,4 @@ extern inline pte_t * pte_alloc_kernel(pmd_t * pmd, unsigned long address)
 
 extern int do_check_pgt_cache(int, int);
 
-extern inline void set_pgdir(unsigned long address, pgd_t entry)
-{
-	printk("set_pgdir!\n");
-	while(1);
-}
-
 #endif /* _ASM_PGALLOC_H */
diff --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h
index 5c872f673..4874a59e5 100644
--- a/include/asm-mips64/pgtable.h
+++ b/include/asm-mips64/pgtable.h
@@ -780,6 +780,8 @@ extern inline void set_context(unsigned long val)
 		: : "r" (val));
 }
 
+#include <asm-generic/pgtable.h>
+
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
 #endif /* _ASM_PGTABLE_H */
diff --git a/include/asm-mips64/ptrace.h b/include/asm-mips64/ptrace.h
index fcf067d17..773f8a0c0 100644
--- a/include/asm-mips64/ptrace.h
+++ b/include/asm-mips64/ptrace.h
@@ -1,11 +1,10 @@
-/* $Id: ptrace.h,v 1.3 1999/12/04 03:59:12 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) 1994, 1995, 1996, 1997, 1998, 1999 by Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 #ifndef _ASM_PTRACE_H
 #define _ASM_PTRACE_H
@@ -57,6 +56,19 @@ struct pt_regs {
 
 #endif /* !(_LANGUAGE_ASSEMBLY__) */
 
+/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
+/* #define PTRACE_GETREGS		12 */
+/* #define PTRACE_SETREGS		13 */
+/* #define PTRACE_GETFPREGS		14 */
+/* #define PTRACE_SETFPREGS		15 */
+/* #define PTRACE_GETFPXREGS		18 */
+/* #define PTRACE_SETFPXREGS		19 */
+
+#define PTRACE_SETOPTIONS	21
+
+/* options set using PTRACE_SETOPTIONS */
+#define PTRACE_O_TRACESYSGOOD	0x00000001
+
 #ifdef _LANGUAGE_ASSEMBLY
 #include <asm/offset.h>
 #endif /* (_LANGUAGE_ASSEMBLY__) */