Merge branch 'akpm/master'

[karo-tx-linux.git] / fs / proc / proc_devtree.c

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index df7dd08d439121253bb180e26ad4d7e982775adf..de20ec480fa082402f557014b285f685be4974d2 100644 (file)
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -195,11 +195,7 @@ void proc_device_tree_add_node(struct device_node *np,
        set_node_proc_entry(np, de);
        for (child = NULL; (child = of_get_next_child(np, child));) {
                /* Use everything after the last slash, or the full name */
-               p = strrchr(child->full_name, '/');
-               if (!p)
-                       p = child->full_name;
-               else
-                       ++p;
+               p = kbasename(child->full_name);
 
                if (duplicate_name(de, p))
                        p = fixup_name(np, de, p);