linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

locking/lockdep: Remove unused @nested argument from lock_release()

Browse Source 
Since the following commit:

  b4adfe8e05 ("locking/lockdep: Remove unused argument in __lock_release")

@nested is no longer used in lock_release(), so remove it from all
lock_release() calls and friends.

Signed-off-by: Qian Cai <cai@lca.pw>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: akpm@linux-foundation.org
Cc: alexander.levin@microsoft.com
Cc: daniel@iogearbox.net
Cc: davem@davemloft.net
Cc: dri-devel@lists.freedesktop.org
Cc: duyuyang@gmail.com
Cc: gregkh@linuxfoundation.org
Cc: hannes@cmpxchg.org
Cc: intel-gfx@lists.freedesktop.org
Cc: jack@suse.com
Cc: jlbec@evilplan.or
Cc: joonas.lahtinen@linux.intel.com
Cc: joseph.qi@linux.alibaba.com
Cc: jslaby@suse.com
Cc: juri.lelli@redhat.com
Cc: maarten.lankhorst@linux.intel.com
Cc: mark@fasheh.com
Cc: mhocko@kernel.org
Cc: mripard@kernel.org
Cc: ocfs2-devel@oss.oracle.com
Cc: rodrigo.vivi@intel.com
Cc: sean@poorly.run
Cc: st@kernel.org
Cc: tj@kernel.org
Cc: tytso@mit.edu
Cc: vdavydov.dev@gmail.com
Cc: vincent.guittot@linaro.org
Cc: viro@zeniv.linux.org.uk
Link: https://lkml.kernel.org/r/1568909380-32199-1-git-send-email-cai@lca.pw
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Qian Cai
2019-10-09 12:46:10 +02:00
committed by Ingo Molnar
parent e950cca3f3
commit 5facae4f35
33 changed files with 90 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/drm_connector.c
+1 -1
View File
@@ -719,7 +719,7 @@ void drm_connector_list_iter_end(struct drm_connector_list_iter *iter)
__drm_connector_put_safe(iter->conn); __drm_connector_put_safe(iter->conn);
spin_unlock_irqrestore(&config->connector_list_lock, flags); spin_unlock_irqrestore(&config->connector_list_lock, flags);
} }
lock_release(&connector_list_iter_dep_map, 0, _RET_IP_); lock_release(&connector_list_iter_dep_map, _RET_IP_);
} }
EXPORT_SYMBOL(drm_connector_list_iter_end); EXPORT_SYMBOL(drm_connector_list_iter_end);
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+3 -3
View File
@@ -509,14 +509,14 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
I915_MM_SHRINKER, 0, _RET_IP_); I915_MM_SHRINKER, 0, _RET_IP_);
mutex_acquire(&mutex->dep_map, 0, 0, _RET_IP_); mutex_acquire(&mutex->dep_map, 0, 0, _RET_IP_);
mutex_release(&mutex->dep_map, 0, _RET_IP_); mutex_release(&mutex->dep_map, _RET_IP_);
mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_); mutex_release(&i915->drm.struct_mutex.dep_map, _RET_IP_);
fs_reclaim_release(GFP_KERNEL); fs_reclaim_release(GFP_KERNEL);
if (unlock) if (unlock)
mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_); mutex_release(&i915->drm.struct_mutex.dep_map, _RET_IP_);
} }
#define obj_to_i915(obj__) to_i915((obj__)->base.dev) #define obj_to_i915(obj__) to_i915((obj__)->base.dev)
drivers/gpu/drm/i915/gt/intel_engine_pm.c
+1 -1
View File
@@ -52,7 +52,7 @@ static inline unsigned long __timeline_mark_lock(struct intel_context *ce)
static inline void __timeline_mark_unlock(struct intel_context *ce, static inline void __timeline_mark_unlock(struct intel_context *ce,
unsigned long flags) unsigned long flags)
{ {
mutex_release(&ce->timeline->mutex.dep_map, 0, _THIS_IP_); mutex_release(&ce->timeline->mutex.dep_map, _THIS_IP_);
local_irq_restore(flags); local_irq_restore(flags);
} }
drivers/gpu/drm/i915/i915_request.c
+1 -1
View File
@@ -1456,7 +1456,7 @@ long i915_request_wait(struct i915_request *rq,
dma_fence_remove_callback(&rq->fence, &wait.cb); dma_fence_remove_callback(&rq->fence, &wait.cb);
out: out:
mutex_release(&rq->engine->gt->reset.mutex.dep_map, 0, _THIS_IP_); mutex_release(&rq->engine->gt->reset.mutex.dep_map, _THIS_IP_);
trace_i915_request_wait_end(rq); trace_i915_request_wait_end(rq);
return timeout; return timeout;
} }
drivers/tty/tty_ldsem.c
+4 -4
View File
@@ -303,7 +303,7 @@ static int __ldsem_down_read_nested(struct ld_semaphore *sem,
if (count <= 0) { if (count <= 0) {
lock_contended(&sem->dep_map, _RET_IP_); lock_contended(&sem->dep_map, _RET_IP_);
if (!down_read_failed(sem, count, timeout)) { if (!down_read_failed(sem, count, timeout)) {
rwsem_release(&sem->dep_map, 1, _RET_IP_); rwsem_release(&sem->dep_map, _RET_IP_);
return 0; return 0;
} }
} }
@@ -322,7 +322,7 @@ static int __ldsem_down_write_nested(struct ld_semaphore *sem,
if ((count & LDSEM_ACTIVE_MASK) != LDSEM_ACTIVE_BIAS) { if ((count & LDSEM_ACTIVE_MASK) != LDSEM_ACTIVE_BIAS) {
lock_contended(&sem->dep_map, _RET_IP_); lock_contended(&sem->dep_map, _RET_IP_);
if (!down_write_failed(sem, count, timeout)) { if (!down_write_failed(sem, count, timeout)) {
rwsem_release(&sem->dep_map, 1, _RET_IP_); rwsem_release(&sem->dep_map, _RET_IP_);
return 0; return 0;
} }
} }
@@ -390,7 +390,7 @@ void ldsem_up_read(struct ld_semaphore *sem)
{ {
long count; long count;
rwsem_release(&sem->dep_map, 1, _RET_IP_); rwsem_release(&sem->dep_map, _RET_IP_);
count = atomic_long_add_return(-LDSEM_READ_BIAS, &sem->count); count = atomic_long_add_return(-LDSEM_READ_BIAS, &sem->count);
if (count < 0 && (count & LDSEM_ACTIVE_MASK) == 0) if (count < 0 && (count & LDSEM_ACTIVE_MASK) == 0)
@@ -404,7 +404,7 @@ void ldsem_up_write(struct ld_semaphore *sem)
{ {
long count; long count;
rwsem_release(&sem->dep_map, 1, _RET_IP_); rwsem_release(&sem->dep_map, _RET_IP_);
count = atomic_long_add_return(-LDSEM_WRITE_BIAS, &sem->count); count = atomic_long_add_return(-LDSEM_WRITE_BIAS, &sem->count);
if (count < 0) if (count < 0)
fs/dcache.c
+1 -1
View File
@@ -1319,7 +1319,7 @@ resume:
if (!list_empty(&dentry->d_subdirs)) { if (!list_empty(&dentry->d_subdirs)) {
spin_unlock(&this_parent->d_lock); spin_unlock(&this_parent->d_lock);
spin_release(&dentry->d_lock.dep_map, 1, _RET_IP_); spin_release(&dentry->d_lock.dep_map, _RET_IP_);
this_parent = dentry; this_parent = dentry;
spin_acquire(&this_parent->d_lock.dep_map, 0, 1, _RET_IP_); spin_acquire(&this_parent->d_lock.dep_map, 0, 1, _RET_IP_);
goto repeat; goto repeat;
fs/jbd2/transaction.c
+2 -2
View File
@@ -713,7 +713,7 @@ int jbd2__journal_restart(handle_t *handle, int nblocks, gfp_t gfp_mask)
if (need_to_start) if (need_to_start)
jbd2_log_start_commit(journal, tid); jbd2_log_start_commit(journal, tid);
rwsem_release(&journal->j_trans_commit_map, 1, _THIS_IP_); rwsem_release(&journal->j_trans_commit_map, _THIS_IP_);
handle->h_buffer_credits = nblocks; handle->h_buffer_credits = nblocks;
/* /*
* Restore the original nofs context because the journal restart * Restore the original nofs context because the journal restart
@@ -1848,7 +1848,7 @@ int jbd2_journal_stop(handle_t *handle)
wake_up(&journal->j_wait_transaction_locked); wake_up(&journal->j_wait_transaction_locked);
} }
rwsem_release(&journal->j_trans_commit_map, 1, _THIS_IP_); rwsem_release(&journal->j_trans_commit_map, _THIS_IP_);
if (wait_for_commit) if (wait_for_commit)
err = jbd2_log_wait_commit(journal, tid); err = jbd2_log_wait_commit(journal, tid);
fs/kernfs/dir.c
+2 -2
View File
@@ -438,7 +438,7 @@ void kernfs_put_active(struct kernfs_node *kn)
return; return;
if (kernfs_lockdep(kn)) if (kernfs_lockdep(kn))
rwsem_release(&kn->dep_map, 1, _RET_IP_); rwsem_release(&kn->dep_map, _RET_IP_);
v = atomic_dec_return(&kn->active); v = atomic_dec_return(&kn->active);
if (likely(v != KN_DEACTIVATED_BIAS)) if (likely(v != KN_DEACTIVATED_BIAS))
return; return;
@@ -476,7 +476,7 @@ static void kernfs_drain(struct kernfs_node *kn)
if (kernfs_lockdep(kn)) { if (kernfs_lockdep(kn)) {
lock_acquired(&kn->dep_map, _RET_IP_); lock_acquired(&kn->dep_map, _RET_IP_);
rwsem_release(&kn->dep_map, 1, _RET_IP_); rwsem_release(&kn->dep_map, _RET_IP_);
} }
kernfs_drain_open_files(kn); kernfs_drain_open_files(kn);
fs/ocfs2/dlmglue.c
+1 -1
View File
@@ -1687,7 +1687,7 @@ static void __ocfs2_cluster_unlock(struct ocfs2_super *osb,
spin_unlock_irqrestore(&lockres->l_lock, flags); spin_unlock_irqrestore(&lockres->l_lock, flags);
#ifdef CONFIG_DEBUG_LOCK_ALLOC #ifdef CONFIG_DEBUG_LOCK_ALLOC
if (lockres->l_lockdep_map.key != NULL) if (lockres->l_lockdep_map.key != NULL)
rwsem_release(&lockres->l_lockdep_map, 1, caller_ip); rwsem_release(&lockres->l_lockdep_map, caller_ip);
#endif #endif
} }
include/linux/jbd2.h
+1 -1
View File
@@ -1170,7 +1170,7 @@ struct journal_s
#define jbd2_might_wait_for_commit(j) \ #define jbd2_might_wait_for_commit(j) \
do { \ do { \
rwsem_acquire(&j->j_trans_commit_map, 0, 0, _THIS_IP_); \ rwsem_acquire(&j->j_trans_commit_map, 0, 0, _THIS_IP_); \
rwsem_release(&j->j_trans_commit_map, 1, _THIS_IP_); \ rwsem_release(&j->j_trans_commit_map, _THIS_IP_); \
} while (0) } while (0)
/* journal feature predicate functions */ /* journal feature predicate functions */
include/linux/lockdep.h
+10 -11
View File
@@ -349,8 +349,7 @@ extern void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
int trylock, int read, int check, int trylock, int read, int check,
struct lockdep_map *nest_lock, unsigned long ip); struct lockdep_map *nest_lock, unsigned long ip);
extern void lock_release(struct lockdep_map *lock, int nested, extern void lock_release(struct lockdep_map *lock, unsigned long ip);
unsigned long ip);
/* /*
* Same "read" as for lock_acquire(), except -1 means any. * Same "read" as for lock_acquire(), except -1 means any.
@@ -428,7 +427,7 @@ static inline void lockdep_set_selftest_task(struct task_struct *task)
} }
# define lock_acquire(l, s, t, r, c, n, i) do { } while (0) # define lock_acquire(l, s, t, r, c, n, i) do { } while (0)
# define lock_release(l, n, i) do { } while (0) # define lock_release(l, i) do { } while (0)
# define lock_downgrade(l, i) do { } while (0) # define lock_downgrade(l, i) do { } while (0)
# define lock_set_class(l, n, k, s, i) do { } while (0) # define lock_set_class(l, n, k, s, i) do { } while (0)
# define lock_set_subclass(l, s, i) do { } while (0) # define lock_set_subclass(l, s, i) do { } while (0)
@@ -591,42 +590,42 @@ static inline void print_irqtrace_events(struct task_struct *curr)
#define spin_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) #define spin_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)
#define spin_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i) #define spin_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)
#define spin_release(l, n, i) lock_release(l, n, i) #define spin_release(l, i) lock_release(l, i)
#define rwlock_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) #define rwlock_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)
#define rwlock_acquire_read(l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i) #define rwlock_acquire_read(l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i)
#define rwlock_release(l, n, i) lock_release(l, n, i) #define rwlock_release(l, i) lock_release(l, i)
#define seqcount_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) #define seqcount_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)
#define seqcount_acquire_read(l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i) #define seqcount_acquire_read(l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i)
#define seqcount_release(l, n, i) lock_release(l, n, i) #define seqcount_release(l, i) lock_release(l, i)
#define mutex_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) #define mutex_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)
#define mutex_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i) #define mutex_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)
#define mutex_release(l, n, i) lock_release(l, n, i) #define mutex_release(l, i) lock_release(l, i)
#define rwsem_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) #define rwsem_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)
#define rwsem_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i) #define rwsem_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)
#define rwsem_acquire_read(l, s, t, i) lock_acquire_shared(l, s, t, NULL, i) #define rwsem_acquire_read(l, s, t, i) lock_acquire_shared(l, s, t, NULL, i)
#define rwsem_release(l, n, i) lock_release(l, n, i) #define rwsem_release(l, i) lock_release(l, i)
#define lock_map_acquire(l) lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_) #define lock_map_acquire(l) lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_)
#define lock_map_acquire_read(l) lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_) #define lock_map_acquire_read(l) lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_)
#define lock_map_acquire_tryread(l) lock_acquire_shared_recursive(l, 0, 1, NULL, _THIS_IP_) #define lock_map_acquire_tryread(l) lock_acquire_shared_recursive(l, 0, 1, NULL, _THIS_IP_)
#define lock_map_release(l) lock_release(l, 1, _THIS_IP_) #define lock_map_release(l) lock_release(l, _THIS_IP_)
#ifdef CONFIG_PROVE_LOCKING #ifdef CONFIG_PROVE_LOCKING
# define might_lock(lock) \ # define might_lock(lock) \
do { \ do { \
typecheck(struct lockdep_map *, &(lock)->dep_map); \ typecheck(struct lockdep_map *, &(lock)->dep_map); \
lock_acquire(&(lock)->dep_map, 0, 0, 0, 1, NULL, _THIS_IP_); \ lock_acquire(&(lock)->dep_map, 0, 0, 0, 1, NULL, _THIS_IP_); \
lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ lock_release(&(lock)->dep_map, _THIS_IP_); \
} while (0) } while (0)
# define might_lock_read(lock) \ # define might_lock_read(lock) \
do { \ do { \
typecheck(struct lockdep_map *, &(lock)->dep_map); \ typecheck(struct lockdep_map *, &(lock)->dep_map); \
lock_acquire(&(lock)->dep_map, 0, 0, 1, 1, NULL, _THIS_IP_); \ lock_acquire(&(lock)->dep_map, 0, 0, 1, 1, NULL, _THIS_IP_); \
lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ lock_release(&(lock)->dep_map, _THIS_IP_); \
} while (0) } while (0)
#define lockdep_assert_irqs_enabled() do { \ #define lockdep_assert_irqs_enabled() do { \
include/linux/percpu-rwsem.h
+2 -2
View File
@@ -93,7 +93,7 @@ static inline void percpu_up_read(struct percpu_rw_semaphore *sem)
__percpu_up_read(sem); /* Unconditional memory barrier */ __percpu_up_read(sem); /* Unconditional memory barrier */
preempt_enable(); preempt_enable();
rwsem_release(&sem->rw_sem.dep_map, 1, _RET_IP_); rwsem_release(&sem->rw_sem.dep_map, _RET_IP_);
} }
extern void percpu_down_write(struct percpu_rw_semaphore *); extern void percpu_down_write(struct percpu_rw_semaphore *);
@@ -118,7 +118,7 @@ extern void percpu_free_rwsem(struct percpu_rw_semaphore *);
static inline void percpu_rwsem_release(struct percpu_rw_semaphore *sem, static inline void percpu_rwsem_release(struct percpu_rw_semaphore *sem,
bool read, unsigned long ip) bool read, unsigned long ip)
{ {
lock_release(&sem->rw_sem.dep_map, 1, ip); lock_release(&sem->rw_sem.dep_map, ip);
#ifdef CONFIG_RWSEM_SPIN_ON_OWNER #ifdef CONFIG_RWSEM_SPIN_ON_OWNER
if (!read) if (!read)
atomic_long_set(&sem->rw_sem.owner, RWSEM_OWNER_UNKNOWN); atomic_long_set(&sem->rw_sem.owner, RWSEM_OWNER_UNKNOWN);
include/linux/rcupdate.h
+1 -1
View File
@@ -210,7 +210,7 @@ static inline void rcu_lock_acquire(struct lockdep_map *map)
static inline void rcu_lock_release(struct lockdep_map *map) static inline void rcu_lock_release(struct lockdep_map *map)
{ {
lock_release(map, 1, _THIS_IP_); lock_release(map, _THIS_IP_);
} }
extern struct lockdep_map rcu_lock_map; extern struct lockdep_map rcu_lock_map;
include/linux/rwlock_api_smp.h
+8 -8
View File
@@ -215,14 +215,14 @@ static inline void __raw_write_lock(rwlock_t *lock)
static inline void __raw_write_unlock(rwlock_t *lock) static inline void __raw_write_unlock(rwlock_t *lock)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_write_unlock(lock); do_raw_write_unlock(lock);
preempt_enable(); preempt_enable();
} }
static inline void __raw_read_unlock(rwlock_t *lock) static inline void __raw_read_unlock(rwlock_t *lock)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_read_unlock(lock); do_raw_read_unlock(lock);
preempt_enable(); preempt_enable();
} }
@@ -230,7 +230,7 @@ static inline void __raw_read_unlock(rwlock_t *lock)
static inline void static inline void
__raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) __raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_read_unlock(lock); do_raw_read_unlock(lock);
local_irq_restore(flags); local_irq_restore(flags);
preempt_enable(); preempt_enable();
@@ -238,7 +238,7 @@ __raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
static inline void __raw_read_unlock_irq(rwlock_t *lock) static inline void __raw_read_unlock_irq(rwlock_t *lock)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_read_unlock(lock); do_raw_read_unlock(lock);
local_irq_enable(); local_irq_enable();
preempt_enable(); preempt_enable();
@@ -246,7 +246,7 @@ static inline void __raw_read_unlock_irq(rwlock_t *lock)
static inline void __raw_read_unlock_bh(rwlock_t *lock) static inline void __raw_read_unlock_bh(rwlock_t *lock)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_read_unlock(lock); do_raw_read_unlock(lock);
__local_bh_enable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET); __local_bh_enable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET);
} }
@@ -254,7 +254,7 @@ static inline void __raw_read_unlock_bh(rwlock_t *lock)
static inline void __raw_write_unlock_irqrestore(rwlock_t *lock, static inline void __raw_write_unlock_irqrestore(rwlock_t *lock,
unsigned long flags) unsigned long flags)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_write_unlock(lock); do_raw_write_unlock(lock);
local_irq_restore(flags); local_irq_restore(flags);
preempt_enable(); preempt_enable();
@@ -262,7 +262,7 @@ static inline void __raw_write_unlock_irqrestore(rwlock_t *lock,
static inline void __raw_write_unlock_irq(rwlock_t *lock) static inline void __raw_write_unlock_irq(rwlock_t *lock)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_write_unlock(lock); do_raw_write_unlock(lock);
local_irq_enable(); local_irq_enable();
preempt_enable(); preempt_enable();
@@ -270,7 +270,7 @@ static inline void __raw_write_unlock_irq(rwlock_t *lock)
static inline void __raw_write_unlock_bh(rwlock_t *lock) static inline void __raw_write_unlock_bh(rwlock_t *lock)
{ {
rwlock_release(&lock->dep_map, 1, _RET_IP_); rwlock_release(&lock->dep_map, _RET_IP_);
do_raw_write_unlock(lock); do_raw_write_unlock(lock);
__local_bh_enable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET); __local_bh_enable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET);
} }
include/linux/seqlock.h
+2 -2
View File
@@ -79,7 +79,7 @@ static inline void seqcount_lockdep_reader_access(const seqcount_t *s)
local_irq_save(flags); local_irq_save(flags);
seqcount_acquire_read(&l->dep_map, 0, 0, _RET_IP_); seqcount_acquire_read(&l->dep_map, 0, 0, _RET_IP_);
seqcount_release(&l->dep_map, 1, _RET_IP_); seqcount_release(&l->dep_map, _RET_IP_);
local_irq_restore(flags); local_irq_restore(flags);
} }
@@ -384,7 +384,7 @@ static inline void write_seqcount_begin(seqcount_t *s)
static inline void write_seqcount_end(seqcount_t *s) static inline void write_seqcount_end(seqcount_t *s)
{ {
seqcount_release(&s->dep_map, 1, _RET_IP_); seqcount_release(&s->dep_map, _RET_IP_);
raw_write_seqcount_end(s); raw_write_seqcount_end(s);
} }
include/linux/spinlock_api_smp.h
+4 -4
View File
@@ -147,7 +147,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
static inline void __raw_spin_unlock(raw_spinlock_t *lock) static inline void __raw_spin_unlock(raw_spinlock_t *lock)
{ {
spin_release(&lock->dep_map, 1, _RET_IP_); spin_release(&lock->dep_map, _RET_IP_);
do_raw_spin_unlock(lock); do_raw_spin_unlock(lock);
preempt_enable(); preempt_enable();
} }
@@ -155,7 +155,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
static inline void __raw_spin_unlock_irqrestore(raw_spinlock_t *lock, static inline void __raw_spin_unlock_irqrestore(raw_spinlock_t *lock,
unsigned long flags) unsigned long flags)
{ {
spin_release(&lock->dep_map, 1, _RET_IP_); spin_release(&lock->dep_map, _RET_IP_);
do_raw_spin_unlock(lock); do_raw_spin_unlock(lock);
local_irq_restore(flags); local_irq_restore(flags);
preempt_enable(); preempt_enable();
@@ -163,7 +163,7 @@ static inline void __raw_spin_unlock_irqrestore(raw_spinlock_t *lock,
static inline void __raw_spin_unlock_irq(raw_spinlock_t *lock) static inline void __raw_spin_unlock_irq(raw_spinlock_t *lock)
{ {
spin_release(&lock->dep_map, 1, _RET_IP_); spin_release(&lock->dep_map, _RET_IP_);
do_raw_spin_unlock(lock); do_raw_spin_unlock(lock);
local_irq_enable(); local_irq_enable();
preempt_enable(); preempt_enable();
@@ -171,7 +171,7 @@ static inline void __raw_spin_unlock_irq(raw_spinlock_t *lock)
static inline void __raw_spin_unlock_bh(raw_spinlock_t *lock) static inline void __raw_spin_unlock_bh(raw_spinlock_t *lock)
{ {
spin_release(&lock->dep_map, 1, _RET_IP_); spin_release(&lock->dep_map, _RET_IP_);
do_raw_spin_unlock(lock); do_raw_spin_unlock(lock);
__local_bh_enable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET); __local_bh_enable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET);
} }
include/linux/ww_mutex.h
+1 -1
View File
@@ -182,7 +182,7 @@ static inline void ww_acquire_done(struct ww_acquire_ctx *ctx)
static inline void ww_acquire_fini(struct ww_acquire_ctx *ctx) static inline void ww_acquire_fini(struct ww_acquire_ctx *ctx)
{ {
#ifdef CONFIG_DEBUG_MUTEXES #ifdef CONFIG_DEBUG_MUTEXES
mutex_release(&ctx->dep_map, 0, _THIS_IP_); mutex_release(&ctx->dep_map, _THIS_IP_);
DEBUG_LOCKS_WARN_ON(ctx->acquired); DEBUG_LOCKS_WARN_ON(ctx->acquired);
if (!IS_ENABLED(CONFIG_PROVE_LOCKING)) if (!IS_ENABLED(CONFIG_PROVE_LOCKING))
include/net/sock.h
+1 -1
View File
@@ -1484,7 +1484,7 @@ static inline void sock_release_ownership(struct sock *sk)
sk->sk_lock.owned = 0; sk->sk_lock.owned = 0;
/* The sk_lock has mutex_unlock() semantics: */ /* The sk_lock has mutex_unlock() semantics: */
mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_); mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
} }
} }
kernel/bpf/stackmap.c
+1 -1
View File
@@ -338,7 +338,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,
* up_read_non_owner(). The rwsem_release() is called * up_read_non_owner(). The rwsem_release() is called
* here to release the lock from lockdep's perspective. * here to release the lock from lockdep's perspective.
*/ */
rwsem_release(&current->mm->mmap_sem.dep_map, 1, _RET_IP_); rwsem_release(&current->mm->mmap_sem.dep_map, _RET_IP_);
} }
} }
kernel/cpu.c
+1 -1
View File
@@ -336,7 +336,7 @@ static void lockdep_acquire_cpus_lock(void)
static void lockdep_release_cpus_lock(void) static void lockdep_release_cpus_lock(void)
{ {
rwsem_release(&cpu_hotplug_lock.rw_sem.dep_map, 1, _THIS_IP_); rwsem_release(&cpu_hotplug_lock.rw_sem.dep_map, _THIS_IP_);
} }
/* /*

Some files were not shown because too many files have changed in this diff Show More