diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exit.c | 2 | ||||
-rw-r--r-- | kernel/sched.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 9dd5f1336da2..2e4c13cba95a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -955,7 +955,7 @@ fastcall NORET_TYPE void do_exit(long code) | |||
955 | 955 | ||
956 | preempt_disable(); | 956 | preempt_disable(); |
957 | /* causes final put_task_struct in finish_task_switch(). */ | 957 | /* causes final put_task_struct in finish_task_switch(). */ |
958 | tsk->state = EXIT_DEAD; | 958 | tsk->state = TASK_DEAD; |
959 | 959 | ||
960 | schedule(); | 960 | schedule(); |
961 | BUG(); | 961 | BUG(); |
diff --git a/kernel/sched.c b/kernel/sched.c index a9405d7cc6ab..74f169ac0773 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -1761,10 +1761,10 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev) | |||
1761 | 1761 | ||
1762 | /* | 1762 | /* |
1763 | * A task struct has one reference for the use as "current". | 1763 | * A task struct has one reference for the use as "current". |
1764 | * If a task dies, then it sets EXIT_DEAD in tsk->state and calls | 1764 | * If a task dies, then it sets TASK_DEAD in tsk->state and calls |
1765 | * schedule one last time. The schedule call will never return, and | 1765 | * schedule one last time. The schedule call will never return, and |
1766 | * the scheduled task must drop that reference. | 1766 | * the scheduled task must drop that reference. |
1767 | * The test for EXIT_DEAD must occur while the runqueue locks are | 1767 | * The test for TASK_DEAD must occur while the runqueue locks are |
1768 | * still held, otherwise prev could be scheduled on another cpu, die | 1768 | * still held, otherwise prev could be scheduled on another cpu, die |
1769 | * there before we look at prev->state, and then the reference would | 1769 | * there before we look at prev->state, and then the reference would |
1770 | * be dropped twice. | 1770 | * be dropped twice. |
@@ -1775,7 +1775,7 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev) | |||
1775 | finish_lock_switch(rq, prev); | 1775 | finish_lock_switch(rq, prev); |
1776 | if (mm) | 1776 | if (mm) |
1777 | mmdrop(mm); | 1777 | mmdrop(mm); |
1778 | if (unlikely(prev_state == EXIT_DEAD)) { | 1778 | if (unlikely(prev_state == TASK_DEAD)) { |
1779 | /* | 1779 | /* |
1780 | * Remove function-return probe instances associated with this | 1780 | * Remove function-return probe instances associated with this |
1781 | * task and put them back on the free list. | 1781 | * task and put them back on the free list. |
@@ -5153,7 +5153,7 @@ static void migrate_dead(unsigned int dead_cpu, struct task_struct *p) | |||
5153 | BUG_ON(p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD); | 5153 | BUG_ON(p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD); |
5154 | 5154 | ||
5155 | /* Cannot have done final schedule yet: would have vanished. */ | 5155 | /* Cannot have done final schedule yet: would have vanished. */ |
5156 | BUG_ON(p->state == EXIT_DEAD); | 5156 | BUG_ON(p->state == TASK_DEAD); |
5157 | 5157 | ||
5158 | get_task_struct(p); | 5158 | get_task_struct(p); |
5159 | 5159 | ||