Re: [LinuxBIOS] [PATCH] v3 - spinlock cleanup

[ron minnich]

Acked-by: Ronald G. Minnich

A new record!

ron

On 6/30/07, Stefan Reinauer  wrote:
> fix copyright headers to v2 only as suggested by Uwe
> drop silly code when not using SMP
> fix device/device.c
> drop spinlock_t, use struct spinlock instead.
>
> Signed-off-by: Stefan Reinauer
> Index: include/spinlock.h
>
> --- include/spinlock.h  (revision 427)
> +++ include/spinlock.h  (working copy)
> @@ -2,11 +2,11 @@
> This file is part of the LinuxBIOS project.
> Copyright (C) 2001 Linux Networx
> Copyright (C) 2007 coresystems GmbH
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> the Free Software Foundation; either version 2 of the License, or
> (at your option) any later version.
> the Free Software Foundation; version 2 of the License.
> This program is distributed in the hope that it will be useful,
> but WITHOUT ANY WARRANTY; without even the implied warranty of
>
> @@ -22,23 +22,17 @@
>  #define SPINLOCK_H
>
> #if defined(CONFIG_SMP) && CONFIG_SMP == 1
>
> #include <arch/spinlock.h>
>
> #else /* !CONFIG_SMP */
>
> -/* Most GCC versions have a nasty bug with empty initializers */
> -#if (__GNUC__ > 2)
> -typedef struct { } spinlock_t;
> -#define SPIN_LOCK_UNLOCKED (spinlock_t) { }
> -#else
> -typedef struct { int gcc_is_buggy; } spinlock_t;
> -#define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
> -#endif
>
> #define barrier()              do {} while(0)
>  #define spin_is_locked(lock)   0
>  #define spin_unlock_wait(lock) do {} while(0)
>  #define spin_lock(lock)                do {} while(0)
>  #define spin_unlock(lock)      do {} while(0)
> +#define spin_define(lock)       /* empty */
>  #endif
>
> #endif /* SPINLOCK_H */
> Index: include/arch/x86/arch/spinlock.h
> ===================================================================
> --- include/arch/x86/arch/spinlock.h    (revision 427)
> +++ include/arch/x86/arch/spinlock.h    (working copy)
> @@ -2,11 +2,11 @@
> This file is part of the LinuxBIOS project.
> Copyright (C) 2001 Linux Networx
> Copyright (C) 2007 coresystems GmbH
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> the Free Software Foundation; either version 2 of the License, or
> (at your option) any later version.
> the Free Software Foundation; version 2 of the License.
> This program is distributed in the hope that it will be useful,
> but WITHOUT ANY WARRANTY; without even the implied warranty of
>
> @@ -25,12 +25,12 @@
> Your basic SMP spinlocks, allowing only a single CPU anywhere
>
> */
>
> -typedef struct {
> +struct spinlock {
>         volatile unsigned int lock;
> -} spinlock_t;
> +};
>
> -#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 }
> +#define SPIN_LOCK_UNLOCKED (struct spinlock) { 1 }
>
> /*
> Simple spin lock operations.  There are two variants, one clears IRQ's
>
> @@ -60,18 +60,21 @@
>  #define spin_unlock_string \
>         "movb $1,%0"
>
> -static inline __attribute__((always_inline)) void spin_lock(spinlock_t *lock)
> +static inline __attribute__((always_inline)) void spin_lock(struct spinlock *lock)
>  {
>         __asm__ __volatile__(
>                 spin_lock_string
>                 :"=m" (lock->lock) : : "memory");
>  }
>
> -static inline __attribute__((always_inline)) void spin_unlock(spinlock_t *lock)
> +static inline __attribute__((always_inline)) void spin_unlock(struct spinlock *lock)
>  {
>         __asm__ __volatile__(
>                 spin_unlock_string
>                 :"=m" (lock->lock) : : "memory");
>  }
>
> +#define spin_define(spin) static struct spinlock spin = SPIN_LOCK_UNLOCKED
>
> #endif /* ARCH_SPINLOCK_H */
> Index: device/device.c
> ===================================================================
> --- device/device.c     (revision 427)
> +++ device/device.c     (working copy)
> @@ -183,7 +183,9 @@
> @return Pointer to the newly created device structure.
> @see device_path
>
> */
> -// static spinlock_t dev_lock = SPIN_LOCK_UNLOCKED;
>
> +spin_define(dev_lock);
>
> struct device *alloc_dev(struct bus *parent, struct device_path *path,
>                          struct device_id *devid)
>  {