From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 5 Jun 2015 10:21:23 +0000 (+0100)
Subject: Merge branch 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=addc8120a784181cc6410973948eee94ea16f2bd;p=deliverable%2Flinux.git

Merge branch 'arm64/psci-rework' of git://git./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
---

addc8120a784181cc6410973948eee94ea16f2bd
diff --cc arch/arm64/kernel/smp.c
index 65f1a7f72697,2b503a3186dd..4b2121bd7f9c
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -260,7 -262,9 +260,9 @@@ static int op_cpu_kill(unsigned int cpu
   */
  void __cpu_die(unsigned int cpu)
  {
+ 	int err;
+ 
 -	if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) {
 +	if (!cpu_wait_death(cpu, 5)) {
  		pr_crit("CPU%u: cpu didn't die\n", cpu);
  		return;
  	}