From: Nathan Lynch This seems to have slipped in during a manual merge at some point. --- 25-akpm/arch/ppc64/kernel/smp.c | 4 ---- 1 files changed, 4 deletions(-) diff -puN arch/ppc64/kernel/smp.c~ppc64-remove-duplicated-mb-and-comment-from-__cpu_up arch/ppc64/kernel/smp.c --- 25/arch/ppc64/kernel/smp.c~ppc64-remove-duplicated-mb-and-comment-from-__cpu_up 2004-04-25 22:37:09.619504088 -0700 +++ 25-akpm/arch/ppc64/kernel/smp.c 2004-04-25 22:37:09.623503480 -0700 @@ -895,10 +895,6 @@ int __devinit __cpu_up(unsigned int cpu) paca[cpu].xStab_data.real = virt_to_abs(tmp); } - /* The information for processor bringup must be written out - * to main store before we release the processor. */ - mb(); - /* The information for processor bringup must * be written out to main store before we release * the processor. _