From 17e3e3e34442f6596c74ee40efcb200c31f906ad Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Sat, 13 Sep 2008 02:33:06 -0700
Subject: [PATCH] --- yaml --- r: 109786 b: refs/heads/master c:
 665020c35e89a9e0643e21561e4f8f967f4f2c4b h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/proc/generic.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0557b10c9b4b..f8e76950ebcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a551b98d5f6fce5897d497abd8bfb262efb33d2a
+refs/heads/master: 665020c35e89a9e0643e21561e4f8f967f4f2c4b
diff --git a/trunk/fs/proc/generic.c b/trunk/fs/proc/generic.c
index bca0f81eb687..7821589a17d5 100644
--- a/trunk/fs/proc/generic.c
+++ b/trunk/fs/proc/generic.c
@@ -547,8 +547,8 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
 
 	for (tmp = dir->subdir; tmp; tmp = tmp->next)
 		if (strcmp(tmp->name, dp->name) == 0) {
-			printk(KERN_WARNING "proc_dir_entry '%s' already "
-					"registered\n", dp->name);
+			printk(KERN_WARNING "proc_dir_entry '%s/%s' already registered\n",
+				dir->name, dp->name);
 			dump_stack();
 			break;
 		}