Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv5941/include/asm-mips
Modified Files:
ptrace.h serial.h stackframe.h
Log Message:
Yet more OSS syncing..
Index: ptrace.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/ptrace.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ptrace.h 12 Feb 2002 18:00:14 -0000 1.3
+++ ptrace.h 21 Apr 2002 20:06:20 -0000 1.4
@@ -48,6 +48,32 @@
unsigned long cp0_cause;
};
+#define __str2(x) #x
+#define __str(x) __str2(x)
+
+#define save_static_function(symbol) \
+__asm__ ( \
+ ".globl\t" #symbol "\n\t" \
+ ".align\t2\n\t" \
+ ".type\t" #symbol ", @function\n\t" \
+ ".ent\t" #symbol ", 0\n" \
+ #symbol":\n\t" \
+ ".frame\t$29, 0, $31\n\t" \
+ "sw\t$16,"__str(PT_R16)"($29)\t\t\t# save_static_function\n\t" \
+ "sw\t$17,"__str(PT_R17)"($29)\n\t" \
+ "sw\t$18,"__str(PT_R18)"($29)\n\t" \
+ "sw\t$19,"__str(PT_R19)"($29)\n\t" \
+ "sw\t$20,"__str(PT_R20)"($29)\n\t" \
+ "sw\t$21,"__str(PT_R21)"($29)\n\t" \
+ "sw\t$22,"__str(PT_R22)"($29)\n\t" \
+ "sw\t$23,"__str(PT_R23)"($29)\n\t" \
+ "sw\t$30,"__str(PT_R30)"($29)\n\t" \
+ ".end\t" #symbol "\n\t" \
+ ".size\t" #symbol",. - " #symbol)
+
+/* Used in declaration of save_static functions. */
+#define static_unused static __attribute__((unused))
+
#endif /* !(_LANGUAGE_ASSEMBLY) */
/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
Index: serial.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/serial.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serial.h 19 Jan 2002 01:35:17 -0000 1.11
+++ serial.h 21 Apr 2002 20:06:20 -0000 1.12
@@ -84,11 +84,11 @@
#define ATLAS_SERIAL_PORT_DEFNS
#endif
-#ifdef CONFIG_COBALT_MICRO_SERVER
+#ifdef CONFIG_MIPS_COBALT
#define COBALT_BASE_BAUD (18432000 / 16)
#define COBALT_SERIAL_PORT_DEFNS \
/* UART CLK PORT IRQ FLAGS */ \
- { 0, COBALT_BASE_BAUD, 0x1c800000, 7, STD_COM_FLAGS }, /* ttyS0 */
+ { 0, COBALT_BASE_BAUD, 0xc800000, 7, STD_COM_FLAGS }, /* ttyS0 */
#else
#define COBALT_SERIAL_PORT_DEFNS
#endif
Index: stackframe.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/stackframe.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- stackframe.h 24 Oct 2001 23:32:54 -0000 1.3
+++ stackframe.h 21 Apr 2002 20:06:20 -0000 1.4
@@ -9,12 +9,12 @@
#ifndef __ASM_STACKFRAME_H
#define __ASM_STACKFRAME_H
+#include <linux/config.h>
#include <asm/addrspace.h>
#include <asm/mipsregs.h>
#include <asm/processor.h>
#include <asm/asm.h>
#include <asm/offset.h>
-#include <linux/config.h>
#define SAVE_AT \
.set push; \
@@ -47,33 +47,6 @@
sw $22, PT_R22(sp); \
sw $23, PT_R23(sp); \
sw $30, PT_R30(sp)
-
-#define __str2(x) #x
-#define __str(x) __str2(x)
-
-#define save_static_function(symbol) \
-__asm__ ( \
- ".globl\t" #symbol "\n\t" \
- ".align\t2\n\t" \
- ".type\t" #symbol ", @function\n\t" \
- ".ent\t" #symbol ", 0\n" \
- #symbol":\n\t" \
- ".frame\t$29, 0, $31\n\t" \
- "sw\t$16,"__str(PT_R16)"($29)\t\t\t# save_static_function\n\t" \
- "sw\t$17,"__str(PT_R17)"($29)\n\t" \
- "sw\t$18,"__str(PT_R18)"($29)\n\t" \
- "sw\t$19,"__str(PT_R19)"($29)\n\t" \
- "sw\t$20,"__str(PT_R20)"($29)\n\t" \
- "sw\t$21,"__str(PT_R21)"($29)\n\t" \
- "sw\t$22,"__str(PT_R22)"($29)\n\t" \
- "sw\t$23,"__str(PT_R23)"($29)\n\t" \
- "sw\t$30,"__str(PT_R30)"($29)\n\t" \
- ".end\t" #symbol "\n\t" \
- ".size\t" #symbol",. - " #symbol)
-
-/* Used in declaration of save_static functions. */
-#define static_unused static __attribute__((unused))
-
#ifdef CONFIG_SMP
# define GET_SAVED_SP \
|
