Module Name: src
Committed By: matt
Date: Sat Sep 1 22:20:52 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: cpuswitch.S
Log Message:
Need to do a GET_CURCPU(r4) before invoking DO_AST_AND_RESTORE_ALIGNMENT_FAULTS
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/arm/arm32/cpuswitch.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/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.70 src/sys/arch/arm/arm32/cpuswitch.S:1.71
--- src/sys/arch/arm/arm32/cpuswitch.S:1.70 Sat Sep 1 14:46:51 2012
+++ src/sys/arch/arm/arm32/cpuswitch.S Sat Sep 1 22:20:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.71 2012/09/01 22:20:52 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@
#include <machine/asm.h>
#include <machine/cpu.h>
- RCSID("$NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.71 2012/09/01 22:20:52 matt Exp $")
/* LINTSTUB: include <sys/param.h> */
@@ -347,6 +347,7 @@ ENTRY(lwp_trampoline)
GET_CPSR(r0)
CPSID_I(r0, r0) /* Kill irq's */
+ GET_CURCPU(r4) /* for DO_AST */
DO_AST_AND_RESTORE_ALIGNMENT_FAULTS
PULLFRAME
