Merge branch 'for-linus' of git://neil.brown.name/md

[pandora-kernel.git] / arch / powerpc / platforms / cell / spufs / sputrace.c

diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index b9c79ed..8c0e957 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -182,10 +182,10 @@ struct spu_probe spu_probes[] = {
        { "spu_yield__enter", "ctx %p", spu_context_nospu_event },
        { "spu_deactivate__enter", "ctx %p", spu_context_nospu_event },
        { "__spu_deactivate__unload", "ctx %p spu %p", spu_context_event },
-       { "spufs_ps_nopfn__enter", "ctx %p", spu_context_nospu_event },
-       { "spufs_ps_nopfn__sleep", "ctx %p", spu_context_nospu_event },
-       { "spufs_ps_nopfn__wake", "ctx %p spu %p", spu_context_event },
-       { "spufs_ps_nopfn__insert", "ctx %p spu %p", spu_context_event },
+       { "spufs_ps_fault__enter", "ctx %p", spu_context_nospu_event },
+       { "spufs_ps_fault__sleep", "ctx %p", spu_context_nospu_event },
+       { "spufs_ps_fault__wake", "ctx %p spu %p", spu_context_event },
+       { "spufs_ps_fault__insert", "ctx %p spu %p", spu_context_event },
        { "spu_acquire_saved__enter", "ctx %p", spu_context_nospu_event },
        { "destroy_spu_context__enter", "ctx %p", spu_context_nospu_event },
        { "spufs_stop_callback__enter", "ctx %p spu %p", spu_context_event },
@@ -201,10 +201,9 @@ static int __init sputrace_init(void)
        if (!sputrace_log)
                goto out;
 
-       entry = create_proc_entry("sputrace", S_IRUSR, NULL);
+       entry = proc_create("sputrace", S_IRUSR, NULL, &sputrace_fops);
        if (!entry)
                goto out_free_log;
-       entry->proc_fops = &sputrace_fops;
 
        for (i = 0; i < ARRAY_SIZE(spu_probes); i++) {
                struct spu_probe *p = &spu_probes[i];