diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-20 14:23:21 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-20 14:23:21 +0100 |
| commit | ad7eec4244a8c6b53a0d38d6fd674e9d2c92897f (patch) | |
| tree | 1abd598e33f85f049fc07b51132d12370bec965b /arch/x86 | |
| parent | f6cbe34f52dedd67d156b3d5dd76eb43791ea34a (diff) | |
| parent | 37efa4b41ffb31dcdfc3beb97d47992bb2a083e5 (diff) | |
| download | blackbird-op-linux-ad7eec4244a8c6b53a0d38d6fd674e9d2c92897f.tar.gz blackbird-op-linux-ad7eec4244a8c6b53a0d38d6fd674e9d2c92897f.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
CPU / PM: expose pm_qos_resume_latency for CPUs
cpuidle/menu: add per CPU PM QoS resume latency consideration
cpuidle/menu: stop seeking deeper idle if current state is deep enough
ACPI / idle: small formatting fixes
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/acpi/cstate.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index af15f4444330..8233a630280f 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -12,7 +12,6 @@ #include <linux/sched.h> #include <acpi/processor.h> -#include <asm/acpi.h> #include <asm/mwait.h> #include <asm/special_insns.h> @@ -89,7 +88,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx) retval = 0; /* If the HW does not support any sub-states in this C-state */ if (num_cstate_subtype == 0) { - pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", cx->address, edx_part); + pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", + cx->address, edx_part); retval = -1; goto out; } @@ -104,8 +104,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx) if (!mwait_supported[cstate_type]) { mwait_supported[cstate_type] = 1; printk(KERN_DEBUG - "Monitor-Mwait will be used to enter C-%d " - "state\n", cx->type); + "Monitor-Mwait will be used to enter C-%d state\n", + cx->type); } snprintf(cx->desc, ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x", @@ -166,6 +166,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_enter); static int __init ffh_cstate_init(void) { struct cpuinfo_x86 *c = &boot_cpu_data; + if (c->x86_vendor != X86_VENDOR_INTEL) return -1; |
