3 files changed, 39 insertions, 87 deletions
diff --git a/arch/ppc64/kernel/pSeries_reconfig.c b/arch/ppc64/kernel/pSeries_reconfig.c
index cb5443f2e49b..dc2a69d412a2 100644
--- a/arch/ppc64/kernel/pSeries_reconfig.c
+++ b/arch/ppc64/kernel/pSeries_reconfig.c
@@ -47,14 +47,6 @@ static void remove_node_proc_entries(struct device_node *np)
                remove_proc_entry(pp->name, np->pde);
                pp = pp->next;
        }
-        /* Assuming that symlinks have the same parent directory as
-         * np->pde.
-         */
-        if (np->name_link)
-                remove_proc_entry(np->name_link->name, parent->pde);
-        if (np->addr_link)
-                remove_proc_entry(np->addr_link->name, parent->pde);
        if (np->pde)
                remove_proc_entry(np->pde->name, parent->pde);
 }
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 67423c696c0a..6fd57f154197 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -12,15 +12,8 @@
 #include <asm/uaccess.h>
 #ifndef HAVE_ARCH_DEVTREE_FIXUPS
-static inline void set_node_proc_entry(struct device_node *np, struct proc_dir_entry *de)
+static inline void set_node_proc_entry(struct device_node *np,
-{
+                                       struct proc_dir_entry *de)
-}
-static void inline set_node_name_link(struct device_node *np, struct proc_dir_entry *de)
-{
-}
-static void inline set_node_addr_link(struct device_node *np, struct proc_dir_entry *de)
 {
 }
 #endif
