tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar:
"Misc fixes: liblockdep fixes and ww_mutex fixes"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/ww_mutex: Fix spelling mistake "cylic" -> "cyclic"
locking/lockdep: Delete unnecessary #include
tools/lib/lockdep: Add dummy task_struct state member
tools/lib/lockdep: Add empty nmi.h
tools/lib/lockdep: Update Sasha Levin email to MSFT
jump_label: Fix typo in warning message
locking/mutex: Fix mutex debug call and ww_mutex documentation

Linus Torvalds ca062f8d 3a5af36b

+7 -6
+1 -1
MAINTAINERS
··· 8316 8316 F: Documentation/devicetree/bindings/ata/ 8317 8317 8318 8318 LIBLOCKDEP 8319 - M: Sasha Levin <alexander.levin@verizon.com> 8319 + M: Sasha Levin <alexander.levin@microsoft.com> 8320 8320 S: Maintained 8321 8321 F: tools/lib/lockdep/ 8322 8322
+1 -1
kernel/jump_label.c
··· 678 678 case MODULE_STATE_COMING: 679 679 ret = jump_label_add_module(mod); 680 680 if (ret) { 681 - WARN(1, "Failed to allocatote memory: jump_label may not work properly.\n"); 681 + WARN(1, "Failed to allocate memory: jump_label may not work properly.\n"); 682 682 jump_label_del_module(mod); 683 683 } 684 684 break;
-1
kernel/locking/lockdep.c
··· 55 55 56 56 #include "lockdep_internals.h" 57 57 58 - #include <trace/events/preemptirq.h> 59 58 #define CREATE_TRACE_POINTS 60 59 #include <trace/events/lock.h> 61 60
+1 -2
kernel/locking/mutex.c
··· 389 389 /* 390 390 * wake_up_process() paired with set_current_state() 391 391 * inserts sufficient barriers to make sure @owner either sees 392 - * it's wounded in __ww_mutex_lock_check_stamp() or has a 392 + * it's wounded in __ww_mutex_check_kill() or has a 393 393 * wakeup pending to re-read the wounded state. 394 394 */ 395 395 if (owner != current) ··· 946 946 } 947 947 948 948 debug_mutex_lock_common(lock, &waiter); 949 - debug_mutex_add_waiter(lock, &waiter, current); 950 949 951 950 lock_contended(&lock->dep_map, ip); 952 951
+1 -1
kernel/locking/test-ww_mutex.c
··· 324 324 if (!cycle->result) 325 325 continue; 326 326 327 - pr_err("cylic deadlock not resolved, ret[%d/%d] = %d\n", 327 + pr_err("cyclic deadlock not resolved, ret[%d/%d] = %d\n", 328 328 n, nthreads, cycle->result); 329 329 ret = -EINVAL; 330 330 break;
+3
tools/include/linux/lockdep.h
··· 30 30 struct held_lock held_locks[MAX_LOCK_DEPTH]; 31 31 gfp_t lockdep_reclaim_gfp; 32 32 int pid; 33 + int state; 33 34 char comm[17]; 34 35 }; 36 + 37 + #define TASK_RUNNING 0 35 38 36 39 extern struct task_struct *__curr(void); 37 40
tools/include/linux/nmi.h