i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the patch: on disabled processor entry, next entry pointer wasn't computed,

Browse Source 
leading to an infinite loop...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29224 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2009-02-15 18:43:02 +00:00
parent 3fcbf7dc22
commit 7f0b01654d
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/bios_ia32/smp.cpp
+15 -14
View File
@@ -151,24 +151,25 @@ smp_do_mp_config(mp_floating_struct *floatingStruct)
struct mp_base_processor *processor = (struct mp_base_processor *)pointer; struct mp_base_processor *processor = (struct mp_base_processor *)pointer;
/* skip if the processor is not enabled. */ /* is processor enabled? */
if(!(processor->cpu_flags & 0x1)) if(processor->cpu_flags & 0x1) {
break;
gKernelArgs.arch_args.cpu_apic_id[gKernelArgs.num_cpus] = processor->apic_id;
gKernelArgs.arch_args.cpu_apic_id[gKernelArgs.num_cpus] = processor->apic_id; gKernelArgs.arch_args.cpu_os_id[processor->apic_id] = gKernelArgs.num_cpus;
gKernelArgs.arch_args.cpu_os_id[processor->apic_id] = gKernelArgs.num_cpus; gKernelArgs.arch_args.cpu_apic_version[gKernelArgs.num_cpus] = processor->apic_version;
gKernelArgs.arch_args.cpu_apic_version[gKernelArgs.num_cpus] = processor->apic_version;
#ifdef TRACE_SMP #ifdef TRACE_SMP
const char *cpuFamily[] = { "", "", "", "", "Intel 486", const char *cpuFamily[] = { "", "", "", "", "Intel 486",
"Intel Pentium", "Intel Pentium Pro", "Intel Pentium II" }; "Intel Pentium", "Intel Pentium Pro", "Intel Pentium II" };
#endif #endif
TRACE(("smp: cpu#%ld: %s, apic id %d, version %d%s\n", TRACE(("smp: cpu#%ld: %s, apic id %d, version %d%s\n",
gKernelArgs.num_cpus, cpuFamily[(processor->signature & 0xf00) >> 8], gKernelArgs.num_cpus, cpuFamily[(processor->signature & 0xf00) >> 8],
processor->apic_id, processor->apic_version, (processor->cpu_flags & 0x2) ? processor->apic_id, processor->apic_version, (processor->cpu_flags & 0x2) ?
", BSP" : "")); ", BSP" : ""));
gKernelArgs.num_cpus++; gKernelArgs.num_cpus++;
}
pointer += sizeof(struct mp_base_processor); pointer += sizeof(struct mp_base_processor);
break; break;
} }