[PATCH 2/14] cell: abstract spu management routines

[Arnd Bergmann]

On Wednesday 22 November 2006 05:19, Geoff Levand wrote:
> +static int __init spu_map_device(struct spu *spu, struct device_node *node)
> +{
> +       int ret = -ENODEV;
> +       spu->name = get_property(node, "name", NULL);
> +       if (!spu->name)
> +               goto out;
> +
> +       ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store,
> +                                       &spu->local_store_phys);
> +       if (ret)
> +               goto out;
> +       ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem,
> +                                       &spu->problem_phys);
> +       if (ret)
> +               goto out_unmap;
> +       ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2,
> +                                       NULL);
> +       if (ret)
> +               goto out_unmap;
> +
> +       if (!firmware_has_feature(FW_FEATURE_LPAR))
> +               ret = spu_map_resource(node, 3,
> +                       (void __iomem**)&spu_get_pdata(spu)->priv1, NULL);
> +       if (ret)
> +               goto out_unmap;
> +       return 0;

I just noticed that you moved this code while it changed elsewhere, and
you missed a bug fix that benh did. I'll send a fixed version.

The same hunk also creates a merge conflict between the master and
for-2.6.20 branches of powerpc.git.

	Arnd <><