Commit 607904c3 authored by Waiman Long's avatar Waiman Long Committed by Ingo Molnar
Browse files

locking/spinlocks: Remove the unused spin_lock_bh_nested() API 



The spin_lock_bh_nested() API is defined but is not used anywhere
in the kernel. So all spin_lock_bh_nested() and related APIs are
now removed.

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1483975612-16447-1-git-send-email-longman@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ba836a6f

include/linux/spinlock.h

+0 −8
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) 
#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define raw_spin_lock_nested(lock, subclass) \

	_raw_spin_lock_nested(lock, subclass)

# define raw_spin_lock_bh_nested(lock, subclass) \

	_raw_spin_lock_bh_nested(lock, subclass)



# define raw_spin_lock_nest_lock(lock, nest_lock)			\

	 do {								\
@@ -197,7 +195,6 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) 
# define raw_spin_lock_nested(lock, subclass)		\

	_raw_spin_lock(((void)(subclass), (lock)))

# define raw_spin_lock_nest_lock(lock, nest_lock)	_raw_spin_lock(lock)

# define raw_spin_lock_bh_nested(lock, subclass)	_raw_spin_lock_bh(lock)

#endif



#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
@@ -317,11 +314,6 @@ do { \ 
	raw_spin_lock_nested(spinlock_check(lock), subclass);	\

} while (0)



#define spin_lock_bh_nested(lock, subclass)			\

do {								\

	raw_spin_lock_bh_nested(spinlock_check(lock), subclass);\

} while (0)



#define spin_lock_nest_lock(lock, nest_lock)				\

do {									\

	raw_spin_lock_nest_lock(spinlock_check(lock), nest_lock);	\

include/linux/spinlock_api_smp.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ int in_lock_functions(unsigned long addr); 
void __lockfunc _raw_spin_lock(raw_spinlock_t *lock)		__acquires(lock);

void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)

								__acquires(lock);

void __lockfunc _raw_spin_lock_bh_nested(raw_spinlock_t *lock, int subclass)

								__acquires(lock);

void __lockfunc

_raw_spin_lock_nest_lock(raw_spinlock_t *lock, struct lockdep_map *map)

								__acquires(lock);

include/linux/spinlock_api_up.h

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 


#define _raw_spin_lock(lock)			__LOCK(lock)

#define _raw_spin_lock_nested(lock, subclass)	__LOCK(lock)

#define _raw_spin_lock_bh_nested(lock, subclass) __LOCK(lock)

#define _raw_read_lock(lock)			__LOCK(lock)

#define _raw_write_lock(lock)			__LOCK(lock)

#define _raw_spin_lock_bh(lock)			__LOCK_BH(lock)

kernel/locking/spinlock.c

+0 −8
Original line number Diff line number Diff line
@@ -363,14 +363,6 @@ void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass) 
}

EXPORT_SYMBOL(_raw_spin_lock_nested);



void __lockfunc _raw_spin_lock_bh_nested(raw_spinlock_t *lock, int subclass)

{

	__local_bh_disable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET);

	spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);

	LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);

}

EXPORT_SYMBOL(_raw_spin_lock_bh_nested);



unsigned long __lockfunc _raw_spin_lock_irqsave_nested(raw_spinlock_t *lock,

						   int subclass)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE