diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-18 17:33:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-18 17:33:17 -0800 |
commit | 244ff16fb4717708491fa1b3b2a68f9074742d71 (patch) | |
tree | d68d8d37bbe726ccd8e509fdef3c8106b70a10c2 | |
parent | e602e700842104096e96a7deee453183e4ed278a (diff) | |
parent | 25f71d1c3e98ef0e52371746220d66458eac75bc (diff) | |
download | linux-244ff16fb4717708491fa1b3b2a68f9074742d71.tar.bz2 |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fix from Thomas Gleixner:
"Move the futex init function to core initcall so user mode helper does
not run into an uninitialized futex syscall"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Move futex_init() to core_initcall
-rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 0842c8ca534b..cdf365036141 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3323,4 +3323,4 @@ static int __init futex_init(void) return 0; } -__initcall(futex_init); +core_initcall(futex_init); |