[Xen-changelog] [xen stable-4.3] x86/cpuidle: don't count C1 multiple times

[patchbot@xxxxxxx]

commit b87e1b0d057678e989a0c1f2a0f41fc970d1c28d
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Dec 10 12:38:53 2014 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Dec 10 12:38:53 2014 +0100

    x86/cpuidle: don't count C1 multiple times
    
    Commit 4ca6f9f0 ("x86/cpuidle: publish new states only after fully
    initializing them") resulted in the state counter to be incremented
    for C1 despite that using a fixed table entry (and the statically
    initialized counter value already accounting for it and C0).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    master commit: 0aabd10525326edfe5098c2ec5bfe05db7732c32
    master date: 2014-11-25 10:05:29 +0100
---
 xen/arch/x86/acpi/cpu_idle.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index d3fd793..274ea00 100644
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -948,7 +948,7 @@ static void set_cx(
     cx->target_residency = cx->latency * latency_factor;
 
     smp_wmb();
-    acpi_power->count++;
+    acpi_power->count += (cx->type != ACPI_STATE_C1);
     if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 )
         acpi_power->safe_state = cx;
 }
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.3

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