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

• Lines: 46
• Date: Fri Aug 4 16:15:37 2000
• Orig file: v2.4.0-test5/linux/arch/mips64/kernel/scall_64.S
• Orig date: Tue May 23 15:31:33 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/mips64/kernel/scall_64.S linux/arch/mips64/kernel/scall_64.S
@@ -1,11 +1,10 @@
-/* $Id: scall_64.S,v 1.7 2000/02/23 00:41:00 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) 1995, 1996, 1997, 1998, 1999 by Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 #include <linux/config.h>
 #include <asm/asm.h>
@@ -17,7 +16,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).  */
@@ -48,8 +47,8 @@
 
 	sd	a3, PT_R26(sp)		# save a3 for syscall restarting
 
-	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)
@@ -64,8 +63,8 @@
 1:	sd	v0, PT_R2(sp)		# result
 
 FEXPORT(ret_from_sys_call_64)
-	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, handle_softirq_64