Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / platforms / cell / spufs / lscsa_alloc.c

diff --git a/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c b/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
index a101abf175040eac45df0ab0d972f1765e5d7e6c..3b894f5852800a439a4122ec8a6d02ee9579b3c4 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
+++ b/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
@@ -36,10 +36,9 @@ static int spu_alloc_lscsa_std(struct spu_state *csa)
        struct spu_lscsa *lscsa;
        unsigned char *p;
 
-       lscsa = vmalloc(sizeof(struct spu_lscsa));
+       lscsa = vzalloc(sizeof(struct spu_lscsa));
        if (!lscsa)
                return -ENOMEM;
-       memset(lscsa, 0, sizeof(struct spu_lscsa));
        csa->lscsa = lscsa;
 
        /* Set LS pages reserved to allow for user-space mapping. */