summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2014-05-14 20:27:44 +0200
committerRichard Braun <rbraun@sceen.net>2014-05-14 20:27:44 +0200
commit44602296bde615ac733f15e9f9f91d820b10e2d1 (patch)
tree7e00965e931921a5cba8016cddbc18bfbed694cc
parent8d7c92193b3f887c3ebe3d844786a2c435edbec3 (diff)
Print vm_page info at the end of kernel bootstrap
-rw-r--r--arch/x86/machine/boot.c2
-rw-r--r--kern/kernel.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c
index afa4edce..0e98efaf 100644
--- a/arch/x86/machine/boot.c
+++ b/arch/x86/machine/boot.c
@@ -65,7 +65,6 @@
#include <machine/strace.h>
#include <machine/trap.h>
#include <vm/vm_kmem.h>
-#include <vm/vm_page.h>
#include <vm/vm_setup.h>
char boot_stacks[MAX_CPUS][BOOT_STACK_SIZE] __aligned(DATA_ALIGN) __initdata;
@@ -280,7 +279,6 @@ boot_main(void)
vm_setup();
boot_save_data();
biosmem_free_usable();
- vm_page_info();
pic_setup();
pit_setup();
cpu_mp_probe();
diff --git a/kern/kernel.c b/kern/kernel.c
index 62d75b52..658c18d1 100644
--- a/kern/kernel.c
+++ b/kern/kernel.c
@@ -25,6 +25,7 @@
#include <kern/thread.h>
#include <kern/work.h>
#include <machine/cpu.h>
+#include <vm/vm_page.h>
void __init
kernel_main(void)
@@ -53,6 +54,8 @@ kernel_main(void)
*/
cpu_mp_setup();
+ vm_page_info();
+
thread_run_scheduler();
/* Never reached */