Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/powerpc/powerpc Comment out do_ucas_32(), only user...
details: https://anonhg.NetBSD.org/src/rev/23647c7c5241
branches: trunk
changeset: 745198:23647c7c5241
user: rin <rin%NetBSD.org@localhost>
date: Tue Feb 25 00:42:12 2020 +0000
description:
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 90a658d0b883 -r 23647c7c5241 sys/arch/powerpc/powerpc/locore_subr.S
--- a/sys/arch/powerpc/powerpc/locore_subr.S Mon Feb 24 23:46:45 2020 +0000
+++ b/sys/arch/powerpc/powerpc/locore_subr.S Tue Feb 25 00:42:12 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_subr.S,v 1.59 2020/01/08 20:59:19 skrll Exp $ */
+/* $NetBSD: locore_subr.S,v 1.60 2020/02/25 00:42:12 rin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -570,6 +570,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);
*/
@@ -585,3 +586,4 @@
li %r3,0
stw %r10,0(%r6)
blr
+#endif
diff -r 90a658d0b883 -r 23647c7c5241 sys/arch/powerpc/powerpc/trap.c
--- a/sys/arch/powerpc/powerpc/trap.c Mon Feb 24 23:46:45 2020 +0000
+++ b/sys/arch/powerpc/powerpc/trap.c Tue Feb 25 00:42:12 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.157 2020/02/25 00:42:12 rin 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.157 2020/02/25 00:42:12 rin 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;
Home |
Main Index |
Thread Index |
Old Index