diff options
Diffstat (limited to 'arch/cris/kernel/process.c')
-rw-r--r-- | arch/cris/kernel/process.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index 7f65be6f7f17..104ff4dd9b98 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c | |||
@@ -54,11 +54,6 @@ void enable_hlt(void) | |||
54 | 54 | ||
55 | EXPORT_SYMBOL(enable_hlt); | 55 | EXPORT_SYMBOL(enable_hlt); |
56 | 56 | ||
57 | /* | ||
58 | * The following aren't currently used. | ||
59 | */ | ||
60 | void (*pm_idle)(void); | ||
61 | |||
62 | extern void default_idle(void); | 57 | extern void default_idle(void); |
63 | 58 | ||
64 | void (*pm_power_off)(void); | 59 | void (*pm_power_off)(void); |
@@ -77,16 +72,12 @@ void cpu_idle (void) | |||
77 | while (1) { | 72 | while (1) { |
78 | rcu_idle_enter(); | 73 | rcu_idle_enter(); |
79 | while (!need_resched()) { | 74 | while (!need_resched()) { |
80 | void (*idle)(void); | ||
81 | /* | 75 | /* |
82 | * Mark this as an RCU critical section so that | 76 | * Mark this as an RCU critical section so that |
83 | * synchronize_kernel() in the unload path waits | 77 | * synchronize_kernel() in the unload path waits |
84 | * for our completion. | 78 | * for our completion. |
85 | */ | 79 | */ |
86 | idle = pm_idle; | 80 | default_idle(); |
87 | if (!idle) | ||
88 | idle = default_idle; | ||
89 | idle(); | ||
90 | } | 81 | } |
91 | rcu_idle_exit(); | 82 | rcu_idle_exit(); |
92 | schedule_preempt_disabled(); | 83 | schedule_preempt_disabled(); |