From 6511d52f7de72549f328489f85de847510639712 Mon Sep 17 00:00:00 2001 From: ad Date: Sun, 11 Feb 2007 15:41:31 +0000 Subject: [PATCH] inline -> __inline --- sys/arch/alpha/include/lock.h | 8 ++++---- sys/arch/sparc/include/lock.h | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/arch/alpha/include/lock.h b/sys/arch/alpha/include/lock.h index a6eccd421aea..7084fb79200a 100644 --- a/sys/arch/alpha/include/lock.h +++ b/sys/arch/alpha/include/lock.h @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.23 2007/02/09 21:55:01 ad Exp $ */ +/* $NetBSD: lock.h,v 1.24 2007/02/11 15:41:31 ad Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -157,20 +157,20 @@ do { \ #define SPINLOCK_BACKOFF_HOOK (void)nullop((void *)0) #endif /* MULTIPROCESSOR */ -static inline void +static __inline void mb_read(void) { __asm __volatile("mb" : : : "memory"); } -static inline void +static __inline void mb_write(void) { /* XXX wmb */ __asm __volatile("mb" : : : "memory"); } -static inline void +static __inline void mb_memory(void) { __asm __volatile("mb" : : : "memory"); diff --git a/sys/arch/sparc/include/lock.h b/sys/arch/sparc/include/lock.h index bbc46c57b3db..3181c0db4af6 100644 --- a/sys/arch/sparc/include/lock.h +++ b/sys/arch/sparc/include/lock.h @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.24 2007/02/09 21:55:12 ad Exp $ */ +/* $NetBSD: lock.h,v 1.25 2007/02/11 15:41:31 ad Exp $ */ /*- * Copyright (c) 1998, 1999, 2006 The NetBSD Foundation, Inc. @@ -124,25 +124,25 @@ __cpu_simple_unlock(__cpu_simple_lock_t *alp) } #if defined(__sparc_v9__) -static inline void +static __inline void mb_read(void) { __asm __volatile("membar #LoadLoad" : : : "memory"); } -static inline void +static __inline void mb_write(void) { __asm __volatile("" : : : "memory"); } -static inline void +static __inline void mb_memory(void) { __asm __volatile("membar #MemIssue" : : : "memory"); } #else /* __sparc_v9__ */ -static inline void +static __inline void mb_read(void) { static volatile int junk; @@ -150,13 +150,13 @@ mb_read(void) junk = 1; } -static inline void +static __inline void mb_write(void) { __insn_barrier(); } -static inline void +static __inline void mb_memory(void) { static volatile int junk;