[src/netbsd-8]: src/sys/arch/powerpc/powerpc Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/be03ae3ed0ca
branches:  netbsd-8
changeset: 435069:be03ae3ed0ca
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 18 15:37:46 2018 +0000

description:
Pull up following revision(s) (requested by uwe in ticket #884):

        sys/arch/powerpc/powerpc/trap.c: revision 1.154

In mtmsr emulation ignore PSL_VEC we set in mfmsr emulation just
above, as it freaks out PSL_USEROK_P().  This is also congruent with
how we handle PSL_FP.

PR port-macppc/53360

diffstat:

 sys/arch/powerpc/powerpc/trap.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r a5c9d74b471b -r be03ae3ed0ca sys/arch/powerpc/powerpc/trap.c
--- a/sys/arch/powerpc/powerpc/trap.c   Mon Jun 18 15:34:34 2018 +0000
+++ b/sys/arch/powerpc/powerpc/trap.c   Mon Jun 18 15:37:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.153 2017/03/16 16:13:20 chs Exp $   */
+/*     $NetBSD: trap.c,v 1.153.6.1 2018/06/18 15:37:46 martin Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.153 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.153.6.1 2018/06/18 15:37:46 martin Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -1062,6 +1062,9 @@
                 * user code isn't allowed to change it.
                 */
                msr &= ~PSL_FP;
+#ifdef ALTIVEC
+               msr &= ~PSL_VEC;
+#endif
 
                /*
                 * Don't let the user muck with bits he's not allowed to.