diff --git a/[refs] b/[refs]
index 6ec988f65b91..83f60b151ea6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99fcd77d15357e8ba51005c25cc750b9c28b2688
+refs/heads/master: 267e2a9c71b8e088ac307f9549f71468e86e26c1
diff --git a/trunk/fs/proc/generic.c b/trunk/fs/proc/generic.c
index bc0a0dd2d844..cb4096cc3fb7 100644
--- a/trunk/fs/proc/generic.c
+++ b/trunk/fs/proc/generic.c
@@ -806,12 +806,9 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
 	if (S_ISDIR(de->mode))
 		parent->nlink--;
 	de->nlink = 0;
-	if (de->subdir) {
-		printk(KERN_WARNING "%s: removing non-empty directory "
+	WARN(de->subdir, KERN_WARNING "%s: removing non-empty directory "
 			"'%s/%s', leaking at least '%s'\n", __func__,
 			de->parent->name, de->name, de->subdir->name);
-		WARN_ON(1);
-	}
 	if (atomic_dec_and_test(&de->count))
 		free_proc_entry(de);
 }