stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove bug by searching lapci on a 64bit system

Browse source
This commit is contained in:
Stefan Lankes 2012-07-10 22:43:02 +02:00
parent 32aee76655
commit 764134bd18
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/x86/kernel/apic.c
View file

@ -738,11 +738,21 @@ check_lapic:
lapic = 0xFEE00000; lapic = 0xFEE00000;
} }
#else #else
if (apic_config->lapic == 0xFEE00000) { if (apic_config) {
// On a x64 system, we already map the lapic below the kernel if (apic_config->lapic == 0xFEE00000) {
lapic = (size_t)&kernel_start - 0x1000; // On a x64 system, we already map the lapic below the kernel
lapic = (size_t)&kernel_start - 0x1000;
} else {
lapic = apic_config->lapic;
}
} else { } else {
lapic = apic_config->lapic; uint32_t edx, dummy=0;
cpuid(0x1, &dummy, &dummy, &dummy, &edx);
if (edx & (1 << 9)) {
// On a x64 system, we already map the lapic below the kernel
lapic = (size_t)&kernel_start - 0x1000;
}
} }
#endif #endif