diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /kern/startup.c | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'kern/startup.c')
| -rw-r--r-- | kern/startup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kern/startup.c b/kern/startup.c index 75a05b0e..0c04ccf8 100644 --- a/kern/startup.c +++ b/kern/startup.c @@ -48,7 +48,6 @@ #include <kern/timer.h> #include <kern/xpr.h> #include <kern/time_stamp.h> -#include <kern/zalloc.h> #include <vm/vm_kern.h> #include <vm/vm_map.h> #include <vm/vm_object.h> @@ -146,10 +145,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; |