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);