Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision 4bb31f7fb268426f499400dc8b2d9f6c6d3aaf65)
+++ kernel/generic/src/main/main.c	(revision 71eef11b8afe2eec0d0ac48ea6fce51144cb5b0c)
@@ -64,5 +64,4 @@
 #include <align.h>
 #include <interrupt.h>
-#include <arch/mm/memory_init.h>
 #include <mm/frame.h>
 #include <mm/page.h>
@@ -144,6 +143,4 @@
 	
 	config.base = hardcoded_load_address;
-	config.memory_size = get_memory_size();
-	
 	config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
 	    hardcoded_kdata_size, PAGE_SIZE);
@@ -220,20 +217,20 @@
 	ddi_init();
 	arch_post_mm_init();
-
+	
 	version_print();
-	printf("kernel: %.*p hardcoded_ktext_size=%zdK, "
-	    "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
-	    config.base, hardcoded_ktext_size >> 10,
-	    hardcoded_kdata_size >> 10);
-	printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2,
-	    config.stack_base, config.stack_size >> 10);
-
+	printf("kernel: %.*p hardcoded_ktext_size=%zd KB, "
+	    "hardcoded_kdata_size=%zd KB\n", sizeof(uintptr_t) * 2,
+		config.base, SIZE2KB(hardcoded_ktext_size),
+		SIZE2KB(hardcoded_kdata_size));
+	printf("stack:  %.*p size=%zd KB\n", sizeof(uintptr_t) * 2,
+	    config.stack_base, SIZE2KB(config.stack_size));
+	
 	arch_pre_smp_init();
 	smp_init();
 	/* Slab must be initialized after we know the number of processors. */
 	slab_enable_cpucache();
-
-	printf("config.memory_size=%zdM\n", config.memory_size >> 20);
-	printf("config.cpu_count=%zd\n", config.cpu_count);
+	
+	printf("Detected %zu CPU(s), %llu MB free memory\n",
+		config.cpu_count, SIZE2MB(zone_total_size()));
 	cpu_init();