From: Jesper Juhl It removes a bunch of warnings when building with gcc -W, like these: include/linux/wait.h:82: warning: missing initializer include/linux/wait.h:82: warning: (near initialization for `(anonymous).break_lock') include/asm/rwsem.h:88: warning: missing initializer include/asm/rwsem.h:88: warning: (near initialization for `(anonymous).break_lock') Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton --- 25-akpm/include/asm-i386/spinlock.h | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff -puN include/asm-i386/spinlock.h~silence-spinlock-rwlock-uninitialized-break_lock-member include/asm-i386/spinlock.h --- 25/include/asm-i386/spinlock.h~silence-spinlock-rwlock-uninitialized-break_lock-member Fri Apr 8 17:31:06 2005 +++ 25-akpm/include/asm-i386/spinlock.h Fri Apr 8 17:31:06 2005 @@ -32,7 +32,13 @@ typedef struct { #define SPINLOCK_MAGIC_INIT /* */ #endif -#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 SPINLOCK_MAGIC_INIT } +#ifdef CONFIG_PREEMPT +#define SPINLOCK_BREAK_INIT , 0 +#else +#define SPINLOCK_BREAK_INIT /* */ +#endif + +#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 SPINLOCK_MAGIC_INIT SPINLOCK_BREAK_INIT } #define spin_lock_init(x) do { *(x) = SPIN_LOCK_UNLOCKED; } while(0) @@ -182,7 +188,13 @@ typedef struct { #define RWLOCK_MAGIC_INIT /* */ #endif -#define RW_LOCK_UNLOCKED (rwlock_t) { RW_LOCK_BIAS RWLOCK_MAGIC_INIT } +#ifdef CONFIG_PREEMPT +#define RWLOCK_BREAK_INIT , 0 +#else +#define RWLOCK_BREAK_INIT /* */ +#endif + +#define RW_LOCK_UNLOCKED (rwlock_t) { RW_LOCK_BIAS RWLOCK_MAGIC_INIT RWLOCK_BREAK_INIT } #define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0) _