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

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

diff -u --recursive --new-file v1.3.51/linux/fs/proc/root.c linux/fs/proc/root.c
@@ -131,6 +131,7 @@
 	NULL, NULL	
 };
 
+#ifdef CONFIG_SCSI
 struct proc_dir_entry proc_scsi = {
 	PROC_SCSI, 4, "scsi",
 	S_IFDIR | S_IRUGO | S_IXUGO, 2, 0, 0,
@@ -138,6 +139,7 @@
 	NULL, NULL,
 	NULL, &proc_root, NULL
 };
+#endif
 
 int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
 {
@@ -258,7 +260,9 @@
 	});
 	proc_register(&proc_root, &proc_net);
 
+#ifdef CONFIG_SCSI
 	proc_register(&proc_root, &proc_scsi);
+#endif
 
 #ifdef CONFIG_DEBUG_MALLOC
 	proc_register(&proc_root, &(struct proc_dir_entry) {
@@ -270,11 +274,18 @@
 		PROC_KCORE, 5, "kcore",
 		S_IFREG | S_IRUSR, 1, 0, 0,
 	});
+
+#ifdef CONFIG_MODULES
 	proc_register(&proc_root, &(struct proc_dir_entry) {
 		PROC_MODULES, 7, "modules",
 		S_IFREG | S_IRUGO, 1, 0, 0,
 	});
 	proc_register(&proc_root, &(struct proc_dir_entry) {
+		PROC_KSYMS, 5, "ksyms",
+		S_IFREG | S_IRUGO, 1, 0, 0,
+	});
+#endif
+	proc_register(&proc_root, &(struct proc_dir_entry) {
 		PROC_STAT, 4, "stat",
 		S_IFREG | S_IRUGO, 1, 0, 0,
 	});
@@ -288,10 +299,6 @@
 	});
 	proc_register(&proc_root, &(struct proc_dir_entry) {
 		PROC_FILESYSTEMS, 11,"filesystems",
-		S_IFREG | S_IRUGO, 1, 0, 0,
-	});
-	proc_register(&proc_root, &(struct proc_dir_entry) {
-		PROC_KSYMS, 5, "ksyms",
 		S_IFREG | S_IRUGO, 1, 0, 0,
 	});
 	proc_register(&proc_root, &(struct proc_dir_entry) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this