Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv11592/include/asm-mips
Modified Files:
au1000.h debug.h mmu_context.h pb1000.h
Log Message:
Further syncing with OSS 2.4.10. Massive restructuring of TLB handling.
Index: au1000.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- au1000.h 2001/09/25 03:36:35 1.7
+++ au1000.h 2001/10/22 19:16:45 1.8
@@ -57,11 +57,13 @@
outb(val, reg);
au_sync();
}
+
void static inline outw_sync(u16 val, int reg)
{
outw(val, reg);
au_sync();
}
+
void static inline outl_sync(u32 val, int reg)
{
outl(val, reg);
Index: debug.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/debug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.h 2001/09/12 16:15:14 1.1
+++ debug.h 2001/10/22 19:16:45 1.2
@@ -1,42 +1,48 @@
-/***********************************************************************
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: js...@mv... or js...@ju...
+/*
+ * Debug macros for run-time debugging. Turned on/off with CONFIG_DEBUG option.
*
- * include/asm-mips/debug.h
- * Some debug macros.
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, js...@mv... or js...@ju...
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
- ***********************************************************************
*/
-#ifndef __ASM_DEBUG_H
-#define __ASM_DEBUG_H
+#ifndef _ASM_DEBUG_H
+#define _ASM_DEBUG_H
#include <linux/config.h>
/*
- * macro for catching spurious errors. Eable to LL_DEBUG in kernel hacking
- * config menu.
+ * run-time macros for catching spurious errors. Eable CONFIG_DEBUG in
+ * kernel hacking config menu to use them.
+ *
+ * Use them as run-time debugging aid. NEVER USE THEM AS ERROR HANDLING CODE!!!
*/
-#ifdef CONFIG_LL_DEBUG
+#ifdef CONFIG_DEBUG
+
#include <linux/kernel.h>
-#define MIPS_ASSERT(x) if (!(x)) { panic("MIPS_ASSERT failed at %s:%d\n", __FILE__, __LINE__); }
-#define MIPS_VERIFY(x, y) MIPS_ASSERT(x y)
-#define MIPS_DEBUG(x) do { x; } while (0)
+#define db_assert(x) if (!(x)) { \
+ panic("assertion failed at %s:%d: %s\n", __FILE__, __LINE__, #x); }
+#define db_warn(x) if (!(x)) { \
+ printk(KERN_WARNING "warning at %s:%d: %s\n", __FILE__, __LINE__, #x); }
+#define db_verify(x, y) db_assert(x y)
+#define db_verify_warn(x, y) db_warn(x y)
+#define db_run(x) do { x; } while (0)
#else
-#define MIPS_ASSERT(x)
-#define MIPS_VERIFY(x, y) x
-#define MIPS_DEBUG(x)
+#define db_assert(x)
+#define db_warn(x)
+#define db_verify(x, y) x
+#define db_verify_warn(x, y) x
+#define db_run(x)
#endif
-#endif /* __ASM_DEBUG_H */
+#endif /* _ASM_DEBUG_H */
Index: mmu_context.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/mmu_context.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mmu_context.h 2001/10/11 18:38:41 1.3
+++ mmu_context.h 2001/10/22 19:16:45 1.4
@@ -60,8 +60,6 @@
#define ASID_VERSION_MASK ((unsigned long)~(ASID_MASK|(ASID_MASK-1)))
#define ASID_FIRST_VERSION ((unsigned long)(~ASID_VERSION_MASK) + 1)
-extern void local_flush_tlb_all(void);
-
extern inline void
get_new_cpu_mmu_context(struct mm_struct *mm, unsigned long cpu)
{
Index: pb1000.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pb1000.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pb1000.h 2001/10/03 22:49:23 1.4
+++ pb1000.h 2001/10/22 19:16:45 1.5
@@ -1,5 +1,4 @@
/*
- *
* Alchemy Semi PB1000 Referrence Board
*
* Copyright 2001 MontaVista Software Inc.
@@ -25,10 +24,8 @@
*
*
*/
-
#ifndef __ASM_PB1000_H
#define __ASM_PB1000_H
-
/* PCMCIA PB1000 specific defines */
#define PCMCIA_MAX_SOCK 0 /* the second socket, 1, is not supported at this time */
|
