Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e72b810 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-locking-for-linus' of... 

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  mutex: Fix missing conditions to build mutex_spin_on_owner()
  mutex: Better control mutex adaptive spinning config
  locking, task_struct: Reduce size on TRACE_IRQFLAGS and 64bit
  locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
  locking: Remove unused prototype
  locking: Reduce ifdefs in kernel/spinlock.c
  locking: Make inlining decision Kconfig based
parents 9b269d40 c08f7829

arch/s390/Kconfig

+28 −0
Original line number Diff line number Diff line
@@ -95,6 +95,34 @@ config S390 
	select HAVE_ARCH_TRACEHOOK

	select INIT_ALL_POSSIBLE

	select HAVE_PERF_EVENTS

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

	select ARCH_INLINE_SPIN_LOCK_BH

	select ARCH_INLINE_SPIN_LOCK_IRQ

	select ARCH_INLINE_SPIN_LOCK_IRQSAVE

	select ARCH_INLINE_SPIN_UNLOCK

	select ARCH_INLINE_SPIN_UNLOCK_BH

	select ARCH_INLINE_SPIN_UNLOCK_IRQ

	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE

	select ARCH_INLINE_READ_TRYLOCK

	select ARCH_INLINE_READ_LOCK

	select ARCH_INLINE_READ_LOCK_BH

	select ARCH_INLINE_READ_LOCK_IRQ

	select ARCH_INLINE_READ_LOCK_IRQSAVE

	select ARCH_INLINE_READ_UNLOCK

	select ARCH_INLINE_READ_UNLOCK_BH

	select ARCH_INLINE_READ_UNLOCK_IRQ

	select ARCH_INLINE_READ_UNLOCK_IRQRESTORE

	select ARCH_INLINE_WRITE_TRYLOCK

	select ARCH_INLINE_WRITE_LOCK

	select ARCH_INLINE_WRITE_LOCK_BH

	select ARCH_INLINE_WRITE_LOCK_IRQ

	select ARCH_INLINE_WRITE_LOCK_IRQSAVE

	select ARCH_INLINE_WRITE_UNLOCK

	select ARCH_INLINE_WRITE_UNLOCK_BH

	select ARCH_INLINE_WRITE_UNLOCK_IRQ

	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE



config SCHED_OMIT_FRAME_POINTER

	bool

arch/s390/include/asm/spinlock.h

+0 −29
Original line number Diff line number Diff line
@@ -191,33 +191,4 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw) 
#define _raw_read_relax(lock)	cpu_relax()

#define _raw_write_relax(lock)	cpu_relax()



#define __always_inline__spin_lock

#define __always_inline__read_lock

#define __always_inline__write_lock

#define __always_inline__spin_lock_bh

#define __always_inline__read_lock_bh

#define __always_inline__write_lock_bh

#define __always_inline__spin_lock_irq

#define __always_inline__read_lock_irq

#define __always_inline__write_lock_irq

#define __always_inline__spin_lock_irqsave

#define __always_inline__read_lock_irqsave

#define __always_inline__write_lock_irqsave

#define __always_inline__spin_trylock

#define __always_inline__read_trylock

#define __always_inline__write_trylock

#define __always_inline__spin_trylock_bh

#define __always_inline__spin_unlock

#define __always_inline__read_unlock

#define __always_inline__write_unlock

#define __always_inline__spin_unlock_bh

#define __always_inline__read_unlock_bh

#define __always_inline__write_unlock_bh

#define __always_inline__spin_unlock_irq

#define __always_inline__read_unlock_irq

#define __always_inline__write_unlock_irq

#define __always_inline__spin_unlock_irqrestore

#define __always_inline__read_unlock_irqrestore

#define __always_inline__write_unlock_irqrestore



#endif /* __ASM_SPINLOCK_H */

include/linux/sched.h

+5 −5
Original line number Diff line number Diff line
@@ -1421,17 +1421,17 @@ struct task_struct { 
#endif

#ifdef CONFIG_TRACE_IRQFLAGS

	unsigned int irq_events;

	int hardirqs_enabled;

	unsigned long hardirq_enable_ip;

	unsigned int hardirq_enable_event;

	unsigned long hardirq_disable_ip;

	unsigned int hardirq_enable_event;

	unsigned int hardirq_disable_event;

	int softirqs_enabled;

	int hardirqs_enabled;

	int hardirq_context;

	unsigned long softirq_disable_ip;

	unsigned int softirq_disable_event;

	unsigned long softirq_enable_ip;

	unsigned int softirq_disable_event;

	unsigned int softirq_enable_event;

	int hardirq_context;

	int softirqs_enabled;

	int softirq_context;

#endif

#ifdef CONFIG_LOCKDEP

include/linux/spinlock.h

+2 −4
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ 
 */

#include <linux/spinlock_types.h>



extern int __lockfunc generic__raw_read_trylock(raw_rwlock_t *lock);



/*

 * Pull the __raw*() functions/declarations (UP-nondebug doesnt need them):

 */
@@ -102,7 +100,7 @@ do { \ 


#else

# define spin_lock_init(lock)					\

	do { *(lock) = SPIN_LOCK_UNLOCKED; } while (0)

	do { *(lock) = __SPIN_LOCK_UNLOCKED(lock); } while (0)

#endif



#ifdef CONFIG_DEBUG_SPINLOCK
@@ -116,7 +114,7 @@ do { \ 
} while (0)

#else

# define rwlock_init(lock)					\

	do { *(lock) = RW_LOCK_UNLOCKED; } while (0)

	do { *(lock) = __RW_LOCK_UNLOCKED(lock); } while (0)

#endif



#define spin_is_locked(lock)	__raw_spin_is_locked(&(lock)->raw_lock)

include/linux/spinlock_api_smp.h

+28 −47
Original line number Diff line number Diff line
@@ -60,137 +60,118 @@ void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 
void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(lock);



/*

 * We inline the unlock functions in the nondebug case:

 */

#if !defined(CONFIG_DEBUG_SPINLOCK) && !defined(CONFIG_PREEMPT)

#define __always_inline__spin_unlock

#define __always_inline__read_unlock

#define __always_inline__write_unlock

#define __always_inline__spin_unlock_irq

#define __always_inline__read_unlock_irq

#define __always_inline__write_unlock_irq

#endif



#ifndef CONFIG_DEBUG_SPINLOCK

#ifndef CONFIG_GENERIC_LOCKBREAK



#ifdef __always_inline__spin_lock

#ifdef CONFIG_INLINE_SPIN_LOCK

#define _spin_lock(lock) __spin_lock(lock)

#endif



#ifdef __always_inline__read_lock

#ifdef CONFIG_INLINE_READ_LOCK

#define _read_lock(lock) __read_lock(lock)

#endif



#ifdef __always_inline__write_lock

#ifdef CONFIG_INLINE_WRITE_LOCK

#define _write_lock(lock) __write_lock(lock)

#endif



#ifdef __always_inline__spin_lock_bh

#ifdef CONFIG_INLINE_SPIN_LOCK_BH

#define _spin_lock_bh(lock) __spin_lock_bh(lock)

#endif



#ifdef __always_inline__read_lock_bh

#ifdef CONFIG_INLINE_READ_LOCK_BH

#define _read_lock_bh(lock) __read_lock_bh(lock)

#endif



#ifdef __always_inline__write_lock_bh

#ifdef CONFIG_INLINE_WRITE_LOCK_BH

#define _write_lock_bh(lock) __write_lock_bh(lock)

#endif



#ifdef __always_inline__spin_lock_irq

#ifdef CONFIG_INLINE_SPIN_LOCK_IRQ

#define _spin_lock_irq(lock) __spin_lock_irq(lock)

#endif



#ifdef __always_inline__read_lock_irq

#ifdef CONFIG_INLINE_READ_LOCK_IRQ

#define _read_lock_irq(lock) __read_lock_irq(lock)

#endif



#ifdef __always_inline__write_lock_irq

#ifdef CONFIG_INLINE_WRITE_LOCK_IRQ

#define _write_lock_irq(lock) __write_lock_irq(lock)

#endif



#ifdef __always_inline__spin_lock_irqsave

#ifdef CONFIG_INLINE_SPIN_LOCK_IRQSAVE

#define _spin_lock_irqsave(lock) __spin_lock_irqsave(lock)

#endif



#ifdef __always_inline__read_lock_irqsave

#ifdef CONFIG_INLINE_READ_LOCK_IRQSAVE

#define _read_lock_irqsave(lock) __read_lock_irqsave(lock)

#endif



#ifdef __always_inline__write_lock_irqsave

#ifdef CONFIG_INLINE_WRITE_LOCK_IRQSAVE

#define _write_lock_irqsave(lock) __write_lock_irqsave(lock)

#endif



#endif /* !CONFIG_GENERIC_LOCKBREAK */



#ifdef __always_inline__spin_trylock

#ifdef CONFIG_INLINE_SPIN_TRYLOCK

#define _spin_trylock(lock) __spin_trylock(lock)

#endif



#ifdef __always_inline__read_trylock

#ifdef CONFIG_INLINE_READ_TRYLOCK

#define _read_trylock(lock) __read_trylock(lock)

#endif



#ifdef __always_inline__write_trylock

#ifdef CONFIG_INLINE_WRITE_TRYLOCK

#define _write_trylock(lock) __write_trylock(lock)

#endif



#ifdef __always_inline__spin_trylock_bh

#ifdef CONFIG_INLINE_SPIN_TRYLOCK_BH

#define _spin_trylock_bh(lock) __spin_trylock_bh(lock)

#endif



#ifdef __always_inline__spin_unlock

#ifdef CONFIG_INLINE_SPIN_UNLOCK

#define _spin_unlock(lock) __spin_unlock(lock)

#endif



#ifdef __always_inline__read_unlock

#ifdef CONFIG_INLINE_READ_UNLOCK

#define _read_unlock(lock) __read_unlock(lock)

#endif



#ifdef __always_inline__write_unlock

#ifdef CONFIG_INLINE_WRITE_UNLOCK

#define _write_unlock(lock) __write_unlock(lock)

#endif



#ifdef __always_inline__spin_unlock_bh

#ifdef CONFIG_INLINE_SPIN_UNLOCK_BH

#define _spin_unlock_bh(lock) __spin_unlock_bh(lock)

#endif



#ifdef __always_inline__read_unlock_bh

#ifdef CONFIG_INLINE_READ_UNLOCK_BH

#define _read_unlock_bh(lock) __read_unlock_bh(lock)

#endif



#ifdef __always_inline__write_unlock_bh

#ifdef CONFIG_INLINE_WRITE_UNLOCK_BH

#define _write_unlock_bh(lock) __write_unlock_bh(lock)

#endif



#ifdef __always_inline__spin_unlock_irq

#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQ

#define _spin_unlock_irq(lock) __spin_unlock_irq(lock)

#endif



#ifdef __always_inline__read_unlock_irq

#ifdef CONFIG_INLINE_READ_UNLOCK_IRQ

#define _read_unlock_irq(lock) __read_unlock_irq(lock)

#endif



#ifdef __always_inline__write_unlock_irq

#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQ

#define _write_unlock_irq(lock) __write_unlock_irq(lock)

#endif



#ifdef __always_inline__spin_unlock_irqrestore

#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE

#define _spin_unlock_irqrestore(lock, flags) __spin_unlock_irqrestore(lock, flags)

#endif



#ifdef __always_inline__read_unlock_irqrestore

#ifdef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE

#define _read_unlock_irqrestore(lock, flags) __read_unlock_irqrestore(lock, flags)

#endif



#ifdef __always_inline__write_unlock_irqrestore

#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE

#define _write_unlock_irqrestore(lock, flags) __write_unlock_irqrestore(lock, flags)

#endif



#endif /* CONFIG_DEBUG_SPINLOCK */



static inline int __spin_trylock(spinlock_t *lock)

{

	preempt_disable();