diff options
author | Len Brown <len.brown@intel.com> | 2013-02-09 23:15:13 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2013-02-17 23:37:05 -0500 |
commit | dc883ca34a4e8a309d652c86daab6f1b4edd9d4b (patch) | |
tree | 5d3386323583493aab355066f9087df4dea67d53 | |
parent | b0ea11497c8cbc5a66019814efa1733e47e47ab1 (diff) |
ARM64 idle: delete pm_idle
pm_idle() on arm64 was a synonym for default_idle(),
so remove it and invoke default_idle() directly.
Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r-- | arch/arm64/kernel/process.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index cb0956bc96ed..c7002d40a9b0 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c | |||
@@ -97,14 +97,9 @@ static void default_idle(void) | |||
97 | local_irq_enable(); | 97 | local_irq_enable(); |
98 | } | 98 | } |
99 | 99 | ||
100 | void (*pm_idle)(void) = default_idle; | ||
101 | EXPORT_SYMBOL_GPL(pm_idle); | ||
102 | |||
103 | /* | 100 | /* |
104 | * The idle thread, has rather strange semantics for calling pm_idle, | 101 | * The idle thread. |
105 | * but this is what x86 does and we need to do the same, so that | 102 | * We always respect 'hlt_counter' to prevent low power idle. |
106 | * things like cpuidle get called in the same way. The only difference | ||
107 | * is that we always respect 'hlt_counter' to prevent low power idle. | ||
108 | */ | 103 | */ |
109 | void cpu_idle(void) | 104 | void cpu_idle(void) |
110 | { | 105 | { |
@@ -122,10 +117,10 @@ void cpu_idle(void) | |||
122 | local_irq_disable(); | 117 | local_irq_disable(); |
123 | if (!need_resched()) { | 118 | if (!need_resched()) { |
124 | stop_critical_timings(); | 119 | stop_critical_timings(); |
125 | pm_idle(); | 120 | default_idle(); |
126 | start_critical_timings(); | 121 | start_critical_timings(); |
127 | /* | 122 | /* |
128 | * pm_idle functions should always return | 123 | * default_idle functions should always return |
129 | * with IRQs enabled. | 124 | * with IRQs enabled. |
130 | */ | 125 | */ |
131 | WARN_ON(irqs_disabled()); | 126 | WARN_ON(irqs_disabled()); |