From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> --- arch/s390/include/asm/spinlock.h | 34 ++++++++++++++++++++++++++++++++++ include/linux/spinlock_api_smp.h | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) Index: linux-2.6/arch/s390/include/asm/spinlock.h =================================================================== --- linux-2.6.orig/arch/s390/include/asm/spinlock.h +++ linux-2.6/arch/s390/include/asm/spinlock.h @@ -191,4 +191,38 @@ static inline int __raw_write_trylock(ra #define _raw_read_relax(lock) cpu_relax() #define _raw_write_relax(lock) cpu_relax() +#if defined(CONFIG_SMP) && !defined(CONFIG_PREEMPT) && \ + !defined(CONFIG_DEBUG_SPINLOCK) + +#define __spin_lock_is_small +#define __read_lock_is_small +#define __write_lock_is_small +#define __spin_lock_bh_is_small +#define __read_lock_bh_is_small +#define __write_lock_bh_is_small +#define __spin_lock_irq_is_small +#define __read_lock_irq_is_small +#define __write_lock_irq_is_small +#define __spin_lock_irqsave_is_small +#define __read_lock_irqsave_is_small +#define __write_lock_irqsave_is_small +#define __spin_trylock_is_small +#define __read_trylock_is_small +#define __write_trylock_is_small +#define __spin_trylock_bh_is_small +#define __spin_unlock_is_small +#define __read_unlock_is_small +#define __write_unlock_is_small +#define __spin_unlock_bh_is_small +#define __read_unlock_bh_is_small +#define __write_unlock_bh_is_small +#define __spin_unlock_irq_is_small +#define __read_unlock_irq_is_small +#define __write_unlock_irq_is_small +#define __spin_unlock_irqrestore_is_small +#define __read_unlock_irqrestore_is_small +#define __write_unlock_irqrestore_is_small + +#endif /* defined(SMP) && !defined(PREEMPT) && !defined(DEBUG_SPINLOCK) */ + #endif /* __ASM_SPINLOCK_H */ -- -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html