Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"A lockdep warning fix and a script execution fix when atomics are
generated"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/atomics: Don't assume that scripts are executable
locking/lockdep: Make lockdep_unregister_key() honor 'debug_locks' again
+6
-5
+5
-4
kernel/locking/lockdep.c
+5
-4
kernel/locking/lockdep.c
···
4907
4907
return;
4908
4908
4909
4909
raw_local_irq_save(flags);
4910
-
arch_spin_lock(&lockdep_lock);
4911
-
current->lockdep_recursion = 1;
4910
+
if (!graph_lock())
4911
+
goto out_irq;
4912
+
4912
4913
pf = get_pending_free();
4913
4914
hlist_for_each_entry_rcu(k, hash_head, hash_entry) {
4914
4915
if (k == key) {
···
4921
4920
WARN_ON_ONCE(!found);
4922
4921
__lockdep_free_key_range(pf, key, 1);
4923
4922
call_rcu_zapped(pf);
4924
-
current->lockdep_recursion = 0;
4925
-
arch_spin_unlock(&lockdep_lock);
4923
+
graph_unlock();
4924
+
out_irq:
4926
4925
raw_local_irq_restore(flags);
4927
4926
4928
4927
/* Wait until is_dynamic_key() has finished accessing k->hash_entry. */
+1
-1
scripts/atomic/gen-atomics.sh
+1
-1
scripts/atomic/gen-atomics.sh
···
13
13
gen-atomic-fallback.sh linux/atomic-fallback.h
14
14
EOF
15
15
while read script header; do
16
-
${ATOMICDIR}/${script} ${ATOMICTBL} > ${LINUXDIR}/include/${header}
16
+
/bin/sh ${ATOMICDIR}/${script} ${ATOMICTBL} > ${LINUXDIR}/include/${header}
17
17
HASH="$(sha1sum ${LINUXDIR}/include/${header})"
18
18
HASH="${HASH%% *}"
19
19
printf "// %s\n" "${HASH}" >> ${LINUXDIR}/include/${header}