patch-2.3.13 linux/fs/proc/root.c

Next file: linux/fs/romfs/inode.c
Previous file: linux/fs/proc/array.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/fs/proc/root.c linux/fs/proc/root.c
@@ -651,8 +651,8 @@
 	S_IFREG | S_IRUGO, 1, 0, 0,
 	0, &proc_array_inode_operations
 };
-static struct proc_dir_entry proc_root_memory = {
-	PROC_MEMORY, 6, "memory",
+static struct proc_dir_entry proc_root_iomem = {
+	PROC_MEMORY, 5, "iomem",
 	S_IFREG | S_IRUGO, 1, 0, 0,
 	0, &proc_array_inode_operations
 };
@@ -744,7 +744,7 @@
 	proc_register(&proc_root, &proc_root_fs);
 	proc_register(&proc_root, &proc_root_dma);
 	proc_register(&proc_root, &proc_root_ioports);
-	proc_register(&proc_root, &proc_root_memory);
+	proc_register(&proc_root, &proc_root_iomem);
 	proc_register(&proc_root, &proc_root_cmdline);
 #ifdef CONFIG_RTC
 	proc_register(&proc_root, &proc_root_rtc);

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