Pull bugzilla-5737 into release branch

Conflicts: arch/x86_64/kernel/acpi/processor.c
git-mirror · Jun 16, 2006 · d42510a · d42510a
2 parents 8f2ddb3 + 193de0c
commit d42510a
Show file tree

Hide file tree

Showing 7 changed files with 645 additions and 156 deletions.
diff --git a/arch/i386/kernel/acpi/processor.c b/arch/i386/kernel/acpi/processor.c
@@ -47,7 +47,7 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
 	buf[2] = ACPI_PDC_C_CAPABILITY_SMP;
 
 	if (cpu_has(c, X86_FEATURE_EST))
-		buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
+		buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP;
 
 	obj->type = ACPI_TYPE_BUFFER;
 	obj->buffer.length = 12;