From: James S. <jsi...@us...> - 2002-02-19 17:30:25
|
Update of /cvsroot/linux-mips/linux/arch/mips/sibyte/sb1 In directory usw-pr-cvs1:/tmp/cvs-serv32466 Modified Files: cache_err_handler.S Log Message: Include <linux/config.h>. Reformat. Index: cache_err_handler.S =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/sb1/cache_err_handler.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cache_err_handler.S 28 Jan 2002 20:31:57 -0000 1.3 +++ cache_err_handler.S 19 Feb 2002 17:30:21 -0000 1.4 @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <linux/config.h> #include <asm/asm.h> #include <asm/regdef.h> @@ -39,8 +40,9 @@ mfc0 k1, $26 # mfc0 k1, $26, 0 # check if error was recoverable # XXXKW - count them - bltz k1,leave_cerr + bltz k1, leave_cerr nop + #ifdef CONFIG_SB1_PASS_1_WORKAROUNDS # look for signature of spurious CErr lui k0, 0x4000 @@ -65,11 +67,11 @@ eret real_cerr: - mfc0 k0,CP0_CONFIG - li k1,~CONF_CM_CMASK - and k0,k0,k1 - ori k0,k0,CONF_CM_UNCACHED - mtc0 k0,CP0_CONFIG + mfc0 k0, CP0_CONFIG + li k1, ~CONF_CM_CMASK + and k0, k0, k1 + ori k0, k0, CONF_CM_UNCACHED + mtc0 k0, CP0_CONFIG /* Give it a few cycles to sink in... */ sll zero, zero, 0x1 # ssnop sll zero, zero, 0x1 # ssnop |