diff options
author | Richard Braun <rbraun@sceen.net> | 2012-12-05 12:05:36 +0000 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2012-12-05 12:05:36 +0000 |
commit | 3ff73e57ae6b7aaa3ef0e5549821ea359b96f90c (patch) | |
tree | 8ac936a9356a2724cca696d113a099c938c893aa | |
parent | 4133164b09e3c75bd5d6b72ef4661ca92ffd387b (diff) |
Fix kernel task creation time
The mapable_time_init function is called before machine_init, but the
latter sets the system boot time. Fix their calling order.
* kern/startup.c (setup_main): Call machine_init before mapable_time_init.
-rw-r--r-- | kern/startup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kern/startup.c b/kern/startup.c index 3bdda16..6dced43 100644 --- a/kern/startup.c +++ b/kern/startup.c @@ -141,10 +141,10 @@ void setup_main() timestamp_init(); - mapable_time_init(); - machine_init(); + mapable_time_init(); + machine_info.max_cpus = NCPUS; machine_info.memory_size = phys_last_addr - phys_first_addr; /* XXX mem_size */ machine_info.avail_cpus = 0; |