diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-09-09 19:03:50 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-09-09 19:03:50 +0200 |
| commit | 037df91d94a0abf5f5da8d629610cb219943dd6f (patch) | |
| tree | 1b0ce35d322868858aa8db29424ecb241fb512b5 /kernel/kernel.c | |
| parent | 732903c53df8837e65b940abba5e53437bd37443 (diff) | |
Re-enabled smp
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 8e8de0c..04eaa50 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -28,11 +28,10 @@ void kernel_ap() while(1) { cpu_counter[p]++; -/* + lock_spin(0); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"cpu[%d] %d",p,cpu_counter[p]); + if(cpu_counter[p]%1000000==0)log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"cpu[%d] %d",p,cpu_counter[p]); lock_release(0); -*/ } } @@ -151,11 +150,10 @@ void kernel_main(uint32_t initial_stack, int mp) // - // Start the other Processors (also before paging !) + // Start the other Processors (also before paging for some reason!) // smp_log_procdata(&procdata); - -// smp_start_aps(&procdata,0x80000); // starts at 0x90000 + smp_start_aps(&procdata,0x80000); // starts at 0x80000 // but it will be copied over mbr @@ -198,7 +196,7 @@ void kernel_main(uint32_t initial_stack, int mp) // For now this starts three "tasks" which are scheduled // round robin style. // - //task_init(); + task_init(); // |