From: Chen Baozi Subject: [PATCH] mini-os: eliminate duplicated definition of spin_unlock_wait Date: Thu, 9 May 2013 16:31:01 +0800 Message-ID: <1368088261-11963-1-git-send-email-baozich@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Stefano Stabellini , Samuel Thibault Cc: Chen Baozi , xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Chen Baozi --- extras/mini-os/include/spinlock.h | 2 +- extras/mini-os/include/x86/arch_spinlock.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/include/spinlock.h b/extras/mini-os/include/spinlock.h index 70cf20f..6604e3c 100644 --- a/extras/mini-os/include/spinlock.h +++ b/extras/mini-os/include/spinlock.h @@ -30,7 +30,7 @@ typedef struct { #define spin_is_locked(x) arch_spin_is_locked(x) -#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) +#define spin_unlock_wait(x) arch_spin_unlock_wait(x) #define _spin_trylock(lock) ({_raw_spin_trylock(lock) ? \ diff --git a/extras/mini-os/include/x86/arch_spinlock.h b/extras/mini-os/include/x86/arch_spinlock.h index 4b8faf7..c08b6f1 100644 --- a/extras/mini-os/include/x86/arch_spinlock.h +++ b/extras/mini-os/include/x86/arch_spinlock.h @@ -17,7 +17,7 @@ */ #define arch_spin_is_locked(x) (*(volatile signed char *)(&(x)->slock) <= 0) -#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) +#define arch_spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) #define spin_lock_string \ "1:\n" \ -- 1.8.1.4