Xen devel - May 2013 - [PATCH] mini-os: eliminate duplicated definition of spin_unlock_wait

Signed-off-by: Chen Baozi <baozich@gmail.com>
---
 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

Chen Baozi, le Thu 09 May 2013 16:31:01 +0800, a écrit :
> Signed-off-by: Chen Baozi <baozich@gmail.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
>  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
> 
-- 
Samuel
R: Parce que ça renverse bêtement l''ordre naturel de lecture!
Q: Mais pourquoi citer en fin d''article est-il si effroyable?
R: Citer en fin d''article
Q: Quelle est la chose la plus désagréable sur les groupes de news?

On Thu, 2013-05-09 at 10:09 +0100, Samuel Thibault
wrote:
> Chen Baozi, le Thu 09 May 2013 16:31:01 +0800, a écrit :
> > Signed-off-by: Chen Baozi <baozich@gmail.com>
> 
> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
I assume this isn't critical for 4.3?



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Ian Campbell, le Fri 10 May 2013 14:24:16 +0100, a écrit
:
> On Thu, 2013-05-09 at 10:09 +0100, Samuel Thibault wrote:
> > Chen Baozi, le Thu 09 May 2013 16:31:01 +0800, a écrit :
> > > Signed-off-by: Chen Baozi <baozich@gmail.com>
> > 
> > Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> 
> I assume this isn''t critical for 4.3?
Indeed, it''s just a coding cleanup that will be useful for the arm
port.

Samuel

On Thu, 2013-05-09 at 10:09 +0100, Samuel Thibault
wrote:
> Chen Baozi, le Thu 09 May 2013 16:31:01 +0800, a écrit :
> > Signed-off-by: Chen Baozi <baozich@gmail.com>
> 
> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Applied to the staging branch.



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel