diff options
Diffstat (limited to 'arch/arm64/kernel/psci.c')
-rw-r--r-- | arch/arm64/kernel/psci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 663da771580a..3425f311c49e 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c | |||
@@ -511,7 +511,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) | |||
511 | 511 | ||
512 | static int psci_suspend_finisher(unsigned long index) | 512 | static int psci_suspend_finisher(unsigned long index) |
513 | { | 513 | { |
514 | struct psci_power_state *state = __get_cpu_var(psci_power_state); | 514 | struct psci_power_state *state = __this_cpu_read(psci_power_state); |
515 | 515 | ||
516 | return psci_ops.cpu_suspend(state[index - 1], | 516 | return psci_ops.cpu_suspend(state[index - 1], |
517 | virt_to_phys(cpu_resume)); | 517 | virt_to_phys(cpu_resume)); |
@@ -520,7 +520,7 @@ static int psci_suspend_finisher(unsigned long index) | |||
520 | static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) | 520 | static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) |
521 | { | 521 | { |
522 | int ret; | 522 | int ret; |
523 | struct psci_power_state *state = __get_cpu_var(psci_power_state); | 523 | struct psci_power_state *state = __this_cpu_read(psci_power_state); |
524 | /* | 524 | /* |
525 | * idle state index 0 corresponds to wfi, should never be called | 525 | * idle state index 0 corresponds to wfi, should never be called |
526 | * from the cpu_suspend operations | 526 | * from the cpu_suspend operations |