Re: [Patch] Compilation error on 2.5.8

[Bongani]

On Tue, 2002-04-16 at 00:45, Robert Love wrote:
> On Mon, 2002-04-15 at 18:53, Bongani wrote:
> > I get the following error when I try to compile 2.5.8
> > init/main.o: In function `start_kernel':
> > init/main.o(.text.init+0x5e2): undefined reference to
> > `setup_per_cpu_areas'
> > 
> > Looking at the code it looks like someone got confused ;)
> > around the ifdefs.I'm  under the assumption that setup_per_cpu_areas()
> > does nothing on a uniprocessor. The patch compile fine on 
> > my PC. 
> 
> A better approach would probably be to define setup_per_cpu_areas to
> nothing when CONFIG_SMP is not set so as not to have #ifdefs in the code
> itself ...  for example,
> 
> diff -urN linux-2.5.8/init/main.c linux/init/main.c
> --- linux-2.5.8/init/main.c	Sun Apr 14 15:18:46 2002
> +++ linux/init/main.c	Mon Apr 15 18:41:54 2002
> @@ -272,6 +272,8 @@
>  #define smp_init()	do { } while (0)
>  #endif
>  
> +#define setup_per_cpu_areas()	do { } while(0)
> +
>  #else
>  
>  #ifdef __GENERIC_PER_CPU
> 

Does this also look cleaner ?

--- init/main.c Tue Apr 16 01:31:29 2002
+++ init/main.c_new     Tue Apr 16 01:30:13 2002
@@ -272,6 +272,8 @@
 #define smp_init()     do { } while (0)
 #endif

+#define setup_per_cpu_areas()  do { } while(0)
+
 #else

 #ifdef __GENERIC_PER_CPU
@@ -297,9 +299,9 @@
        }
 }
 #else
-static inline void setup_per_cpu_areas(void)
-{
-}
+
+#define setup_per_cpu_areas()  do { } while(0)
+
 #endif /* !__GENERIC_PER_CPU */

 /* Called by boot processor to activate the rest. */