diff options
| author | AlmuHS <almuhs@github.com> | 2019-04-17 21:08:42 +0200 |
|---|---|---|
| committer | AlmuHS <almuhs@github.com> | 2019-04-17 21:08:42 +0200 |
| commit | e4ad97606736ae581acf7b1c61af7f1ad47b6bf5 (patch) | |
| tree | 29557e64bd25133a3eff83c816e35b5666ef16c3 /kern | |
| parent | 1ceb8aac3de51f96a18f836c58ee9ae45dbc2947 (diff) | |
recover *lapic in cpu_number()
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/cpu_number.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kern/cpu_number.c b/kern/cpu_number.c index 18889cbd..448de2b1 100644 --- a/kern/cpu_number.c +++ b/kern/cpu_number.c @@ -2,19 +2,15 @@ #include <i386at/acpi_rsdp.h> #include <imps/apic.h> #include <mach/machine.h> -#include <i386/vm_param.h> //phystokv unsigned int master_cpu = 0; /* 'master' processor - keeps time */ -extern int lapic_addr; - int cpu_number() { if(ncpu == 1) return 0; else{ - //unsigned apic_id = lapic->apic_id.r >>24; - unsigned apic_id = (((ApicLocalUnit*)phystokv(lapic_addr))->apic_id.r >> 24) & 0xff; + unsigned apic_id = lapic->apic_id.r >>24; return apic2kernel[apic_id]; |