Module Name: src
Committed By: martin
Date: Sat Nov 15 11:34:44 UTC 2014
Modified Files:
src/sys/arch/arm/include [netbsd-7]: locore.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #240):
sys/arch/arm/include/locore.h: revision 1.18
Guard a few inline functions by #ifndef _RUMPKERNEL, to allow including
this file in rump builds.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.6.1 src/sys/arch/arm/include/locore.h
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/arm/include/locore.h
diff -u src/sys/arch/arm/include/locore.h:1.16 src/sys/arch/arm/include/locore.h:1.16.6.1
--- src/sys/arch/arm/include/locore.h:1.16 Fri Mar 28 21:39:09 2014
+++ src/sys/arch/arm/include/locore.h Sat Nov 15 11:34:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.16 2014/03/28 21:39:09 matt Exp $ */
+/* $NetBSD: locore.h,v 1.16.6.1 2014/11/15 11:34:44 martin Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -233,6 +233,7 @@ read_thumb_insn(vaddr_t va, bool user_p)
return insn;
}
+#ifndef _RUMPKERNEL
static inline void
arm_dmb(void)
{
@@ -259,6 +260,7 @@ arm_isb(void)
else if (CPU_IS_ARMV7_P())
__asm __volatile("isb");
}
+#endif
/*
* Random cruft
