Module Name: src
Committed By: martin
Date: Sat Feb 21 18:22:01 UTC 2015
Modified Files:
src/sys/arch/arm/include [netbsd-7]: lock.h
Log Message:
Pull up following revision(s) (requested by joerg in ticket #536):
sys/arch/arm/include/lock.h: revision 1.30
Don't use plain inline in that might end up compiled with -ansi.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/arch/arm/include/lock.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/lock.h
diff -u src/sys/arch/arm/include/lock.h:1.28 src/sys/arch/arm/include/lock.h:1.28.2.1
--- src/sys/arch/arm/include/lock.h:1.28 Sun Aug 10 06:23:13 2014
+++ src/sys/arch/arm/include/lock.h Sat Feb 21 18:22:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.28 2014/08/10 06:23:13 matt Exp $ */
+/* $NetBSD: lock.h,v 1.28.2.1 2015/02/21 18:22:01 martin Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -139,7 +139,7 @@ __swp(int __val, __cpu_simple_lock_t *__
}
#endif /* !_ARM_ARCH_6 */
-static inline void
+static __inline void
__arm_membar_producer(void)
{
#ifdef _ARM_ARCH_7
@@ -149,7 +149,7 @@ __arm_membar_producer(void)
#endif
}
-static inline void
+static __inline void
__arm_membar_consumer(void)
{
#ifdef _ARM_ARCH_7