Nucleus
Barry Send APIC end of interrupt e07c7c5 (3 years, 3 months ago)diff --git a/kernel/acpi/trampoline.S b/kernel/acpi/trampoline.S index 5438967..3230e85 100644 --- a/kernel/acpi/trampoline.S +++ b/kernel/acpi/trampoline.S @@ -23,7 +23,7 @@ ap_trampoline: mov %ax, %sp /* Load the GDT */ - lgdt (ap_gdt_desc - ap_trampoline) + lgdt (apGdtDesc - ap_trampoline) /* Enable PM */ movl %cr0, %eax @@ -44,9 +44,9 @@ ap_pm: movl $0x1000, %ebp movl %ebp, %esp - movl ap_id, %eax + movl apId, %eax incl %eax - movl %eax, ap_id + movl %eax, apId movl $0x1F00, %esi movl (%esi,%eax), %ebx @@ -62,7 +62,7 @@ ap_pm: jmp 1b .align 4 -ap_gdt_start: +apGdtStart: /* Null */ .4byte 0x00000000 .4byte 0x00000000 @@ -72,8 +72,8 @@ ap_gdt_start: /* Data */ .4byte 0x0000FFFF .4byte 0x00CF9200 -ap_gdt_desc: - .2byte ap_gdt_desc - ap_gdt_start - 1 - .4byte (ap_gdt_start - ap_trampoline) + 0x1000 -ap_id: +apGdtDesc: + .2byte apGdtDesc - apGdtStart - 1 + .4byte (apGdtStart - ap_trampoline) + 0x1000 +apId: .4byte 0