Module Name: src
Committed By: matt
Date: Mon Jun 22 06:06:02 UTC 2015
Modified Files:
src/common/lib/libc/arch/mips/atomic: membar_ops.S
Log Message:
#include "assym.h"
Don't include "assym.h" with _RUMPKERNEL defined.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/mips/atomic/membar_ops.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/mips/atomic/membar_ops.S
diff -u src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.6 src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.7
--- src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.6 Mon Jun 1 23:16:54 2015
+++ src/common/lib/libc/arch/mips/atomic/membar_ops.S Mon Jun 22 06:06:02 2015
@@ -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