@@ -58,89 +51,67 @@ static int property_read_proc(char *page, char **start, off_t off,
 /*
 * Process a node, adding entries for its children and its properties.
 */
-void proc_device_tree_add_node(struct device_node *np, struct proc_dir_entry *de)
+void proc_device_tree_add_node(struct device_node *np,
+                               struct proc_dir_entry *de)
 {
        struct property *pp;
        struct proc_dir_entry *ent;
-        struct device_node *child, *sib;
+        struct device_node *child;
-        const char *p, *at;
+        struct proc_dir_entry *list = NULL, **lastp;
-        int l;
+        const char *p;
-        struct proc_dir_entry *list, **lastp, *al;
        set_node_proc_entry(np, de);
        lastp = &list;
-        for (pp = np->properties; pp != 0; pp = pp->next) {
+        for (child = NULL; (child = of_get_next_child(np, child));) {
-                /*
-                 * Unfortunately proc_register puts each new entry
-                 * at the beginning of the list.  So we rearrange them.
-                 */
-                ent = create_proc_read_entry(pp->name, strncmp(pp->name, "security-", 9) ?
-                                             S_IRUGO : S_IRUSR, de, property_read_proc, pp);
-                if (ent == 0)
-                        break;
-                if (!strncmp(pp->name, "security-", 9))
-                     ent->size = 0; /* don't leak number of password chars */
-                else
-                     ent->size = pp->length;
-                *lastp = ent;
-                lastp = &ent->next;
-        }
-        child = NULL;
-        while ((child = of_get_next_child(np, child))) {
                p = strrchr(child->full_name, '/');
                if (!p)
                        p = child->full_name;
                else
                        ++p;
-                /* chop off '@0' if the name ends with that */
-                l = strlen(p);
-                if (l > 2 && p[l-2] == '@' && p[l-1] == '0')
-                        l -= 2;
                ent = proc_mkdir(p, de);
                if (ent == 0)
                        break;
                *lastp = ent;
+                ent->next = NULL;
                lastp = &ent->next;
                proc_device_tree_add_node(child, ent);
+        }
-                /*
+        of_node_put(child);
-                 * If we left the address part on the name, consider
+        for (pp = np->properties; pp != 0; pp = pp->next) {
-                 * adding symlinks from the name and address parts.
-                 */
-                if (p[l] != 0 || (at = strchr(p, '@')) == 0)
-                        continue;
                /*
-                 * If this is the first node with a given name property,
+                 * Yet another Apple device-tree bogosity: on some machines,
-                 * add a symlink with the name property as its name.
+                 * they have properties & nodes with the same name. Those
+                 * properties are quite unimportant for us though, thus we
+                 * simply "skip" them here, but we do have to check.
                 */
-                sib = NULL;
+                for (ent = list; ent != NULL; ent = ent->next)
-                while ((sib = of_get_next_child(np, sib)) && sib != child)
+                        if (!strcmp(ent->name, pp->name))
-                        if (sib->name && strcmp(sib->name, child->name) == 0)
-                                break;
-                if (sib == child && strncmp(p, child->name, l) != 0) {
-                        al = proc_symlink(child->name, de, ent->name);
-                        if (al == 0) {
-                                of_node_put(sib);
                                break;
-                        }
+                if (ent != NULL) {
-                        set_node_name_link(child, al);
+                        printk(KERN_WARNING "device-tree: property \"%s\" name"
-                        *lastp = al;
+                               " conflicts with node in %s\n", pp->name,
-                        lastp = &al->next;
+                               np->full_name);
+                        continue;
                }
-                of_node_put(sib);
                /*
-                 * Add another directory with the @address part as its name.
+                 * Unfortunately proc_register puts each new entry
+                 * at the beginning of the list.  So we rearrange them.
                 */
-                al = proc_symlink(at, de, ent->name);
+                ent = create_proc_read_entry(pp->name,
-                if (al == 0)
+                                             strncmp(pp->name, "security-", 9)
+                                             ? S_IRUGO : S_IRUSR, de,
+                                             property_read_proc, pp);
+                if (ent == 0)
                        break;
-                set_node_addr_link(child, al);
+                if (!strncmp(pp->name, "security-", 9))
-                *lastp = al;
+                     ent->size = 0; /* don't leak number of password chars */
-                lastp = &al->next;
+                else
+                     ent->size = pp->length;
+                ent->next = NULL;
+                *lastp = ent;
+                lastp = &ent->next;
        }
-        of_node_put(child);
-        *lastp = NULL;
        de->subdir = list;
 }
diff --git a/include/asm-ppc64/prom.h b/include/asm-ppc64/prom.h
index 2440a2c90ae9..04b1a84f7ca3 100644
--- a/include/asm-ppc64/prom.h
+++ b/include/asm-ppc64/prom.h
@@ -147,9 +147,7 @@ struct device_node {
        struct  device_node *sibling;
        struct  device_node *next;      /* next device of same type */
        struct  device_node *allnext;   /* next in list of all nodes */
-        struct  proc_dir_entry *pde;       /* this node's proc directory */
+        struct  proc_dir_entry *pde;    /* this node's proc directory */
-        struct  proc_dir_entry *name_link; /* name symlink */
-        struct  proc_dir_entry *addr_link; /* addr symlink */
        struct  kref kref;
        unsigned long _flags;
 };
@@ -174,15 +172,6 @@ static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_e
        dn->pde = de;
 }
-static void inline set_node_name_link(struct device_node *dn, struct proc_dir_entry *de)
-{
-        dn->name_link = de;
-}
-static void inline set_node_addr_link(struct device_node *dn, struct proc_dir_entry *de)
-{
-        dn->addr_link = de;
-}
 /* OBSOLETE: Old stlye node lookup */
 extern struct device_node *find_devices(const char *name);

diff --git a/arch/ppc64/kernel/pSeries_reconfig.c b/arch/ppc64/kernel/pSeries_reconfig.c index cb5443f2e49b..dc2a69d412a2 100644 --- a/arch/ppc64/kernel/pSeries_reconfig.c +++ b/arch/ppc64/kernel/pSeries_reconfig.c
@@ -47,14 +47,6 @@ static void remove_node_proc_entries(struct device_node *np)
47	remove_proc_entry(pp->name, np->pde);	47	remove_proc_entry(pp->name, np->pde);
48	pp = pp->next;	48	pp = pp->next;
49	}	49	}
50
51	/* Assuming that symlinks have the same parent directory as
52	* np->pde.
53	*/
54	if (np->name_link)
55	remove_proc_entry(np->name_link->name, parent->pde);
56	if (np->addr_link)
57	remove_proc_entry(np->addr_link->name, parent->pde);
58	if (np->pde)	50	if (np->pde)
59	remove_proc_entry(np->pde->name, parent->pde);	51	remove_proc_entry(np->pde->name, parent->pde);
60	}	52	}


diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index 67423c696c0a..6fd57f154197 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c
@@ -12,15 +12,8 @@
12	#include <asm/uaccess.h>	12	#include <asm/uaccess.h>
13		13
14	#ifndef HAVE_ARCH_DEVTREE_FIXUPS	14	#ifndef HAVE_ARCH_DEVTREE_FIXUPS
15	static inline void set_node_proc_entry(struct device_node np, struct proc_dir_entry de)	15	static inline void set_node_proc_entry(struct device_node *np,
16	{	16	struct proc_dir_entry *de)
17	}
18
19	static void inline set_node_name_link(struct device_node np, struct proc_dir_entry de)
20	{
21	}
22
23	static void inline set_node_addr_link(struct device_node np, struct proc_dir_entry de)
24	{	17	{
25	}	18	}
26	#endif	19	#endif
@@ -58,89 +51,67 @@ static int property_read_proc(char page, char *start, off_t off,
58	/*	51	/*
59	* Process a node, adding entries for its children and its properties.	52	* Process a node, adding entries for its children and its properties.
60	*/	53	*/
61	void proc_device_tree_add_node(struct device_node np, struct proc_dir_entry de)	54	void proc_device_tree_add_node(struct device_node *np,
		55	struct proc_dir_entry *de)
62	{	56	{
63	struct property *pp;	57	struct property *pp;
64	struct proc_dir_entry *ent;	58	struct proc_dir_entry *ent;
65	struct device_node child, sib;	59	struct device_node *child;
66	const char p, at;	60	struct proc_dir_entry list = NULL, *lastp;
67	int l;	61	const char *p;
68	struct proc_dir_entry list, lastp, al;
69		62
70	set_node_proc_entry(np, de);	63	set_node_proc_entry(np, de);
71	lastp = &list;	64	lastp = &list;
72	for (pp = np->properties; pp != 0; pp = pp->next) {	65	for (child = NULL; (child = of_get_next_child(np, child));) {
73	/*
74	* Unfortunately proc_register puts each new entry
75	* at the beginning of the list. So we rearrange them.
76	*/
77	ent = create_proc_read_entry(pp->name, strncmp(pp->name, "security-", 9) ?
78	S_IRUGO : S_IRUSR, de, property_read_proc, pp);
79	if (ent == 0)
80	break;
81	if (!strncmp(pp->name, "security-", 9))
82	ent->size = 0; /* don't leak number of password chars */
83	else
84	ent->size = pp->length;
85	*lastp = ent;
86	lastp = &ent->next;
87	}
88	child = NULL;
89	while ((child = of_get_next_child(np, child))) {
90	p = strrchr(child->full_name, '/');	66	p = strrchr(child->full_name, '/');
91	if (!p)	67	if (!p)
92	p = child->full_name;	68	p = child->full_name;
93	else	69	else
94	++p;	70	++p;
95	/* chop off '@0' if the name ends with that */
96	l = strlen(p);
97	if (l > 2 && p[l-2] == '@' && p[l-1] == '0')
98	l -= 2;
99	ent = proc_mkdir(p, de);	71	ent = proc_mkdir(p, de);
100	if (ent == 0)	72	if (ent == 0)
101	break;	73	break;
102	*lastp = ent;	74	*lastp = ent;
		75	ent->next = NULL;
103	lastp = &ent->next;	76	lastp = &ent->next;
104	proc_device_tree_add_node(child, ent);	77	proc_device_tree_add_node(child, ent);
105		78	}
106	/*	79	of_node_put(child);
107	* If we left the address part on the name, consider	80	for (pp = np->properties; pp != 0; pp = pp->next) {
108	* adding symlinks from the name and address parts.
109	*/
110	if (p[l] != 0 \|\| (at = strchr(p, '@')) == 0)
111	continue;
112
113	/*	81	/*
114	* If this is the first node with a given name property,	82	* Yet another Apple device-tree bogosity: on some machines,
115	* add a symlink with the name property as its name.	83	* they have properties & nodes with the same name. Those
		84	* properties are quite unimportant for us though, thus we
		85	* simply "skip" them here, but we do have to check.
116	*/	86	*/
117	sib = NULL;	87	for (ent = list; ent != NULL; ent = ent->next)
118	while ((sib = of_get_next_child(np, sib)) && sib != child)	88	if (!strcmp(ent->name, pp->name))
119	if (sib->name && strcmp(sib->name, child->name) == 0)
120	break;
121	if (sib == child && strncmp(p, child->name, l) != 0) {
122	al = proc_symlink(child->name, de, ent->name);
123	if (al == 0) {
124	of_node_put(sib);
125	break;	89	break;
126	}	90	if (ent != NULL) {
127	set_node_name_link(child, al);	91	printk(KERN_WARNING "device-tree: property \"%s\" name"
128	*lastp = al;	92	" conflicts with node in %s\n", pp->name,
129	lastp = &al->next;	93	np->full_name);
		94	continue;
130	}	95	}
131	of_node_put(sib);	96
132	/*	97	/*
133	* Add another directory with the @address part as its name.	98	* Unfortunately proc_register puts each new entry
		99	* at the beginning of the list. So we rearrange them.
134	*/	100	*/
135	al = proc_symlink(at, de, ent->name);	101	ent = create_proc_read_entry(pp->name,
136	if (al == 0)	102	strncmp(pp->name, "security-", 9)
		103	? S_IRUGO : S_IRUSR, de,
		104	property_read_proc, pp);
		105	if (ent == 0)
137	break;	106	break;
138	set_node_addr_link(child, al);	107	if (!strncmp(pp->name, "security-", 9))
139	*lastp = al;	108	ent->size = 0; /* don't leak number of password chars */
140	lastp = &al->next;	109	else
		110	ent->size = pp->length;
		111	ent->next = NULL;
		112	*lastp = ent;
		113	lastp = &ent->next;
141	}	114	}
142	of_node_put(child);
143	*lastp = NULL;
144	de->subdir = list;	115	de->subdir = list;
145	}	116	}
146		117


