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

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

details:   https://anonhg.NetBSD.org/src/rev/3bbc81898063
branches:  netbsd-9
changeset: 745297:3bbc81898063
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 27 18:50:43 2020 +0000

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

        sys/arch/powerpc/powerpc/trap.c: revision 1.157
        sys/arch/powerpc/powerpc/locore_subr.S: revision 1.60

Comment out do_ucas_32(), only user of which, _ucas_32(), is commented out
since powerpc/trap.c rev 1.156:
     http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/powerpc/powerpc/trap.c#rev1.156

diffstat:

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

diffs (57 lines):

diff -r 9d94af413322 -r 3bbc81898063 sys/arch/powerpc/powerpc/locore_subr.S
--- a/sys/arch/powerpc/powerpc/locore_subr.S    Thu Feb 27 18:48:12 2020 +0000
+++ b/sys/arch/powerpc/powerpc/locore_subr.S    Thu Feb 27 18:50:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_subr.S,v 1.57 2019/04/06 03:06:27 thorpej Exp $ */
+/*     $NetBSD: locore_subr.S,v 1.57.4.1 2020/02/27 18:50:43 martin Exp $      */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -579,6 +579,7 @@
 
 #endif /*MULTIPROCESSOR + OEA*/
 
+#if 0 /* XXX CPU configuration spaghetti */
 /*
  * int do_ucas_32(uint32_t *uptr, uint32_t old, uint32_t new, uint32_t *ret);
  */
@@ -594,3 +595,4 @@
        li      %r3,0
        stw     %r10,0(%r6)
        blr
+#endif
diff -r 9d94af413322 -r 3bbc81898063 sys/arch/powerpc/powerpc/trap.c
--- a/sys/arch/powerpc/powerpc/trap.c   Thu Feb 27 18:48:12 2020 +0000
+++ b/sys/arch/powerpc/powerpc/trap.c   Thu Feb 27 18:50:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.156 2019/04/07 05:25:56 thorpej Exp $       */
+/*     $NetBSD: trap.c,v 1.156.4.1 2020/02/27 18:50:43 martin Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.156 2019/04/07 05:25:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.156.4.1 2020/02/27 18:50:43 martin Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -72,8 +72,6 @@
 static inline vaddr_t setusr(vaddr_t, size_t *);
 static inline void unsetusr(void);
 
-extern int do_ucas_32(volatile int32_t *, int32_t, int32_t, int32_t *);
-
 void trap(struct trapframe *); /* Called from locore / trap_subr */
 /* Why are these not defined in a header? */
 int badaddr(void *, size_t);
@@ -686,6 +684,7 @@
 int
 _ucas_32(volatile uint32_t *uptr, uint32_t old, uint32_t new, uint32_t *ret)
 {
+       extern int do_ucas_32(volatile int32_t *, int32_t, int32_t, int32_t *);
        vaddr_t uva = (vaddr_t)uptr;
        vaddr_t p;
        struct faultbuf env;