diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-12-23 23:47:35 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-12-23 23:47:35 +0100 |
| commit | 769b0946b81a11ea495d94cdf6768837a3602998 (patch) | |
| tree | c35511c9ca8311fc291cd3fb523fc5e7ae9321ee /kern/startup.c | |
| parent | 4133b7f7992a38b19d5bfe47591e932e92d958e8 (diff) | |
| parent | db8ec819c3863040aceae97ab35ef5c6ef3c898f (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/gnumach
Diffstat (limited to 'kern/startup.c')
| -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; |