diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-26 16:36:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-26 16:36:54 -0500 |
| commit | cd4b5d5d2777e8c167f022b46200f1c8504d1ef6 (patch) | |
| tree | 1627253b867be2bf9ac55c5edb3bc444db9011be | |
| parent | fcbc38b1b296cd38214891fb1fc714d52937d062 (diff) | |
| parent | 92ee46efeb505ead3ab06d3c5ce695637ed5f152 (diff) | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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()
| -rw-r--r-- | kernel/jump_label.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c index 8ff4ca4665ff..8594d24e4adc 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c | |||
| @@ -769,7 +769,7 @@ static __init int jump_label_test(void) | |||
| 769 | 769 | ||
| 770 | return 0; | 770 | return 0; |
| 771 | } | 771 | } |
| 772 | late_initcall(jump_label_test); | 772 | early_initcall(jump_label_test); |
| 773 | #endif /* STATIC_KEYS_SELFTEST */ | 773 | #endif /* STATIC_KEYS_SELFTEST */ |
| 774 | 774 | ||
| 775 | #endif /* HAVE_JUMP_LABEL */ | 775 | #endif /* HAVE_JUMP_LABEL */ |