patch-2.1.101 linux/include/asm-mips/branch.h

• Lines: 29
• Date: Fri May 8 00:13:26 1998
• Orig file: v2.1.100/linux/include/asm-mips/branch.h
• Orig date: Thu Jun 26 12:33:39 1997

diff -u --recursive --new-file v2.1.100/linux/include/asm-mips/branch.h linux/include/asm-mips/branch.h
@@ -5,7 +5,9 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996, 1997 by Ralf Baechle
+ * Copyright (C) 1996, 1997, 1998 by Ralf Baechle
+ *
+ * $Id: branch.h,v 1.2 1998/05/04 09:18:56 ralf Exp $
  */
 #include <asm/ptrace.h>
 
@@ -15,12 +17,13 @@
 }
 
 extern int __compute_return_epc(struct pt_regs *regs);
+
 extern inline int compute_return_epc(struct pt_regs *regs)
 {
-	if (delay_slot(regs)) {
-		return __compute_return_epc(regs);
+	if (!delay_slot(regs)) {
+		regs->cp0_epc += 4;
+		return 0;
 	}
 
-	regs->cp0_epc += 4;
-	return 0;
+	return __compute_return_epc(regs);
 }