patch-1.3.51 linux/init/main.c

• Lines: 68
• Date: Wed Dec 27 08:33:51 1995
• Orig file: v1.3.50/linux/init/main.c
• Orig date: Tue Dec 26 04:45:41 1995

diff -u --recursive --new-file v1.3.50/linux/init/main.c linux/init/main.c
@@ -488,9 +488,29 @@
 	envp_init[envs+1] = NULL;
 }
 
+
 extern void setup_arch(char **, unsigned long *, unsigned long *);
 
-#ifdef __SMP__
+#ifndef __SMP__
+
+/*
+ *	Uniprocessor idle thread
+ */
+ 
+int cpu_idle(void *unused)
+{
+	for(;;)
+		idle();
+}
+
+#else
+
+/*
+ *	Multiprocessor idle thread is in arch/...
+ */
+ 
+extern int cpu_idle(void * unused);
+
 /*
  *	Activate a secondary processor.
  */
@@ -500,15 +520,10 @@
 	trap_init();
 	init_IRQ();
 	smp_callin();
-	for(;;)
-		idle();
+	cpu_idle(NULL);
 }
 
-int smp_idle(void * unused)
-{
-	for (;;)
-		idle();
-}
+
 
 /*
  *	Called by CPU#0 to activate the rest.
@@ -525,7 +540,7 @@
 
 	for(i=1;i<smp_num_cpus;i++)
 	{
-		kernel_thread(smp_idle, NULL, CLONE_PID);
+		kernel_thread(cpu_idle, NULL, CLONE_PID);
 		/*
 		 *	Assume linear processor numbering
 		 */
@@ -633,8 +648,7 @@
  *
  * Right now task[0] just does a infinite idle loop.
  */
-	for(;;)
-		idle();
+ 	cpu_idle(NULL);
 }
 
 static int printf(const char *fmt, ...)