patch-2.4.0-test6 linux/arch/mips64/kernel/scall_o32.S

• Lines: 40
• Date: Fri Aug 4 16:15:37 2000
• Orig file: v2.4.0-test5/linux/arch/mips64/kernel/scall_o32.S
• Orig date: Mon Jul 10 16:47:20 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/mips64/kernel/scall_o32.S linux/arch/mips64/kernel/scall_o32.S
@@ -20,7 +20,7 @@
 #include <asm/unistd.h>
 
 /* This duplicates the definition from <linux/sched.h> */
-#define PF_TRACESYS	0x00000020	/* tracing system calls */
+#define PT_TRACESYS	0x00000002	/* tracing system calls */
 
 /* This duplicates the definition from <asm/signal.h> */
 #define SIGILL		4		/* Illegal instruction (ANSI).  */
@@ -60,8 +60,8 @@
 	bgez	t0, stackargs
 
 stack_done:
-	ld	t0, TASK_FLAGS($28)	# syscall tracing enabled?
-	andi	t0, PF_TRACESYS
+	ld	t0, TASK_PTRACE($28)	# syscall tracing enabled?
+	andi	t0, PT_TRACESYS
 	bnez	t0, trace_a_syscall
 
 	jalr	t2			# Do The Real Thing (TM)
@@ -76,8 +76,8 @@
 1:	sd	v0, PT_R2(sp)		# result
 	
 FEXPORT(o32_ret_from_sys_call)
-	lw	t0, softirq_state
-	lw	t1, softirq_state+4	# unused delay slot
+	lw	t0, irq_stat		# softirq_active
+	lw	t1, irq_stat+4		# softirq_mask.  unused delay slot
 	and	t0, t1
 	bnez	t0, o32_handle_softirq
 
@@ -318,7 +318,7 @@
 	sys	sys32_wait4	4
 	sys	sys_swapoff	1			/* 4115 */
 	sys	sys_sysinfo	1
-	sys	sys_ipc		6
+	sys	sys32_ipc		6
 	sys	sys_fsync	1
 	sys	sys32_sigreturn	0
 	sys	sys_clone	0			/* 4120 */