Source-Changes-HG archive

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

[src/trunk]: src/sys/kern Exclude references to _ucas_{32, 64}_mp() for _RUMPK...



details:   https://anonhg.NetBSD.org/src/rev/8b936525e787
branches:  trunk
changeset: 840493:8b936525e787
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Apr 07 16:27:41 2019 +0000

description:
Exclude references to _ucas_{32,64}_mp() for _RUMPKERNEL.

diffstat:

 sys/kern/subr_copy.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 7355a04b7f77 -r 8b936525e787 sys/kern/subr_copy.c
--- a/sys/kern/subr_copy.c      Sun Apr 07 15:50:12 2019 +0000
+++ b/sys/kern/subr_copy.c      Sun Apr 07 16:27:41 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_copy.c,v 1.10 2019/04/06 15:52:35 thorpej Exp $   */
+/*     $NetBSD: subr_copy.c,v 1.11 2019/04/07 16:27:41 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008, 2019
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_copy.c,v 1.10 2019/04/06 15:52:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_copy.c,v 1.11 2019/04/07 16:27:41 thorpej Exp $");
 
 #define        __UFETCHSTORE_PRIVATE
 #define        __UCAS_PRIVATE
@@ -538,7 +538,8 @@
 
        ASSERT_SLEEPABLE();
        CHECK_ALIGNMENT();
-#if defined(__HAVE_UCAS_MP) && defined(MULTIPROCESSOR)
+#if (defined(__HAVE_UCAS_MP) && defined(MULTIPROCESSOR)) && \
+    !defined(_RUMPKERNEL)
        if (ncpu > 1) {
                return _ucas_32_mp(uaddr, old, new, ret);
        }
@@ -553,7 +554,8 @@
 
        ASSERT_SLEEPABLE();
        CHECK_ALIGNMENT();
-#if defined(__HAVE_UCAS_MP) && defined(MULTIPROCESSOR)
+#if (defined(__HAVE_UCAS_MP) && defined(MULTIPROCESSOR)) && \
+    !defined(_RUMPKERNEL)
        if (ncpu > 1) {
                return _ucas_64_mp(uaddr, old, new, ret);
        }



Home | Main Index | Thread Index | Old Index