[Xen-changelog] [xen-unstable] ACPI/cpuidle: remove unused "power" field from Cx state data

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1351869251 -3600
# Node ID 951d0444190858449274b41bcf457d9622d340e9
# Parent  bf249cd5f2c1266875acc9c33c5172d94b77a897
ACPI/cpuidle: remove unused "power" field from Cx state data

It has never been used for anything, and Linux 3.7 doesn't propagate
this information anymore.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
---


diff -r bf249cd5f2c1 -r 951d04441908 xen/arch/x86/acpi/cpu_idle.c
--- a/xen/arch/x86/acpi/cpu_idle.c      Tue Oct 30 18:12:11 2012 +0000
+++ b/xen/arch/x86/acpi/cpu_idle.c      Fri Nov 02 16:14:11 2012 +0100
@@ -935,7 +935,6 @@ static void set_cx(
     }
 
     cx->latency  = xen_cx->latency;
-    cx->power    = xen_cx->power;
     
     cx->target_residency = cx->latency * latency_factor;
     if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 )
diff -r bf249cd5f2c1 -r 951d04441908 xen/arch/x86/cpu/mwait-idle.c
--- a/xen/arch/x86/cpu/mwait-idle.c     Tue Oct 30 18:12:11 2012 +0000
+++ b/xen/arch/x86/cpu/mwait-idle.c     Fri Nov 02 16:14:11 2012 +0100
@@ -96,7 +96,6 @@ static const struct cpuidle_state {
        char            name[16];
        unsigned int    flags;
        unsigned int    exit_latency; /* in US */
-       int             power_usage; /* in mW */
        unsigned int    target_residency; /* in US */
 } *cpuidle_state_table;
 
@@ -479,7 +478,6 @@ static int mwait_idle_cpu_init(struct no
                cx->type = cstate;
                cx->address = get_driver_data(cstate);
                cx->entry_method = ACPI_CSTATE_EM_FFH;
-               cx->power = cpuidle_state_table[cstate].power_usage;
                cx->latency = cpuidle_state_table[cstate].exit_latency;
                cx->target_residency =
                        cpuidle_state_table[cstate].target_residency;
diff -r bf249cd5f2c1 -r 951d04441908 xen/include/xen/cpuidle.h
--- a/xen/include/xen/cpuidle.h Tue Oct 30 18:12:11 2012 +0000
+++ b/xen/include/xen/cpuidle.h Fri Nov 02 16:14:11 2012 +0100
@@ -46,7 +46,6 @@ struct acpi_processor_cx
     u32 address;
     u32 latency;
     u32 target_residency;
-    u32 power;
     u32 usage;
     u64 time;
 };

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog