aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/init_task.h2
-rw-r--r--include/linux/sched.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 7996fc2c9ba..0551e0dcb71 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -16,7 +16,7 @@ extern struct files_struct init_files;
16extern struct fs_struct init_fs; 16extern struct fs_struct init_fs;
17 17
18#define INIT_SIGNALS(sig) { \ 18#define INIT_SIGNALS(sig) { \
19 .count = ATOMIC_INIT(1), \ 19 .nr_threads = 1, \
20 .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\ 20 .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
21 .shared_pending = { \ 21 .shared_pending = { \
22 .list = LIST_HEAD_INIT(sig.shared_pending.list), \ 22 .list = LIST_HEAD_INIT(sig.shared_pending.list), \
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ccd2d150072..f118809c953 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -527,8 +527,8 @@ struct thread_group_cputimer {
527 */ 527 */
528struct signal_struct { 528struct signal_struct {
529 atomic_t sigcnt; 529 atomic_t sigcnt;
530 atomic_t count;
531 atomic_t live; 530 atomic_t live;
531 int nr_threads;
532 532
533 wait_queue_head_t wait_chldexit; /* for wait4() */ 533 wait_queue_head_t wait_chldexit; /* for wait4() */
534 534
@@ -2149,7 +2149,7 @@ extern bool current_is_single_threaded(void);
2149 2149
2150static inline int get_nr_threads(struct task_struct *tsk) 2150static inline int get_nr_threads(struct task_struct *tsk)
2151{ 2151{
2152 return atomic_read(&tsk->signal->count); 2152 return tsk->signal->nr_threads;
2153} 2153}
2154 2154
2155/* de_thread depends on thread_group_leader not being a pid based check */ 2155/* de_thread depends on thread_group_leader not being a pid based check */