diff options
author | Peter Zijlstra | 2013-12-12 15:08:36 +0100 |
---|---|---|
committer | H. Peter Anvin | 2013-12-19 20:54:44 +0100 |
commit | 16824255394f55adf31b9a96a9965d8c15bdac4c (patch) | |
tree | b28f4a2d59db25700c8b4eafb2e3cfc188c121bc /drivers/acpi/acpi_pad.c | |
parent | x86 idle: Repair large-server 50-watt idle-power regression (diff) | |
download | kernel-qcow2-linux-16824255394f55adf31b9a96a9965d8c15bdac4c.tar.gz kernel-qcow2-linux-16824255394f55adf31b9a96a9965d8c15bdac4c.tar.xz kernel-qcow2-linux-16824255394f55adf31b9a96a9965d8c15bdac4c.zip |
x86, acpi, idle: Restructure the mwait idle routines
People seem to delight in writing wrong and broken mwait idle routines;
collapse the lot.
This leaves mwait_play_dead() the sole remaining user of __mwait() and
new __mwait() users are probably doing it wrong.
Also remove __sti_mwait() as its unused.
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Jacob Jun Pan <jacob.jun.pan@linux.intel.com>
Cc: Mike Galbraith <bitbucket@online.de>
Cc: Len Brown <lenb@kernel.org>
Cc: Rui Zhang <rui.zhang@intel.com>
Acked-by: Rafael Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131212141654.616820819@infradead.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/acpi/acpi_pad.c')
-rw-r--r-- | drivers/acpi/acpi_pad.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index fc6008fbce35..509452a62f96 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c @@ -193,10 +193,7 @@ static int power_saving_thread(void *data) CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu); stop_critical_timings(); - __monitor((void *)¤t_thread_info()->flags, 0, 0); - smp_mb(); - if (!need_resched()) - __mwait(power_saving_mwait_eax, 1); + mwait_idle_with_hints(power_saving_mwait_eax, 1); start_critical_timings(); if (lapic_marked_unstable) |