Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/profile.c b/kernel/profile.c
index 606d7387265c..ae7ead82cbc9 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -587,10 +587,10 @@ static int __init create_proc_profile(void)
                 return 0;
         if (create_hash_tables())
                 return -1;
-        entry = create_proc_entry("profile", S_IWUSR | S_IRUGO, NULL);
+        entry = proc_create("profile", S_IWUSR | S_IRUGO,
+                            NULL, &proc_profile_operations);
         if (!entry)
                 return 0;
-        entry->proc_fops = &proc_profile_operations;
         entry->size = (1+prof_len) * sizeof(atomic_t);
         hotcpu_notifier(profile_cpu_callback, 0);
         return 0;