Module Name: src
Committed By: martin
Date: Mon Jun 18 15:37:46 UTC 2018
Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-8]: trap.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.153.6.1 src/sys/arch/powerpc/powerpc/trap.c
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/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.153 src/sys/arch/powerpc/powerpc/trap.c:1.153.6.1
--- src/sys/arch/powerpc/powerpc/trap.c:1.153 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/powerpc/powerpc/trap.c Mon Jun 18 15:37:46 2018
@@ -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 @@ emulated_opcode(struct lwp *l, struct tr
* 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.
