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

1 files changed, 4 insertions, 12 deletions

diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 8a135bd163c2..dc5d29648d85 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -660,20 +660,12 @@ static const struct file_operations proc_lock_stat_operations = {
 
 static int __init lockdep_proc_init(void)
 {
-        struct proc_dir_entry *entry;
-
-        entry = create_proc_entry("lockdep", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_lockdep_operations;
-
-        entry = create_proc_entry("lockdep_stats", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_lockdep_stats_operations;
+        proc_create("lockdep", S_IRUSR, NULL, &proc_lockdep_operations);
+        proc_create("lockdep_stats", S_IRUSR, NULL,
+                    &proc_lockdep_stats_operations);
 
 #ifdef CONFIG_LOCK_STAT
-        entry = create_proc_entry("lock_stat", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_lock_stat_operations;
+        proc_create("lock_stat", S_IRUSR, NULL, &proc_lock_stat_operations);
 #endif
 
         return 0;