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

torvalds · torvalds · commit cd4b5d5d2777 · 2017-11-26T13:36:54.000-08:00
Pull static key fix from Ingo Molnar:
 "Fix a boot warning related to bad init ordering of the static keys
  self-test"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  jump_label: Invoke jump_label_test() via early_initcall()
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
@@ -769,7 +769,7 @@ static __init int jump_label_test(void)
 
 	return 0;
 }
-late_initcall(jump_label_test);
+early_initcall(jump_label_test);
 #endif /* STATIC_KEYS_SELFTEST */
 
 #endif /* HAVE_JUMP_LABEL */

Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ static __init int jump_label_test(void)`
`769`	`769`
`770`	`770`	`return 0;`
`771`	`771`	`}`
`772`		`-late_initcall(jump_label_test);`
	`772`	`+early_initcall(jump_label_test);`
`773`	`773`	`#endif /* STATIC_KEYS_SELFTEST */`
`774`	`774`
`775`	`775`	`#endif /* HAVE_JUMP_LABEL */`