[src/trunk]: src/sys/arch/alpha/alpha Fix error in previous that could cause ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d81e801e07b9
branches:  trunk
changeset: 748774:d81e801e07b9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Nov 05 04:19:47 2009 +0000

description:
Fix error in previous that could cause us to refer to the wrong cpu_info
after handling an AST.

diffstat:

 sys/arch/alpha/alpha/locore.s |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 204560bc8d75 -r d81e801e07b9 sys/arch/alpha/alpha/locore.s
--- a/sys/arch/alpha/alpha/locore.s     Thu Nov 05 03:46:12 2009 +0000
+++ b/sys/arch/alpha/alpha/locore.s     Thu Nov 05 04:19:47 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.115 2009/11/03 16:08:00 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.116 2009/11/05 04:19:47 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <machine/asm.h>
 
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.115 2009/11/03 16:08:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.116 2009/11/05 04:19:47 thorpej Exp $");
 
 #include "assym.h"
 
@@ -267,17 +267,16 @@
        /* yes */
 
        /* GET_CPUINFO clobbers v0, t0, t8...t11. */
-       GET_CPUINFO
-       mov     v0, s3                          /* squirrel away our CPU info */
+3:     GET_CPUINFO
 
        /* check for AST */
-3:     ldq     t1, CPU_INFO_CURLWP(s3)
+       ldq     t1, CPU_INFO_CURLWP(v0)
        ldl     t3, L_MD_ASTPENDING(t1)         /* AST pending? */
        bne     t3, 7f                          /* yes */
        /* no: headed back to user space */
 
        /* Enable the FPU based on whether the current proc is fpcurlwp. */
-4:     ldq     t2, CPU_INFO_FPCURLWP(s3)
+4:     ldq     t2, CPU_INFO_FPCURLWP(v0)
        cmpeq   t1, t2, t1
        mov     zero, a0
        cmovne  t1, 1, a0