Module Name: src
Committed By: thorpej
Date: Wed Apr 10 04:10:54 UTC 2019
Modified Files:
src/sys/arch/usermode/include: types.h
src/sys/arch/usermode/usermode: copy.c
Log Message:
Make the usermode kernel compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/usermode/include/types.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/usermode/copy.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/usermode/include/types.h
diff -u src/sys/arch/usermode/include/types.h:1.15 src/sys/arch/usermode/include/types.h:1.16
--- src/sys/arch/usermode/include/types.h:1.15 Sat Apr 6 03:06:28 2019
+++ src/sys/arch/usermode/include/types.h Wed Apr 10 04:10:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.15 2019/04/06 03:06:28 thorpej Exp $ */
+/* $NetBSD: types.h,v 1.16 2019/04/10 04:10:53 thorpej Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -94,6 +94,5 @@ typedef register_t __register_t;
#define __HAVE_CPU_LWP_SETPRIVATE
#define __HAVE_MM_MD_KERNACC
#define __HAVE_COMPAT_NETBSD32
-#define __HAVE_UCAS_FULL
#endif /* !_USERMODE_TYPES_H_ */
Index: src/sys/arch/usermode/usermode/copy.c
diff -u src/sys/arch/usermode/usermode/copy.c:1.10 src/sys/arch/usermode/usermode/copy.c:1.11
--- src/sys/arch/usermode/usermode/copy.c:1.10 Wed Apr 10 03:39:34 2019
+++ src/sys/arch/usermode/usermode/copy.c Wed Apr 10 04:10:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.c,v 1.10 2019/04/10 03:39:34 msaitoh Exp $ */
+/* $NetBSD: copy.c,v 1.11 2019/04/10 04:10:54 thorpej Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copy.c,v 1.10 2019/04/10 03:39:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copy.c,v 1.11 2019/04/10 04:10:54 thorpej Exp $");
#define __UFETCHSTORE_PRIVATE
#define __UCAS_PRIVATE
@@ -97,20 +97,6 @@ kcopy(const void *src, void *dst, size_t
}
int
-_ucas_32(volatile uint32_t *uaddr, uint32_t old, uint32_t new, uint32_t *ret)
-{
- *ret = atomic_cas_32(uaddr, old, new);
-}
-
-#ifdef _LP64
-int
-_ucas_64(volatile uint64_t *uaddr, uint64_t old, uint64_t new, uint64_t *ret)
-{
- *ret = atomic_cas_64(uaddr, old, new);
-}
-#endif /* _LP64 */
-
-int
_ufetch_8(const uint8_t *uaddr, uint8_t *valp)
{
*valp = *uaddr;
