patch-2.1.126 linux/init/main.c

• Lines: 38
• Date: Tue Oct 20 22:21:26 1998
• Orig file: v2.1.125/linux/init/main.c
• Orig date: Fri Oct 9 13:27:16 1998

diff -u --recursive --new-file v2.1.125/linux/init/main.c linux/init/main.c
@@ -302,9 +302,8 @@
 #ifdef CONFIG_SOUNDMODEM
 extern void sm_setup(char *str, int *ints);
 #endif
-#ifdef CONFIG_PMAC_CONSOLE
-extern void pmac_cons_setup(char *str, int *ints);
-extern void pmac_vmode_setup(char *str, int *ints);
+#ifdef CONFIG_ADBMOUSE
+extern void adb_mouse_setup(char *str, int *ints);
 #endif
 #ifdef CONFIG_WDT
 extern void wdt_setup(char *str, int *ints);
@@ -1195,6 +1194,8 @@
 }
 #endif
 
+struct task_struct *child_reaper = &init_task;
+
 /*
  * Ok, the machine is now initialized. None of the devices
  * have been touched yet, but the CPU subsystem is up and
@@ -1207,6 +1208,16 @@
 #ifdef CONFIG_BLK_DEV_INITRD
 	int real_root_mountflags;
 #endif
+
+	/*
+	 * Tell the world that we're going to be the grim
+	 * reaper of innocent orphaned children.
+	 *
+	 * We don't want people to have to make incorrect
+	 * assumptions about where in the task array this
+	 * can be found.
+	 */
+	child_reaper = current;
 
 #if defined(CONFIG_MTRR)	/* Do this after SMP initialization */
 /*