From bb850822c6c59cb915ba4457ca6ab33e1e295a85 Mon Sep 17 00:00:00 2001 From: Coywolf Qi Hunt Date: Sat, 16 Apr 2005 15:26:01 -0700 Subject: [PATCH] --- yaml --- r: 151 b: refs/heads/master c: 6c46ada700568897165409e618ed584683838b49 h: refs/heads/master i: 149: db8cc4acb68e2dd1be427eb96d4be7d8d9d8874f 147: a9bf763ff276592d4afa39a31c777c70d89f2c4b 143: 436152c1b1b1103bd8a766bb3c14cc4dc4ff183f v: v3 --- [refs] | 2 +- trunk/arch/i386/mach-voyager/voyager_thread.c | 1 - trunk/include/linux/sched.h | 1 - trunk/kernel/exit.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b49a546fbc90..1110b90ecd98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f4cfacecd522849dac254f87273525eeca33d1d +refs/heads/master: 6c46ada700568897165409e618ed584683838b49 diff --git a/trunk/arch/i386/mach-voyager/voyager_thread.c b/trunk/arch/i386/mach-voyager/voyager_thread.c index 9980eef31fda..a9341b0eebff 100644 --- a/trunk/arch/i386/mach-voyager/voyager_thread.c +++ b/trunk/arch/i386/mach-voyager/voyager_thread.c @@ -126,7 +126,6 @@ thread(void *unused) kvoyagerd_running = 1; - reparent_to_init(); daemonize(THREAD_NAME); set_timeout = 0; diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index a30e91f40da6..1cced971232c 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1021,7 +1021,6 @@ extern void exit_itimers(struct signal_struct *); extern NORET_TYPE void do_group_exit(int); -extern void reparent_to_init(void); extern void daemonize(const char *, ...); extern int allow_signal(int); extern int disallow_signal(int); diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 6dd4ebe1dd90..39d35935b371 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -220,7 +220,7 @@ static inline int has_stopped_jobs(int pgrp) * * NOTE that reparent_to_init() gives the caller full capabilities. */ -void reparent_to_init(void) +static inline void reparent_to_init(void) { write_lock_irq(&tasklist_lock);