Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (de3af9a9) · Commits · 戴 / test

kernel/locking/lockdep.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -4907,8 +4907,9 @@ void lockdep_unregister_key(struct lock_class_key *key)
		return;

		raw_local_irq_save(flags);
		arch_spin_lock(&lockdep_lock);
		current->lockdep_recursion = 1;
		if (!graph_lock())
		goto out_irq;

		pf = get_pending_free();
		hlist_for_each_entry_rcu(k, hash_head, hash_entry) {
		if (k == key) {
		@@ -4920,8 +4921,8 @@ void lockdep_unregister_key(struct lock_class_key *key)
		WARN_ON_ONCE(!found);
		__lockdep_free_key_range(pf, key, 1);
		call_rcu_zapped(pf);
		current->lockdep_recursion = 0;
		arch_spin_unlock(&lockdep_lock);
		graph_unlock();
		out_irq:
		raw_local_irq_restore(flags);

		/* Wait until is_dynamic_key() has finished accessing k->hash_entry. */

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ gen-atomic-long.sh asm-generic/atomic-long.h
		gen-atomic-fallback.sh linux/atomic-fallback.h
		EOF
		while read script header; do
		${ATOMICDIR}/${script} ${ATOMICTBL} > ${LINUXDIR}/include/${header}
		/bin/sh ${ATOMICDIR}/${script} ${ATOMICTBL} > ${LINUXDIR}/include/${header}
		HASH="$(sha1sum ${LINUXDIR}/include/${header})"
		HASH="${HASH%% *}"
		printf "// %s\n" "${HASH}" >> ${LINUXDIR}/include/${header}