From 7fe0d97611e0eb2b7efb81b9e12f0cacc29ade06 Mon Sep 17 00:00:00 2001 From: Sonny Rao Date: Sat, 12 Jul 2008 09:00:26 +1000 Subject: [PATCH] --- yaml --- r: 101836 b: refs/heads/master c: b6f6b98a4e91fcf31db7de54c3aa86252fc6fb5f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/head_64.S | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0dff76cc43f3..b42666c84dfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd6f37be7fdc9fea407379745350f6630b9d3cdd +refs/heads/master: b6f6b98a4e91fcf31db7de54c3aa86252fc6fb5f diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S index ecced1eb03ae..cc8fb474d520 100644 --- a/trunk/arch/powerpc/kernel/head_64.S +++ b/trunk/arch/powerpc/kernel/head_64.S @@ -1198,7 +1198,6 @@ _GLOBAL(generic_secondary_smp_init) 3: HMT_LOW lbz r23,PACAPROCSTART(r13) /* Test if this processor should */ /* start. */ - sync #ifndef CONFIG_SMP b 3b /* Never go on non-SMP */ @@ -1206,6 +1205,8 @@ _GLOBAL(generic_secondary_smp_init) cmpwi 0,r23,0 beq 3b /* Loop until told to go */ + sync /* order paca.run and cur_cpu_spec */ + /* See if we need to call a cpu state restore handler */ LOAD_REG_IMMEDIATE(r23, cur_cpu_spec) ld r23,0(r23)