Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/include Guard a few inline functions by #ifndef...



details:   https://anonhg.NetBSD.org/src/rev/536391534794
branches:  trunk
changeset: 333539:536391534794
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 07 20:48:41 2014 +0000

description:
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 78a9f71bebb7 -r 536391534794 sys/arch/arm/include/locore.h
--- a/sys/arch/arm/include/locore.h     Fri Nov 07 20:43:33 2014 +0000
+++ b/sys/arch/arm/include/locore.h     Fri Nov 07 20:48:41 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.h,v 1.17 2014/08/13 21:41:32 matt Exp $ */
+/*     $NetBSD: locore.h,v 1.18 2014/11/07 20:48:41 martin Exp $       */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -237,6 +237,7 @@
        return insn;
 }
 
+#ifndef _RUMPKERNEL
 static inline void
 arm_dmb(void)
 {
@@ -263,6 +264,7 @@
        else if (CPU_IS_ARMV7_P())
                __asm __volatile("isb");
 }
+#endif
 
 /*
  * Random cruft



Home | Main Index | Thread Index | Old Index