Re: [PATCH] setup_per_cpu_areas in 2.5.8pre3

[Tom Rini]

On Wed, Apr 17, 2002 at 10:24:29AM +0200, [e-mail] wrote:
 
> #ifdef's are evil. You have one, and there are two possible sources.
> Easy and readable. You have two, and there are four. Already a small
> effort to check that indeed all four combinations are OK. That was
> what went wrong in the setup_per_cpu_areas case. You have three and
> it is almost certain that someone forgets to check all possible
> eight cases.

How does the following patch look ?  It's alot longer than the rest but
imho it makes things readable as well.

-- 
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

===== init/main.c 1.40 vs edited =====
--- 1.40/init/main.c	Tue Apr  9 13:35:31 2002
+++ edited/init/main.c	Mon Apr 15 08:56:20 2002
@@ -261,20 +261,7 @@
 extern void setup_arch(char **);
 extern void cpu_idle(void);
 
-#ifndef CONFIG_SMP
-
-#ifdef CONFIG_X86_LOCAL_APIC
-static void __init smp_init(void)
-{
-	APIC_init_uniprocessor();
-}
-#else
-#define smp_init()	do { } while (0)
-#endif
-
-#else
-
-#ifdef __GENERIC_PER_CPU
+#if defined(CONFIG_SMP) && defined(__GENERIC_PER_CPU)
 unsigned long __per_cpu_offset[NR_CPUS];
 
 static void __init setup_per_cpu_areas(void)
@@ -300,8 +287,9 @@
 static inline void setup_per_cpu_areas(void)
 {
 }
-#endif /* !__GENERIC_PER_CPU */
+#endif
 
+#ifdef CONFIG_SMP
 /* Called by boot processor to activate the rest. */
 static void __init smp_init(void)
 {
@@ -311,7 +299,15 @@
 	smp_threads_ready=1;
 	smp_commence();
 }
-
+#else
+#ifdef CONFIG_X86_LOCAL_APIC
+static void __init smp_init(void)
+{
+	APIC_init_uniprocessor();
+}
+#else
+#define smp_init()	do { } while (0)
+#endif
 #endif
 
 /*