Commit e84815cb authored by Christian König's avatar Christian König
Browse files

seqlock: drop seqcount_ww_mutex_t 



Daniel pointed out that this series removes the last user of
seqcount_ww_mutex_t, so let's drop this.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: linux-kernel@vger.kernel.org
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220407085946.744568-16-christian.koenig@amd.com
parent 8f94eda3

include/linux/seqlock.h

+2 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/kcsan-checks.h>

#include <linux/lockdep.h>

#include <linux/mutex.h>

#include <linux/ww_mutex.h>

#include <linux/preempt.h>

#include <linux/spinlock.h>
@@ -164,7 +163,7 @@ static inline void seqcount_lockdep_reader_access(const seqcount_t *s) 
 * static initializer or init function. This enables lockdep to validate

 * that the write side critical section is properly serialized.

 *

 * LOCKNAME:	raw_spinlock, spinlock, rwlock, mutex, or ww_mutex.

 * LOCKNAME:	raw_spinlock, spinlock, rwlock or mutex

 */



/*
@@ -184,7 +183,6 @@ static inline void seqcount_lockdep_reader_access(const seqcount_t *s) 
#define seqcount_spinlock_init(s, lock)		seqcount_LOCKNAME_init(s, lock, spinlock)

#define seqcount_rwlock_init(s, lock)		seqcount_LOCKNAME_init(s, lock, rwlock)

#define seqcount_mutex_init(s, lock)		seqcount_LOCKNAME_init(s, lock, mutex)

#define seqcount_ww_mutex_init(s, lock)		seqcount_LOCKNAME_init(s, lock, ww_mutex)



/*

 * SEQCOUNT_LOCKNAME()	- Instantiate seqcount_LOCKNAME_t and helpers
@@ -277,7 +275,6 @@ SEQCOUNT_LOCKNAME(raw_spinlock, raw_spinlock_t, false, s->lock, raw_s 
SEQCOUNT_LOCKNAME(spinlock,     spinlock_t,      __SEQ_RT, s->lock,        spin,     spin_lock(s->lock))

SEQCOUNT_LOCKNAME(rwlock,       rwlock_t,        __SEQ_RT, s->lock,        read,     read_lock(s->lock))

SEQCOUNT_LOCKNAME(mutex,        struct mutex,    true,     s->lock,        mutex,    mutex_lock(s->lock))

SEQCOUNT_LOCKNAME(ww_mutex,     struct ww_mutex, true,     &s->lock->base, ww_mutex, ww_mutex_lock(s->lock, NULL))



/*

 * SEQCNT_LOCKNAME_ZERO - static initializer for seqcount_LOCKNAME_t
@@ -304,8 +301,7 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu 
	__seqprop_case((s),	raw_spinlock,	prop),			\

	__seqprop_case((s),	spinlock,	prop),			\

	__seqprop_case((s),	rwlock,		prop),			\

	__seqprop_case((s),	mutex,		prop),			\

	__seqprop_case((s),	ww_mutex,	prop))

	__seqprop_case((s),	mutex,		prop))



#define seqprop_ptr(s)			__seqprop(s, ptr)

#define seqprop_sequence(s)		__seqprop(s, sequence)