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

Commit 3f3eafc9 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Thomas Gleixner
Browse files

locking: remove unused double_spin_lock() 



double_spin_lock() has no callers, and it can't be used without additional
lockdep annotations, remove it.

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8e60e05f

include/linux/spinlock.h

+0 −37
Original line number Original line Diff line number Diff line
@@ -295,43 +295,6 @@ do { \ 
	1 : ({ local_irq_restore(flags); 0; }); \

	1 : ({ local_irq_restore(flags); 0; }); \

})

})





/*

 * Locks two spinlocks l1 and l2.

 * l1_first indicates if spinlock l1 should be taken first.

 */

static inline void double_spin_lock(spinlock_t *l1, spinlock_t *l2,

				    bool l1_first)

	__acquires(l1)

	__acquires(l2)

{

	if (l1_first) {

		spin_lock(l1);

		spin_lock(l2);

	} else {

		spin_lock(l2);

		spin_lock(l1);

	}

}



/*

 * Unlocks two spinlocks l1 and l2.

 * l1_taken_first indicates if spinlock l1 was taken first and therefore

 * should be released after spinlock l2.

 */

static inline void double_spin_unlock(spinlock_t *l1, spinlock_t *l2,

				      bool l1_taken_first)

	__releases(l1)

	__releases(l2)

{

	if (l1_taken_first) {

		spin_unlock(l2);

		spin_unlock(l1);

	} else {

		spin_unlock(l1);

		spin_unlock(l2);

	}

}



/*

/*

 * Pull the atomic_t declaration:

 * Pull the atomic_t declaration:

 * (asm-mips/atomic.h needs above definitions)

 * (asm-mips/atomic.h needs above definitions)