patch-2.3.39 linux/fs/proc/proc_devtree.c

Next file: linux/fs/proc/procfs_syms.c
Previous file: linux/fs/partitions/acorn.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.38/linux/fs/proc/proc_devtree.c linux/fs/proc/proc_devtree.c
@@ -59,8 +59,8 @@
 		 * Unfortunately proc_register puts each new entry
 		 * at the beginning of the list.  So we rearrange them.
 		 */
-		ent = create_proc_read_entry(de, 0, pp->name,
-						property_read_proc, pp);
+		ent = create_proc_read_entry(pp->name, S_IRUGO, de,
+					     property_read_proc, pp);
 		if (ent == 0)
 			break;
 		ent->size = pp->length;
@@ -77,7 +77,7 @@
 		l = strlen(p);
 		if (l > 2 && p[l-2] == '@' && p[l-1] == '0')
 			l -= 2;
-		ent = proc_mkdir(de, p);
+		ent = proc_mkdir(p, de);
 		if (ent == 0)
 			break;
 		*lastp = ent;
@@ -99,7 +99,7 @@
 			if (sib->name && strcmp(sib->name, child->name) == 0)
 				break;
 		if (sib == child && strncmp(p, child->name, l) != 0) {
-			al = proc_symlink(de, child->name, ent->name);
+			al = proc_symlink(child->name, de, ent->name);
 			if (al == 0)
 				break;
 			*lastp = al;
@@ -109,7 +109,7 @@
 		/*
 		 * Add another directory with the @address part as its name.
 		 */
-		al = proc_symlink(de, at, ent->name);
+		al = proc_symlink(at, de, ent->name);
 		if (al == 0)
 			break;
 		proc_register(de, al);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)