aboutsummaryrefslogtreecommitdiff
path: root/arch/i386/kernel/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 21:39:25 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 21:39:25 -0400
commitd42510a0f58c2583c37c8e9b7548e3a68545863a (patch)
tree9d44b95405b9f0083e911a66cc5512860293f95a /arch/i386/kernel/acpi
parent8f2ddb37e564a9616c05fa0d5652e0049072a730 (diff)
parent193de0c79da580eb33a66113b62e2378fc1fb629 (diff)
Pull bugzilla-5737 into release branch
Conflicts: arch/x86_64/kernel/acpi/processor.c
Diffstat (limited to 'arch/i386/kernel/acpi')
-rw-r--r--arch/i386/kernel/acpi/processor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/processor.c b/arch/i386/kernel/acpi/processor.c
index 9f4cc02717e..b54fded4983 100644
--- 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;