[Cbe-oss-dev] [PATCH] spufs: remove harmful initialize code

[Christoph Hellwig]

On Mon, Jul 23, 2007 at 06:54:33PM +0900, Masato Noguchi wrote:
> This patch is a bugfix against for v2.6.23-rc1. And this bug will
> affects all cell platforms, I think.
> 
> This patch remove the harmful initialize code at spufs/sched.c.
> 
> This code clears cbe_spu_info[].spus.  But same initialization was
> already performed at spu_base.c, and at a time, cbe_spu_info[].spus
> was initialized as a meaningful list. As a result, re-initialize code
> deletes important informations to run spe.
> 
> Signed-off-by: Masato Noguchi <Masato.Noguchi at jp.sony.com>
> ---
> 
>  arch/powerpc/platforms/cell/spufs/sched.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
> index 227968b..758a80a 100644
> --- a/arch/powerpc/platforms/cell/spufs/sched.c
> +++ b/arch/powerpc/platforms/cell/spufs/sched.c
> @@ -927,10 +927,6 @@ int __init spu_sched_init(void)
>  		INIT_LIST_HEAD(&spu_prio->runq[i]);
>  		__clear_bit(i, spu_prio->bitmap);
>  	}
> -	for (i = 0; i < MAX_NUMNODES; i++) {
> -		mutex_init(&cbe_spu_info[i].list_mutex);
> -		INIT_LIST_HEAD(&cbe_spu_info[i].spus);
> -	}

Thos looks like a mismerge to me because that code is gone in my tree.
Mainline also seem to lack the __set_bit(MAX_PRIO, spu_prio->bitmap);
just below the clear_bit loop so there might be more problems.
I've also seen a mismerge in spufs.h so we might have to look a little
more careful what else is all broken.