[src/netbsd-7]: src/sys/arch/arm/include Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/74d85dab6687
branches:  netbsd-7
changeset: 798591:74d85dab6687
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Nov 15 11:34:44 2014 +0000

description:
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.

diffstat:

 sys/arch/arm/include/locore.h |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 568149877715 -r 74d85dab6687 sys/arch/arm/include/locore.h
--- a/sys/arch/arm/include/locore.h     Sat Nov 15 11:31:40 2014 +0000
+++ b/sys/arch/arm/include/locore.h     Sat Nov 15 11:34:44 2014 +0000
@@ -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 @@
        return insn;
 }
 
+#ifndef _RUMPKERNEL
 static inline void
 arm_dmb(void)
 {
@@ -259,6 +260,7 @@
        else if (CPU_IS_ARMV7_P())
                __asm __volatile("isb");
 }
+#endif
 
 /*
  * Random cruft