Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / cell / spufs / fault.c

diff --git a/arch/powerpc/platforms/cell/spufs/fault.c b/arch/powerpc/platforms/cell/spufs/fault.c
index 8cb6260cc80fa66231a4e7d5205ebb94e3a9b9a2..e45894a081185bc92142ad4b75a2eec9138e5fe0 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/fault.c
+++ b/arch/powerpc/platforms/cell/spufs/fault.c
@@ -138,7 +138,7 @@ int spufs_handle_class1(struct spu_context *ctx)
        if (ctx->state == SPU_STATE_RUNNABLE)
                ctx->spu->stats.hash_flt++;
 
-       /* we must not hold the lock when entering spu_handle_mm_fault */
+       /* we must not hold the lock when entering copro_handle_mm_fault */
        spu_release(ctx);
 
        access = (_PAGE_PRESENT | _PAGE_USER);
@@ -149,7 +149,7 @@ int spufs_handle_class1(struct spu_context *ctx)
 
        /* hashing failed, so try the actual fault handler */
        if (ret)
-               ret = spu_handle_mm_fault(current->mm, ea, dsisr, &flt);
+               ret = copro_handle_mm_fault(current->mm, ea, dsisr, &flt);
 
        /*
         * This is nasty: we need the state_mutex for all the bookkeeping even