diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 14:25:24 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 14:25:24 -0400 |
| commit | 8592013bbd3858e9427ea2c5fb23a2c983b4dcaa (patch) | |
| tree | a03aaef6ccc3f5bb42d7da2d37f7f81ef3854d95 /drivers/xen | |
| parent | 00e8b2613331042bbe0177e5b9bb5c8a654b14ae (diff) | |
| parent | ed1511b80c92b1b1a8dde567adc090e470a4344a (diff) | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
ACPI / processor: remove pointless variable initialization
ACPI / processor: remove unused function parameter
cpuidle / ACPI : remove power from acpi_processor_cx structure
PM / cpuidle: Make ladder governor use the "disabled" state flag
Honor state disabling in the cpuidle ladder governor
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/xen-acpi-processor.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c index b590ee067fcd..316df65163cf 100644 --- a/drivers/xen/xen-acpi-processor.c +++ b/drivers/xen/xen-acpi-processor.c | |||
| @@ -98,7 +98,6 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr) | |||
| 98 | 98 | ||
| 99 | dst_cx->type = cx->type; | 99 | dst_cx->type = cx->type; |
| 100 | dst_cx->latency = cx->latency; | 100 | dst_cx->latency = cx->latency; |
| 101 | dst_cx->power = cx->power; | ||
| 102 | 101 | ||
| 103 | dst_cx->dpcnt = 0; | 102 | dst_cx->dpcnt = 0; |
| 104 | set_xen_guest_handle(dst_cx->dp, NULL); | 103 | set_xen_guest_handle(dst_cx->dp, NULL); |