diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exit.c | 4 | ||||
-rw-r--r-- | kernel/signal.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 6e6ec300330f..d1eddc753fe3 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -674,7 +674,7 @@ forget_original_parent(struct task_struct *father, struct list_head *to_release) | |||
674 | do { | 674 | do { |
675 | reaper = next_thread(reaper); | 675 | reaper = next_thread(reaper); |
676 | if (reaper == father) { | 676 | if (reaper == father) { |
677 | reaper = child_reaper(father); | 677 | reaper = task_child_reaper(father); |
678 | break; | 678 | break; |
679 | } | 679 | } |
680 | } while (reaper->exit_state); | 680 | } while (reaper->exit_state); |
@@ -874,7 +874,7 @@ static inline void check_stack_usage(void) {} | |||
874 | 874 | ||
875 | static inline void exit_child_reaper(struct task_struct *tsk) | 875 | static inline void exit_child_reaper(struct task_struct *tsk) |
876 | { | 876 | { |
877 | if (likely(tsk->group_leader != child_reaper(tsk))) | 877 | if (likely(tsk->group_leader != task_child_reaper(tsk))) |
878 | return; | 878 | return; |
879 | 879 | ||
880 | panic("Attempted to kill init!"); | 880 | panic("Attempted to kill init!"); |
diff --git a/kernel/signal.c b/kernel/signal.c index 15c6940ab046..0a6d3726cb80 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -1839,7 +1839,7 @@ relock: | |||
1839 | * within that pid space. It can of course get signals from | 1839 | * within that pid space. It can of course get signals from |
1840 | * its parent pid space. | 1840 | * its parent pid space. |
1841 | */ | 1841 | */ |
1842 | if (current == child_reaper(current)) | 1842 | if (current == task_child_reaper(current)) |
1843 | continue; | 1843 | continue; |
1844 | 1844 | ||
1845 | if (sig_kernel_stop(signr)) { | 1845 | if (sig_kernel_stop(signr)) { |