.. | .. |
---|
206 | 206 | * Since this is called with IRQs enabled, and no arch_spin_lock_irq |
---|
207 | 207 | * variant exists, we need to disable IRQs manually here. |
---|
208 | 208 | */ |
---|
209 | | - local_irq_disable(); |
---|
| 209 | + hard_local_irq_disable(); |
---|
210 | 210 | arch_spin_lock(&mcpm_lock); |
---|
211 | 211 | |
---|
212 | 212 | cpu_is_down = !mcpm_cpu_use_count[cluster][cpu]; |
---|
.. | .. |
---|
230 | 230 | ret = platform_ops->cpu_powerup(cpu, cluster); |
---|
231 | 231 | |
---|
232 | 232 | arch_spin_unlock(&mcpm_lock); |
---|
233 | | - local_irq_enable(); |
---|
| 233 | + hard_local_irq_enable(); |
---|
234 | 234 | return ret; |
---|
235 | 235 | } |
---|
236 | 236 | |
---|
.. | .. |
---|
349 | 349 | mpidr = read_cpuid_mpidr(); |
---|
350 | 350 | cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); |
---|
351 | 351 | cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); |
---|
352 | | - local_irq_save(flags); |
---|
| 352 | + flags = hard_local_irq_save(); |
---|
353 | 353 | arch_spin_lock(&mcpm_lock); |
---|
354 | 354 | |
---|
355 | 355 | cpu_was_down = !mcpm_cpu_use_count[cluster][cpu]; |
---|
.. | .. |
---|
363 | 363 | platform_ops->cpu_is_up(cpu, cluster); |
---|
364 | 364 | |
---|
365 | 365 | arch_spin_unlock(&mcpm_lock); |
---|
366 | | - local_irq_restore(flags); |
---|
| 366 | + hard_local_irq_restore(flags); |
---|
367 | 367 | |
---|
368 | 368 | return 0; |
---|
369 | 369 | } |
---|
.. | .. |
---|
402 | 402 | * infrastructure. Let's play it safe by using cpu_pm_enter() |
---|
403 | 403 | * in case the CPU init code path resets the VFP or similar. |
---|
404 | 404 | */ |
---|
405 | | - local_irq_disable(); |
---|
| 405 | + hard_local_irq_disable(); |
---|
406 | 406 | local_fiq_disable(); |
---|
407 | 407 | ret = cpu_pm_enter(); |
---|
408 | 408 | if (!ret) { |
---|
.. | .. |
---|
410 | 410 | cpu_pm_exit(); |
---|
411 | 411 | } |
---|
412 | 412 | local_fiq_enable(); |
---|
413 | | - local_irq_enable(); |
---|
| 413 | + hard_local_irq_enable(); |
---|
414 | 414 | if (ret) |
---|
415 | 415 | pr_err("%s returned %d\n", __func__, ret); |
---|
416 | 416 | return ret; |
---|