Module Name: src Committed By: martin Date: Fri Nov 7 20:48:41 UTC 2014
Modified Files: src/sys/arch/arm/include: locore.h Log Message: 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.17 -r1.18 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.17 src/sys/arch/arm/include/locore.h:1.18 --- src/sys/arch/arm/include/locore.h:1.17 Wed Aug 13 21:41:32 2014 +++ src/sys/arch/arm/include/locore.h Fri Nov 7 20:48:41 2014 @@ -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 @@ read_thumb_insn(vaddr_t va, bool user_p) return insn; } +#ifndef _RUMPKERNEL static inline void arm_dmb(void) { @@ -263,6 +264,7 @@ arm_isb(void) else if (CPU_IS_ARMV7_P()) __asm __volatile("isb"); } +#endif /* * Random cruft