mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-29 13:48:21 +00:00
kernel: fix remaining _cpu() races
This commit is contained in:
@@ -116,7 +116,7 @@ time_t arch_hpet_init() {
|
||||
if (capabilities & HPET_CAP_LEGACYCAPABLE) {
|
||||
type = TYPE_LEGACY;
|
||||
|
||||
arch_ioapic_setirq(0, isr->id & 0xff, _cpu()->id, false);
|
||||
arch_ioapic_setirq(0, isr->id & 0xff, current_cpu_id(), false);
|
||||
|
||||
selectedtimer = 0;
|
||||
timerconfig = read64(HPET_TIMER_CONFIG(selectedtimer));
|
||||
|
||||
@@ -154,7 +154,7 @@ static void kbdisr(isr_t *isr, context_t *ctx) {
|
||||
void ps2kbd_init() {
|
||||
isr_t *isr = interrupt_allocate(kbdisr, arch_apic_eoi, IPL_KEYBOARD);
|
||||
__assert(isr);
|
||||
arch_ioapic_setirq(KEYBOARDIRQ, isr->id & 0xff, _cpu()->id, false);
|
||||
arch_ioapic_setirq(KEYBOARDIRQ, isr->id & 0xff, current_cpu_id(), false);
|
||||
kb = keyboard_new();
|
||||
__assert(kb);
|
||||
printf("ps2kbd: irq enabled with vector %u\n", isr->id & 0xff);
|
||||
|
||||
@@ -111,7 +111,7 @@ void ps2mouse_init() {
|
||||
|
||||
isr_t *isr = interrupt_allocate(mouseisr, arch_apic_eoi, IPL_MOUSE);
|
||||
__assert(isr);
|
||||
arch_ioapic_setirq(PS2_MOUSEIRQ, isr->id & 0xff, _cpu()->id, false);
|
||||
arch_ioapic_setirq(PS2_MOUSEIRQ, isr->id & 0xff, current_cpu_id(), false);
|
||||
mouse = mouse_new();
|
||||
__assert(mouse);
|
||||
printf("ps2mouse: irq enabled with vector %u\n", isr->id & 0xff);
|
||||
|
||||
Reference in New Issue
Block a user