diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:27:07 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:27:07 -0700 |
| commit | 0ed41f1a9564c0733ad155b742ac66fb41d2f9d3 (patch) | |
| tree | fb32ef8d494ee1952b99a65f876a9e28da004a1b /drivers/gator/gator_trace_power.c | |
| parent | a3d64deb4ee72f27441dd5363d74c294b7dd34a7 (diff) | |
| parent | b93dcce48cc6182fcf66cb6d72665b10c775f4c3 (diff) | |
Merge branch 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel into v3.10/topic/gatorv3.10/topic/gator
* 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel:
gator: Enable multiple source copies to exist in Android build environments
gator: Add config for building the module in-tree
gator: Version 5.21.1
Diffstat (limited to 'drivers/gator/gator_trace_power.c')
| -rw-r--r-- | drivers/gator/gator_trace_power.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gator/gator_trace_power.c b/drivers/gator/gator_trace_power.c index 46e04b29a187..aaa8f8636c83 100644 --- a/drivers/gator/gator_trace_power.c +++ b/drivers/gator/gator_trace_power.c @@ -1,5 +1,5 @@ /** - * Copyright (C) ARM Limited 2011-2014. All rights reserved. + * Copyright (C) ARM Limited 2011-2015. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -80,13 +80,7 @@ GATOR_DEFINE_PROBE(cpu_idle, TP_PROTO(unsigned int state, unsigned int cpu)) return; if (implements_wfi()) { - if (state == PWR_EVENT_EXIT) { - /* transition from wfi to non-wfi */ - marshal_idle(cpu, MESSAGE_IDLE_EXIT); - } else { - /* transition from non-wfi to wfi */ - marshal_idle(cpu, MESSAGE_IDLE_ENTER); - } + marshal_idle(cpu, state); } per_cpu(idle_prev_state, cpu) = state; |