Move the fallback code path in cpuidle_idle_call() to the end of the function to avoid jumping to a label in an if () branch.
Showing the changes to kernel (1 of 1 file). Show all
Unified · Split
| @@ -124,20 +124,8 @@ static void cpuidle_idle_call(void) · 123 unmodified lines | |||
| 124 | * Fall back to the default arch idle method on errors. | 124 | * Fall back to the default arch idle method on errors. |
| 125 | */ | 125 | */ |
| 126 | next_state = cpuidle_select(drv, dev); | 126 | next_state = cpuidle_select(drv, dev); |
| 127 | if (next_state < 0) { | 127 | if (next_state < 0) |
| 128 | use_default: | 128 | goto use_default; |
| 129 | /* | ||
| 130 | * We can't use the cpuidle framework, let's use the default | ||
| 131 | * idle routine. | ||
| 132 | */ | ||
| 133 | if (current_clr_polling_and_test()) | ||
| 134 | local_irq_enable(); | ||
| 135 | else | ||
| 136 | arch_cpu_idle(); | ||
| 137 | |||
| 138 | goto exit_idle; | ||
| 139 | } | ||
| 140 | |||
| 141 | 129 | ||
| 142 | /* | 130 | /* |
| 143 | * The idle task must be scheduled, it is pointless to | 131 | * The idle task must be scheduled, it is pointless to |
| @@ -195,6 +183,19 @@ exit_idle: · 51 unmodified lines | |||
| 195 | 183 | ||
| 196 | rcu_idle_exit(); | 184 | rcu_idle_exit(); |
| 197 | start_critical_timings(); | 185 | start_critical_timings(); |
| 186 | return; | ||
| 187 | |||
| 188 | use_default: | ||
| 189 | /* | ||
| 190 | * We can't use the cpuidle framework, let's use the default | ||
| 191 | * idle routine. | ||
| 192 | */ | ||
| 193 | if (current_clr_polling_and_test()) | ||
| 194 | local_irq_enable(); | ||
| 195 | else | ||
| 196 | arch_cpu_idle(); | ||
| 197 | |||
| 198 | goto exit_idle; | ||
| 198 | } | 199 | } |
| 199 | 200 | ||
| 200 | /* | 201 | /* |