Merge branches 'bug.2018.11.12a', 'consolidate.2018.12.01a', 'doc.2018.11.12a', 'fixes.2018.11.12a', 'initrd.2018.11.08b', 'sil.2018.11.12a' and 'srcu.2018.11.27a' into HEAD

bug.2018.11.12a: Get rid of BUG_ON() and friends consolidate.2018.12.01a: Continued RCU flavor-consolidation cleanup doc.2018.11.12a: Documentation updates fixes.2018.11.12a: Miscellaneous fixes initrd.2018.11.08b: Automate creation of rcutorture initrd sil.2018.11.12a: Remove more spin_unlock_wait() calls

Paul E. McKenney committed 7 years ago

Commit eaaf0557 parents f0ad56e df56e0f 97b5937 3d709ab b94ec36 d4d592a aacb5d985 files · +3793 −3831Browse files

Showing the changes to kernel/locking (2 of 85 files). Show all

Unified · Split

2 files

kernel/locking/lockdep.c +1 −1
kernel/locking/mutex-debug.c +2 −2

kernel/locking/lockdep.c+1−1

@@ -4195,7 +4195,7 @@ void lockdep_free_key_range(void *start, unsigned long size) · 4194 unmodified lines
4195	4195	*
4196	4196	* sync_sched() is sufficient because the read-side is IRQ disable.
4197	4197	*/
4198		− synchronize_sched();
	4198	+ synchronize_rcu();
4199	4199
4200	4200	/*
4201	4201	* XXX at this point we could return the resources to the pool;

kernel/locking/mutex-debug.c+2−2

@@ -36,7 +36,7 @@ void debug_mutex_lock_common(struct mutex lock, struct mutex_waiter waiter) · 35 unmodified lines
36	36
37	37	void debug_mutex_wake_waiter(struct mutex lock, struct mutex_waiter waiter)
38	38	{
39		− SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
	39	+ lockdep_assert_held(&lock->wait_lock);
40	40	DEBUG_LOCKS_WARN_ON(list_empty(&lock->wait_list));
41	41	DEBUG_LOCKS_WARN_ON(waiter->magic != waiter);
42	42	DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
@@ -51,7 +51,7 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter) · 8 unmodified lines
51	51	void debug_mutex_add_waiter(struct mutex lock, struct mutex_waiter waiter,
52	52	struct task_struct *task)
53	53	{
54		− SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
	54	+ lockdep_assert_held(&lock->wait_lock);
55	55
56	56	/* Mark the current thread as blocked on the lock: */
57	57	task->blocked_on = waiter;