[src/netbsd-7]: src/sys/arch/arm/arm Actually do pullup rev 1.25 for ticket #188

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

details:   https://anonhg.NetBSD.org/src/rev/6fad0eec449d
branches:  netbsd-7
changeset: 798529:6fad0eec449d
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 10 19:20:33 2014 +0000

description:
Actually do pullup rev 1.25 for ticket #188

diffstat:

 sys/arch/arm/arm/ast.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 7bc24cc2df6f -r 6fad0eec449d sys/arch/arm/arm/ast.c
--- a/sys/arch/arm/arm/ast.c    Mon Nov 10 18:00:07 2014 +0000
+++ b/sys/arch/arm/arm/ast.c    Mon Nov 10 19:20:33 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ast.c,v 1.23 2014/03/28 21:43:49 matt Exp $    */
+/*     $NetBSD: ast.c,v 1.23.4.1 2014/11/10 19:20:33 martin Exp $      */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.23 2014/03/28 21:43:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.23.4.1 2014/11/10 19:20:33 martin Exp $");
 
 #include "opt_ddb.h"
 
@@ -71,9 +71,6 @@
 void
 userret(struct lwp *l)
 {
-       /* Invoke MI userret code */
-       mi_userret(l);
-
 #if defined(__PROG32) && defined(ARM_MMU_EXTENDED)
        /*
         * If our ASID got released, access via TTBR0 will have been disabled.
@@ -83,8 +80,12 @@
        if (armreg_ttbcr_read() & TTBCR_S_PD0) {
                pmap_activate(l);
        }
+       KASSERT(!(armreg_ttbcr_read() & TTBCR_S_PD0));
 #endif
 
+       /* Invoke MI userret code */
+       mi_userret(l);
+
 #if defined(__PROG32) && defined(DIAGNOSTIC)
        KASSERT((lwp_trapframe(l)->tf_spsr & IF32_bits) == 0);
 #endif