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

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

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

diff -puN fs/proc/generic.c~proc-detect-duplicate-names-on-registration-fix fs/proc/generic.c
--- a/fs/proc/generic.c~proc-detect-duplicate-names-on-registration-fix
+++ a/fs/proc/generic.c
@@ -540,8 +540,8 @@ static int proc_register(struct proc_dir
 
 	for (tmp = dir->subdir; tmp; tmp = tmp->next)
 		if (strcmp(tmp->name, dp->name) == 0) {
-			printk(KERN_WARNING "PDE '%s' already registered\n",
-				dp->name);
+			printk(KERN_WARNING "proc_dir_entry '%s' already "
+					"registered\n", dp->name);
 			dump_stack();
 			break;
 		}
_