diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-19 13:37:14 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-19 13:37:18 +1100 |
commit | 7e0356ffcf9e6c77586fae95aaa32001ebdfc1fb (patch) | |
tree | 0c299cea6d831841e5bd196c88069c47a78bdde5 /init | |
parent | f58a9fb8cb93798bf1011e5fb498e7225ed30a4f (diff) | |
parent | 7bb209768006742215ce024e9cce2e0b4c2d0e83 (diff) |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'init')
-rw-r--r-- | init/init_task.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/init_task.c b/init/init_task.c index 39c3109acc1a..9d2d1dafdaa0 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -44,7 +44,7 @@ static struct signal_struct init_signals = { }; static struct sighand_struct init_sighand = { - .count = ATOMIC_INIT(1), + .count = REFCOUNT_INIT(1), .action = { { { .sa_handler = SIG_DFL, } }, }, .siglock = __SPIN_LOCK_UNLOCKED(init_sighand.siglock), .signalfd_wqh = __WAIT_QUEUE_HEAD_INITIALIZER(init_sighand.signalfd_wqh), @@ -61,11 +61,11 @@ struct task_struct init_task = { #ifdef CONFIG_THREAD_INFO_IN_TASK .thread_info = INIT_THREAD_INFO(init_task), - .stack_refcount = ATOMIC_INIT(1), + .stack_refcount = REFCOUNT_INIT(1), #endif .state = 0, .stack = init_stack, - .usage = ATOMIC_INIT(2), + .usage = REFCOUNT_INIT(2), .flags = PF_KTHREAD, .prio = MAX_PRIO - 20, .static_prio = MAX_PRIO - 20, |