[LV-k25-commit] CVS: kernel-2.5/init main.c,1.8,1.9

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1:/tmp/cvs-serv1587/init

Modified Files:
	main.c 
Log Message:
Merge with 2.5.9


Index: main.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- main.c	12 Dec 2002 01:47:20 -0000	1.8
+++ main.c	13 Dec 2002 01:42:43 -0000	1.9
@@ -267,10 +267,6 @@
 
 #ifndef CONFIG_SMP
 
-static inline void setup_per_cpu_areas(void)
-{
-}
-
 #ifdef CONFIG_X86_LOCAL_APIC
 static void __init smp_init(void)
 {
@@ -280,6 +276,8 @@
 #define smp_init()	do { } while (0)
 #endif
 
+static inline void setup_per_cpu_areas(void) { }
+
 #else
 
 #ifdef __GENERIC_PER_CPU
@@ -303,10 +301,6 @@
 		__per_cpu_offset[i] = ptr - __per_cpu_start;
 		memcpy(ptr, __per_cpu_start, size);
 	}
-}
-#else
-static inline void setup_per_cpu_areas(void)
-{
 }
 #endif /* !__GENERIC_PER_CPU */