diff options
author | AlmuHS <almuhs@github.com> | 2019-10-03 20:09:55 +0200 |
---|---|---|
committer | AlmuHS <almuhs@github.com> | 2019-10-03 20:09:55 +0200 |
commit | d443387bd6e5b5f90f0819dba5d78fa99934762e (patch) | |
tree | 935be7378f86fa853e69a62f17d960369d5c051d | |
parent | d0b1740a736cb5497e4541a7591ac62e2595e2f3 (diff) |
Revert "fix: add shift 24 in apic id"
This reverts commit d0b1740a736cb5497e4541a7591ac62e2595e2f3.
-rw-r--r-- | i386/i386at/acpi_rsdp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/i386/i386at/acpi_rsdp.c b/i386/i386at/acpi_rsdp.c index 6100c840..3341407b 100644 --- a/i386/i386at/acpi_rsdp.c +++ b/i386/i386at/acpi_rsdp.c @@ -224,8 +224,6 @@ acpi_get_rsdt(){ static int acpi_apic_setup(){ - unsigned apic_id; - if(apic == 0) return -1; @@ -264,12 +262,10 @@ acpi_apic_setup(){ //If cpu flag is correct, and the maximum number of CPUs is not reached if((lapic_entry->flags & 0x1) && ncpu < NCPUS){ - apic_id = lapic_entry->apic_id >>24; - //Enumerate CPU and add It to cpu/apic vector - machine_slot[ncpu].apic_id = apic_id; + machine_slot[ncpu].apic_id = lapic_entry->apic_id >>24; machine_slot[ncpu].is_cpu = TRUE; - apic2kernel[apic_id] = ncpu; + apic2kernel[lapic_entry->apic_id >>24] = ncpu; //Increase number of CPU ncpu++; |