[src/trunk]: src/common/lib/libc/arch/mips/atomic #include "assym.h"

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

details:   https://anonhg.NetBSD.org/src/rev/e8d7d9aca222
branches:  trunk
changeset: 809152:e8d7d9aca222
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 22 06:06:02 2015 +0000

description:
#include "assym.h"
Don't include "assym.h" with _RUMPKERNEL defined.

diffstat:

 common/lib/libc/arch/mips/atomic/membar_ops.S |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 5fcdb9bdd9b6 -r e8d7d9aca222 common/lib/libc/arch/mips/atomic/membar_ops.S
--- a/common/lib/libc/arch/mips/atomic/membar_ops.S     Mon Jun 22 06:03:20 2015 +0000
+++ b/common/lib/libc/arch/mips/atomic/membar_ops.S     Mon Jun 22 06:06:02 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: membar_ops.S,v 1.6 2015/06/01 23:16:54 matt Exp $      */
+/*     $NetBSD: membar_ops.S,v 1.7 2015/06/22 06:06:02 matt Exp $      */
 
 /*-
  * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "atomic_op_asm.h"
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_RUMPKERNEL)
 
 #ifdef _KERNEL_OPT
 #include "opt_cputype.h"
@@ -39,8 +39,7 @@
 #include "opt_multiprocessor.h"
 #endif
 
-
-#include <machine/cpu.h>
+#include "assym.h"
 
 #if (MIPS_HAS_LLSC != 0 && defined(MULTIPROCESSOR)) || !defined(__mips_o32)
 #define        SYNC            sync