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

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

details:   https://anonhg.NetBSD.org/src/rev/0116bf5eb2a8
branches:  netbsd-3
changeset: 577906:0116bf5eb2a8
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Mar 28 22:43:44 2006 +0000

description:
Pull up following revision(s) (requested by shige in ticket #1223):
        sys/arch/powerpc/powerpc/sig_machdep.c: revision 1.25
Make cpu_setmcontext() fix up the passed-in MSR value.

diffstat:

 sys/arch/powerpc/powerpc/sig_machdep.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r c90ac7c9ac28 -r 0116bf5eb2a8 sys/arch/powerpc/powerpc/sig_machdep.c
--- a/sys/arch/powerpc/powerpc/sig_machdep.c    Tue Mar 28 22:38:20 2006 +0000
+++ b/sys/arch/powerpc/powerpc/sig_machdep.c    Tue Mar 28 22:43:44 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sig_machdep.c,v 1.23 2004/04/16 23:58:08 matt Exp $    */
+/*     $NetBSD: sig_machdep.c,v 1.23.10.1 2006/03/28 22:43:44 riz Exp $        */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.23 2004/04/16 23:58:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.23.10.1 2006/03/28 22:43:44 riz Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ppcarch.h"
@@ -223,8 +223,12 @@
 
        /* Restore GPR context, if any. */
        if (flags & _UC_CPU) {
-               if (!PSL_USEROK_P(gr[_REG_MSR]))
-                       return (EINVAL);
+               /*
+                * Accept all user-settable bits without complaint;
+                * userland should not need to know the machine-specific
+                * MSR value.
+                */
+               gr[_REG_MSR] = (gr[_REG_MSR] & PSL_USERMOD) | PSL_USERSET;
 
 #ifdef PPC_HAVE_FPU
                /*