diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2015-06-05 12:21:23 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-06-05 12:21:23 +0200 |
| commit | addc8120a784181cc6410973948eee94ea16f2bd (patch) | |
| tree | de84cba276c224bcc4c1070a58a4f19625960723 /arch/arm64/kernel/smp.c | |
| parent | arm64: alternative: Work around .inst assembler bugs (diff) | |
| parent | arm64: psci: remove ACPI coupling (diff) | |
| download | linux-addc8120a784181cc6410973948eee94ea16f2bd.tar.xz linux-addc8120a784181cc6410973948eee94ea16f2bd.zip | |
Merge branch 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux
* 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux:
arm64: psci: remove ACPI coupling
arm64: psci: kill psci_power_state
arm64: psci: account for Trusted OS instances
arm64: psci: support unsigned return values
arm64: psci: remove unnecessary id indirection
arm64: smp: consistently use error codes
arm64: smp_plat: add get_logical_index
arm/arm64: kvm: add missing PSCI include
Conflicts:
arch/arm64/kernel/smp.c
Diffstat (limited to 'arch/arm64/kernel/smp.c')
| -rw-r--r-- | arch/arm64/kernel/smp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 65f1a7f72697..4b2121bd7f9c 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -249,7 +249,7 @@ static int op_cpu_kill(unsigned int cpu) * time and hope that it's dead, so let's skip the wait and just hope. */ if (!cpu_ops[cpu]->cpu_kill) - return 1; + return 0; return cpu_ops[cpu]->cpu_kill(cpu); } @@ -260,6 +260,8 @@ static int op_cpu_kill(unsigned int cpu) */ void __cpu_die(unsigned int cpu) { + int err; + if (!cpu_wait_death(cpu, 5)) { pr_crit("CPU%u: cpu didn't die\n", cpu); return; @@ -272,8 +274,10 @@ void __cpu_die(unsigned int cpu) * verify that it has really left the kernel before we consider * clobbering anything it might still be using. */ - if (!op_cpu_kill(cpu)) - pr_warn("CPU%d may not have shut down cleanly\n", cpu); + err = op_cpu_kill(cpu); + if (err) + pr_warn("CPU%d may not have shut down cleanly: %d\n", + cpu, err); } /* |