Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / fs / proc / proc_devtree.c

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index ce94801f48cafefce01dcc37da6f0037b77de3e5..d9396a4fc7ff2dc209269e70fe7170d07eb1f5bb 100644 (file)
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -209,6 +209,9 @@ void proc_device_tree_add_node(struct device_node *np,
        for (pp = np->properties; pp != NULL; pp = pp->next) {
                p = pp->name;
 
+               if (strchr(p, '/'))
+                       continue;
+
                if (duplicate_name(de, p))
                        p = fixup_name(np, de, p);