Module Name: src
Committed By: martin
Date: Thu Feb 27 18:50:43 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-9]: locore_subr.S trap.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.4.1 src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.156 -r1.156.4.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/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.57 src/sys/arch/powerpc/powerpc/locore_subr.S:1.57.4.1
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.57 Sat Apr 6 03:06:27 2019
+++ src/sys/arch/powerpc/powerpc/locore_subr.S Thu Feb 27 18:50:43 2020
@@ -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 @@ ENTRY(cpu_spinstart)
#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 @@ ENTRY(do_ucas_32)
li %r3,0
stw %r10,0(%r6)
blr
+#endif
Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.156 src/sys/arch/powerpc/powerpc/trap.c:1.156.4.1
--- src/sys/arch/powerpc/powerpc/trap.c:1.156 Sun Apr 7 05:25:56 2019
+++ src/sys/arch/powerpc/powerpc/trap.c Thu Feb 27 18:50:43 2020
@@ -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 int fix_unaligned(struct lwp *, s
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 @@ kcopy(const void *src, void *dst, size_t
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;
