Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1:/tmp/cvs-serv20971/init
Modified Files:
main.c
Log Message:
Merge 2.5.8
Index: main.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- main.c 4 Dec 2002 10:48:49 -0000 1.7
+++ main.c 12 Dec 2002 01:47:20 -0000 1.8
@@ -27,6 +27,7 @@
#include <linux/iobuf.h>
#include <linux/bootmem.h>
#include <linux/tty.h>
+#include <linux/percpu.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@ -68,6 +69,7 @@
extern void sysctl_init(void);
extern void signals_init(void);
+extern void radix_tree_init(void);
extern void free_initmem(void);
#ifdef CONFIG_TC
@@ -265,6 +267,10 @@
#ifndef CONFIG_SMP
+static inline void setup_per_cpu_areas(void)
+{
+}
+
#ifdef CONFIG_X86_LOCAL_APIC
static void __init smp_init(void)
{
@@ -274,12 +280,9 @@
#define smp_init() do { } while (0)
#endif
-static inline void setup_per_cpu_areas(void)
-{
-}
#else
-#ifndef __HAVE_ARCH_PER_CPU
+#ifdef __GENERIC_PER_CPU
unsigned long __per_cpu_offset[NR_CPUS];
static void __init setup_per_cpu_areas(void)
@@ -301,7 +304,11 @@
memcpy(ptr, __per_cpu_start, size);
}
}
-#endif /* !__HAVE_ARCH_PER_CPU */
+#else
+static inline void setup_per_cpu_areas(void)
+{
+}
+#endif /* !__GENERIC_PER_CPU */
/* Called by boot processor to activate the rest. */
static void __init smp_init(void)
@@ -394,7 +401,7 @@
proc_caches_init();
vfs_caches_init(mempages);
buffer_init(mempages);
- page_cache_init(mempages);
+ radix_tree_init();
#if defined(CONFIG_ARCH_S390)
ccwcache_init();
#endif
|
