Module Name: src Committed By: cliff Date: Wed Apr 14 01:23:15 UTC 2010
Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_spl.S Log Message: insert nop in delay slots - at end of _splsw_splvm and - inside _splsw_splint To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_spl.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/mips/rmi/rmixl_spl.S diff -u src/sys/arch/mips/rmi/rmixl_spl.S:1.1.2.1 src/sys/arch/mips/rmi/rmixl_spl.S:1.1.2.2 --- src/sys/arch/mips/rmi/rmixl_spl.S:1.1.2.1 Sun Mar 21 21:17:01 2010 +++ src/sys/arch/mips/rmi/rmixl_spl.S Wed Apr 14 01:23:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_spl.S,v 1.1.2.1 2010/03/21 21:17:01 cliff Exp $ */ +/* $NetBSD: rmixl_spl.S,v 1.1.2.2 2010/04/14 01:23:15 cliff Exp $ */ /*- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include <mips/asm.h> #include <mips/cpuregs.h> -RCSID("$NetBSD: rmixl_spl.S,v 1.1.2.1 2010/03/21 21:17:01 cliff Exp $"); +RCSID("$NetBSD: rmixl_spl.S,v 1.1.2.2 2010/04/14 01:23:15 cliff Exp $"); #include "assym.h" @@ -263,6 +263,7 @@ REG_L a0, _C_LABEL(ipl_eimr_map) + 8*IPL_VM li a1, IPL_VM b _splraise + nop END(_splsw_splvm) STATIC_LEAF(_splsw_splsoftserial) @@ -318,6 +319,7 @@ addiu v0, 1 # increase ipl by 1 move v1, ta2 # reduce down pending intrs b 1b # and check them + nop 2: /*