From: Andrew Morton <akpm@linux-foundation.org>

Cc: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/generic.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff -puN fs/proc/generic.c~procfs-detect-duplicate-names-fix-fix-2 fs/proc/generic.c
--- a/fs/proc/generic.c~procfs-detect-duplicate-names-fix-fix-2
+++ a/fs/proc/generic.c
@@ -523,7 +523,7 @@ static const struct inode_operations pro
 
 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
 {
-	struct proc_dir_entry *tmp;
+	struct proc_dir_entry *de;
 	unsigned int i;
 	
 	i = get_inode_number();
@@ -549,8 +549,8 @@ static int proc_register(struct proc_dir
 
 	spin_lock(&proc_subdir_lock);
 
-	for (tmp = dir->subdir, i = 0; tmp && !i; tmp = tmp->next)
-		if (!strcmp(dp->name, tmp->name))
+	for (de = dir->subdir, i = 0; de && !i; de = de->next)
+		if (!strcmp(dp->name, de->name))
 			i = 1;
 
 	dp->next = dir->subdir;
@@ -559,8 +559,8 @@ static int proc_register(struct proc_dir
 	spin_unlock(&proc_subdir_lock);
 
 	if (i) {
-		printk(KERN_WARNING
-			"Duplicate file names \"%s\" detected.", dp->name);
+		printk(KERN_WARNING "Duplicate file names \"%s\" detected.",
+				dp->name);
 		dump_stack();
 	}
 
_