From e09f024029d29428b5f397a465bb69d3c0b55641 Mon Sep 17 00:00:00 2001 From: Zhao Yakui Date: Tue, 17 Jun 2008 14:39:59 +0800 Subject: [PATCH] --- yaml --- r: 102027 b: refs/heads/master c: 5b53496a5ad79e91052f72761a7c5516b069bc99 h: refs/heads/master i: 102025: cc0d8460e24dcd75a2927aac8b1ba5be2fbc9701 102023: 7af3ebc0c434abe13d3c4ce199cd03663ca17e43 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/acpi/processor.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 889665387822..ac769e2ca700 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71b58cbb0c30d1f78636a48c4721529449d6ea37 +refs/heads/master: 5b53496a5ad79e91052f72761a7c5516b069bc99 diff --git a/trunk/arch/x86/kernel/acpi/processor.c b/trunk/arch/x86/kernel/acpi/processor.c index de2d2e4ebad9..7c074eec39fb 100644 --- a/trunk/arch/x86/kernel/acpi/processor.c +++ b/trunk/arch/x86/kernel/acpi/processor.c @@ -56,6 +56,12 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c) if (cpu_has(c, X86_FEATURE_ACPI)) buf[2] |= ACPI_PDC_T_FFH; + /* + * If mwait/monitor is unsupported, C2/C3_FFH will be disabled + */ + if (!cpu_has(c, X86_FEATURE_MWAIT)) + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); + obj->type = ACPI_TYPE_BUFFER; obj->buffer.length = 12; obj->buffer.pointer = (u8 *) buf;