diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:29 +0800 |
| commit | 018ed21cf3b7cb618c63294793d63b23ce4afe24 (patch) | |
| tree | 74dbac7cbb2288e8683ea5295cbf1aac42ab41c5 /kernel/futex.c | |
| parent | d661f15677f5205c1d272c2db90b60b2d56b25dd (diff) | |
| parent | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-17.03-android
Diffstat (limited to 'kernel/futex.c')
| -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 2214b70f1910..01ee2e8859c4 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3074,4 +3074,4 @@ static int __init futex_init(void) return 0; } -__initcall(futex_init); +core_initcall(futex_init); |