From ae2547c1ba82e67a5b80785458bb37d9935228d4 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Thu, 4 Aug 2005 12:53:29 -0700 Subject: [PATCH] --- yaml --- r: 5627 b: refs/heads/master c: 75eedfed3e2d05563f44d2f69efb991fad95d7f1 h: refs/heads/master i: 5625: 16bb1f5e6f7d29b261e0e6501e2e8a3afda3adee 5623: 8ae642a3d0dc6b73d904a8ac1e83d701dca00237 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/head.S | 2 +- trunk/arch/ppc64/kernel/machine_kexec.c | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f152d64c10f3..b11e67d5ae19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 556e58febf90c8cb1da25669d0892bf5fd2ddac2 +refs/heads/master: 75eedfed3e2d05563f44d2f69efb991fad95d7f1 diff --git a/trunk/arch/ppc64/kernel/head.S b/trunk/arch/ppc64/kernel/head.S index 74fc3bc68604..784f56d4684c 100644 --- a/trunk/arch/ppc64/kernel/head.S +++ b/trunk/arch/ppc64/kernel/head.S @@ -2071,7 +2071,7 @@ _GLOBAL(hmt_start_secondary) blr #endif -#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) +#if defined(CONFIG_KEXEC) || (defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES)) _GLOBAL(smp_release_cpus) /* All secondary cpus are spinning on a common * spinloop, release them all now so they can start diff --git a/trunk/arch/ppc64/kernel/machine_kexec.c b/trunk/arch/ppc64/kernel/machine_kexec.c index fdb2fc649d72..5c40bb6788df 100644 --- a/trunk/arch/ppc64/kernel/machine_kexec.c +++ b/trunk/arch/ppc64/kernel/machine_kexec.c @@ -243,13 +243,17 @@ static void kexec_prepare_cpus(void) static void kexec_prepare_cpus(void) { + extern void smp_release_cpus(void); /* * move the secondarys to us so that we can copy * the new kernel 0-0x100 safely * * do this if kexec in setup.c ? + * + * We need to release the cpus if we are ever going from an + * UP to an SMP kernel. */ - smp_relase_cpus(); + smp_release_cpus(); if (ppc_md.cpu_irq_down) ppc_md.cpu_irq_down(); local_irq_disable();