Merge branch 'locking/urgent' into locking/core, to pick up fixes

Ingo Molnar · Ingo Molnar · commit ce991095ccdf · 2018-09-10T10:16:22.000+02:00
Signed-off-by: Ingo Molnar &lt;mingo@kernel.org&gt;
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
@@ -678,7 +678,7 @@ jump_label_module_notify(struct notifier_block *self, unsigned long val,
 	case MODULE_STATE_COMING:
 		ret = jump_label_add_module(mod);
 		if (ret) {
-			WARN(1, "Failed to allocatote memory: jump_label may not work properly.\n");
+			WARN(1, "Failed to allocate memory: jump_label may not work properly.\n");
 			jump_label_del_module(mod);
 		}
 		break;
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
@@ -389,7 +389,7 @@ static bool __ww_mutex_wound(struct mutex *lock,
 		/*
 		 * wake_up_process() paired with set_current_state()
 		 * inserts sufficient barriers to make sure @owner either sees
-		 * it's wounded in __ww_mutex_lock_check_stamp() or has a
+		 * it's wounded in __ww_mutex_check_kill() or has a
 		 * wakeup pending to re-read the wounded state.
 		 */
 		if (owner != current)
@@ -946,7 +946,6 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 	}
 
 	debug_mutex_lock_common(lock, &waiter);
-	debug_mutex_add_waiter(lock, &waiter, current);
 
 	lock_contended(&lock->dep_map, ip);
 

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ jump_label_module_notify(struct notifier_block *self, unsigned long val,`
`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;`