diff options
-rw-r--r-- | arch/i386/mach-voyager/voyager_thread.c | 1 | ||||
-rw-r--r-- | include/linux/sched.h | 1 | ||||
-rw-r--r-- | kernel/exit.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/i386/mach-voyager/voyager_thread.c index 9980eef31fda..a9341b0eebff 100644 --- a/arch/i386/mach-voyager/voyager_thread.c +++ b/arch/i386/mach-voyager/voyager_thread.c | |||
@@ -126,7 +126,6 @@ thread(void *unused) | |||
126 | 126 | ||
127 | kvoyagerd_running = 1; | 127 | kvoyagerd_running = 1; |
128 | 128 | ||
129 | reparent_to_init(); | ||
130 | daemonize(THREAD_NAME); | 129 | daemonize(THREAD_NAME); |
131 | 130 | ||
132 | set_timeout = 0; | 131 | set_timeout = 0; |
diff --git a/include/linux/sched.h b/include/linux/sched.h index a30e91f40da6..1cced971232c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1021,7 +1021,6 @@ extern void exit_itimers(struct signal_struct *); | |||
1021 | 1021 | ||
1022 | extern NORET_TYPE void do_group_exit(int); | 1022 | extern NORET_TYPE void do_group_exit(int); |
1023 | 1023 | ||
1024 | extern void reparent_to_init(void); | ||
1025 | extern void daemonize(const char *, ...); | 1024 | extern void daemonize(const char *, ...); |
1026 | extern int allow_signal(int); | 1025 | extern int allow_signal(int); |
1027 | extern int disallow_signal(int); | 1026 | extern int disallow_signal(int); |
diff --git a/kernel/exit.c b/kernel/exit.c index 6dd4ebe1dd90..39d35935b371 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -220,7 +220,7 @@ static inline int has_stopped_jobs(int pgrp) | |||
220 | * | 220 | * |
221 | * NOTE that reparent_to_init() gives the caller full capabilities. | 221 | * NOTE that reparent_to_init() gives the caller full capabilities. |
222 | */ | 222 | */ |
223 | void reparent_to_init(void) | 223 | static inline void reparent_to_init(void) |
224 | { | 224 | { |
225 | write_lock_irq(&tasklist_lock); | 225 | write_lock_irq(&tasklist_lock); |
226 | 226 | ||