From 0dee04f16b0d100848323b732d7b2d60ef3eac0e Mon Sep 17 00:00:00 2001 From: NAKAMURA Gou Date: Wed, 18 Feb 2015 20:39:10 +0900 Subject: [PATCH] move parse_args() to after arch_init() In attached-mic, bootparam is not mapped until arch_init() is finished. In builtin-mic and builtin-x86, virtual address of bootparam is changed in arch_init(). --- kernel/init.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/init.c b/kernel/init.c index 56848a97..6339c2b0 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -253,10 +253,16 @@ int main(void) kputs("MCK started.\n"); - parse_kargs(); - arch_init(); + /* + * In attached-mic, + * bootparam is not mapped until arch_init() is finished. + * In builtin-mic and builtin-x86, + * virtual address of bootparam is changed in arch_init(). + */ + parse_kargs(); + mem_init(); rest_init();