patch-2.1.38 linux/init/main.c

Next file: linux/kernel/fork.c
Previous file: linux/include/net/ip.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.37/linux/init/main.c linux/init/main.c
@@ -66,7 +66,6 @@
 extern void init_IRQ(void);
 extern void init_modules(void);
 extern long console_init(long, long);
-extern long kmalloc_init(long,long);
 extern void sock_init(void);
 extern void uidcache_init(void);
 extern unsigned long pci_init(unsigned long, unsigned long);
@@ -872,7 +871,6 @@
 #ifdef CONFIG_MCA
 	memory_start = mca_init(memory_start,memory_end);
 #endif
-	memory_start = kmalloc_init(memory_start,memory_end);
 	memory_start = kmem_cache_init(memory_start, memory_end);
 	sti();
 	calibrate_delay();
@@ -885,10 +883,10 @@
 	}
 #endif
 	mem_init(memory_start,memory_end);
+	kmem_cache_sizes_init();
 #ifdef CONFIG_PROC_FS
 	proc_root_init();
 #endif
-	kmem_cache_sizes_init();
 	uidcache_init();
 	vma_init();
 	buffer_init();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov