aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDeepthi Dharwar <deepthi@linux.vnet.ibm.com>2011-10-28 06:50:24 -0400
committerLen Brown <len.brown@intel.com>2011-11-06 21:13:43 -0500
commitb25edc42bfb9602f0503474b2c94701d5536ce60 (patch)
tree5d3b8634606daa99fe5dc86ade108400ecf3a5fd /include/linux
parente978aa7d7d57d04eb5f88a7507c4fb98577def77 (diff)
cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
The cpuidle_device->prepare() mechanism causes updates to the cpuidle_state[].flags, setting and clearing CPUIDLE_FLAG_IGNORE to tell the governor not to chose a state on a per-cpu basis at run-time. State demotion is now handled by the driver and it returns the actual state entered. Hence, this mechanism is not required. Also this removes per-cpu flags from cpuidle_state enabling it to be made global. Reference: https://lkml.org/lkml/2011/3/25/52 Signed-off-by: Deepthi Dharwar <deepthi@linux.vnet.ibm> Signed-off-by: Trinabh Gupta <g.trinabh@gmail.com> Tested-by: Jean Pihet <j-pihet@ti.com> Acked-by: Arjan van de Ven <arjan@linux.intel.com> Reviewed-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/cpuidle.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 8da811bcdbdb..c6d85cf90eb2 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -47,7 +47,6 @@ struct cpuidle_state {
47 47
48/* Idle State Flags */ 48/* Idle State Flags */
49#define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */ 49#define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
50#define CPUIDLE_FLAG_IGNORE (0x100) /* ignore during this idle period */
51 50
52#define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000) 51#define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
53 52
@@ -93,8 +92,6 @@ struct cpuidle_device {
93 struct completion kobj_unregister; 92 struct completion kobj_unregister;
94 void *governor_data; 93 void *governor_data;
95 int safe_state_index; 94 int safe_state_index;
96
97 int (*prepare) (struct cpuidle_device *dev);
98}; 95};
99 96
100DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices); 97DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices);