patch-1.3.93 linux/include/asm-sparc/head.h

• Lines: 61
• Date: Sun Apr 21 12:30:33 1996
• Orig file: v1.3.92/linux/include/asm-sparc/head.h
• Orig date: Fri Apr 12 15:52:06 1996

diff -u --recursive --new-file v1.3.92/linux/include/asm-sparc/head.h linux/include/asm-sparc/head.h
@@ -1,4 +1,4 @@
-/* $Id: head.h,v 1.23 1996/02/15 09:12:55 davem Exp $ */
+/* $Id: head.h,v 1.26 1996/03/25 20:21:08 davem Exp $ */
 #ifndef __SPARC_HEAD_H
 #define __SPARC_HEAD_H
 
@@ -8,7 +8,7 @@
 #define SRMMU_L1_KBASE_OFFSET ((KERNBASE>>24)<<2)  /* Used in boot remapping. */
 #define INTS_ENAB        0x01           /* entry.S uses this. */
 
-#define NCPUS            4              /* Architectural limit of sun4m. */
+#define NCPUS            4              /* Architectual limit of sun4m. */
 
 #define SUN4_PROM_VECTOR 0xFFE81000     /* To safely die on a SUN4 */
 #define SUN4_PRINTF      0x84           /* Offset into SUN4_PROM_VECTOR */
@@ -25,6 +25,8 @@
 /* Data/text faults. Defaults to sun4c version at boot time. */
 #define SPARC_TFAULT rd %psr, %l0; rd %wim, %l3; b sun4c_fault; mov 1, %l7;
 #define SPARC_DFAULT rd %psr, %l0; rd %wim, %l3; b sun4c_fault; mov 0, %l7;
+#define SRMMU_TFAULT rd %psr, %l0; rd %wim, %l3; b C_LABEL(srmmu_fault); mov 1, %l7;
+#define SRMMU_DFAULT rd %psr, %l0; rd %wim, %l3; b C_LABEL(srmmu_fault); mov 0, %l7;
 
 /* This is for traps we should NEVER get. */
 #define BAD_TRAP(num) \
@@ -54,23 +56,23 @@
 #define SOLARIS_SYSCALL_TRAP \
         sethi %hi(C_LABEL(sys_call_table)), %l7; \
         or %l7, %lo(C_LABEL(sys_call_table)), %l7; \
-        b linux_sparc_syscall; \
+        b solaris_syscall; \
         rd %psr, %l0;
 
 /* Software trap for Sparc-netbsd system calls. */
 #define NETBSD_SYSCALL_TRAP \
         sethi %hi(C_LABEL(sys_call_table)), %l7; \
         or %l7, %lo(C_LABEL(sys_call_table)), %l7; \
-        b linux_sparc_syscall; \
+        b bsd_syscall; \
         rd %psr, %l0;
 
 /* The Get Condition Codes software trap for userland. */
 #define GETCC_TRAP \
-        b getcc_trap_handler; mov %psr, %l0; nop; nop
+        b getcc_trap_handler; mov %psr, %l0; nop; nop;
 
 /* The Set Condition Codes software trap for userland. */
 #define SETCC_TRAP \
-        b setcc_trap_handler; mov %psr, %l0; nop; nop
+        b setcc_trap_handler; mov %psr, %l0; nop; nop;
 
 /* This is for hard interrupts from level 1-14, 15 is non-maskable (nmi) and
  * gets handled with another macro.
@@ -80,7 +82,7 @@
 
 /* NMI's (Non Maskable Interrupts) are special, you can't keep them
  * from coming in, and basically if you get one, the shows over. ;(
- * On the sun4c they are usually asynchronous memory errors, on the
+ * On the sun4c they are usually asyncronous memory errors, on the
  * the sun4m they could be either due to mem errors or a software
  * initiated interrupt from the prom/kern on an SMP box saying "I
  * command you to do CPU tricks, read your mailbox for more info."