diff --git a/include/asm-ppc64/prom.h b/include/asm-ppc64/prom.h index 2440a2c90ae9..04b1a84f7ca3 100644 --- a/include/asm-ppc64/prom.h +++ b/include/asm-ppc64/prom.h
@@ -147,9 +147,7 @@ struct device_node {
147	struct device_node *sibling;	147	struct device_node *sibling;
148	struct device_node next; / next device of same type */	148	struct device_node next; / next device of same type */
149	struct device_node allnext; / next in list of all nodes */	149	struct device_node allnext; / next in list of all nodes */
150	struct proc_dir_entry pde; / this node's proc directory */	150	struct proc_dir_entry pde; / this node's proc directory */
151	struct proc_dir_entry name_link; / name symlink */
152	struct proc_dir_entry addr_link; / addr symlink */
153	struct kref kref;	151	struct kref kref;
154	unsigned long _flags;	152	unsigned long _flags;
155	};	153	};
@@ -174,15 +172,6 @@ static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_e
174	dn->pde = de;	172	dn->pde = de;
175	}	173	}
176		174
177	static void inline set_node_name_link(struct device_node dn, struct proc_dir_entry de)
178	{
179	dn->name_link = de;
180	}
181
182	static void inline set_node_addr_link(struct device_node dn, struct proc_dir_entry de)
183	{
184	dn->addr_link = de;
185	}
186		175
187	/* OBSOLETE: Old stlye node lookup */	176	/* OBSOLETE: Old stlye node lookup */
188	extern struct device_node find_devices(const char name);	177	extern struct device_node find_devices(const char name);