Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src Pull up following revision(s) (requested by rin in ticket...



details:   https://anonhg.NetBSD.org/src/rev/dec6694566cc
branches:  netbsd-9
changeset: 1001643:dec6694566cc
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Apr 12 08:35:40 2020 +0000

description:
Pull up following revision(s) (requested by rin in ticket #826):

        lib/libpthread/arch/powerpc/pthread_md.h: revision 1.9
        sys/arch/powerpc/powerpc/sig_machdep.c: revision 1.48

Revert previous:
http://mail-index.netbsd.org/source-changes/2020/02/20/msg114173.html
Comment turned out to be wrong, and KASSERT fires for oea.

XXX
Need to revisit shortly...

diffstat:

 lib/libpthread/arch/powerpc/pthread_md.h |  7 ++-----
 sys/arch/powerpc/powerpc/sig_machdep.c   |  6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (48 lines):

diff -r 2f572d4e3b45 -r dec6694566cc lib/libpthread/arch/powerpc/pthread_md.h
--- a/lib/libpthread/arch/powerpc/pthread_md.h  Sun Apr 12 08:29:40 2020 +0000
+++ b/lib/libpthread/arch/powerpc/pthread_md.h  Sun Apr 12 08:35:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_md.h,v 1.7.46.1 2020/02/27 18:48:12 martin Exp $       */
+/*     $NetBSD: pthread_md.h,v 1.7.46.2 2020/04/12 08:35:40 martin Exp $       */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -53,10 +53,7 @@
 /*
  * Set initial, sane values for registers whose values aren't just
  * "don't care".
- *
- * XXX
- * "Sane value" for MSR differs between oea/booke/ibm4xx, but no way to
- * obtain from userland. It should be corrected by cpu_setmcontext().
+ * 0xd032 is PSL_USERSET from arch/powerpc/include/psl.h
  */
 #define _INITCONTEXT_U_MD(ucp)                                         \
        (ucp)->uc_mcontext.__gregs[_REG_MSR] = 0xd032;
diff -r 2f572d4e3b45 -r dec6694566cc sys/arch/powerpc/powerpc/sig_machdep.c
--- a/sys/arch/powerpc/powerpc/sig_machdep.c    Sun Apr 12 08:29:40 2020 +0000
+++ b/sys/arch/powerpc/powerpc/sig_machdep.c    Sun Apr 12 08:35:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sig_machdep.c,v 1.46.4.1 2020/02/27 18:48:12 martin Exp $      */
+/*     $NetBSD: sig_machdep.c,v 1.46.4.2 2020/04/12 08:35:40 martin Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.46.4.1 2020/02/27 18:48:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.46.4.2 2020/04/12 08:35:40 martin Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_altivec.h"
@@ -191,8 +191,6 @@
 int
 cpu_mcontext_validate(struct lwp *l, const mcontext_t *mcp)
 {
-
-       KASSERT(PSL_USEROK_P(mcp->__gregs[_REG_MSR]));
        return 0;
 }
 



Home | Main Index | Thread Index | Old Index