Skip to contentSkip to conversation

mtrr compile fix when no procfs/devfs

PATCH New Robert Love 1 participant 1 message Oct 27, 2001

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtrr compile fix when no procfs/devfs

arch/i386/kernel/mtrr.c does not compile when neither CONFIG_PROC_FS and CONFIG_DEVFS_FS are set. mtrr has interfaces that are defined when either are set.

The problem is that both devfs_handle and struct mtrr_fops are declared inside the section of code for these interfaces, but are referenced outside of them.

Note that yes, the devfs code does not need to be explicitly ifdef'ed since it is all defined as nops. But then we would have to pull out the devfs_handle typedef and mtrr_fops struct, which is just as pointless.

The attached is against 2.4.13-ac2. Alan, please apply.

arch/i386/kernel/mtrr.c +2 -0
diff -ur linux-2.4.13-ac2/arch/i386/kernel/mtrr.c linux/arch/i386/kernel/mtrr.c
@@ -2249,9 +2249,11 @@
 	proc_root_mtrr->proc_fops = &mtrr_fops;
     }
 #endif
+#ifdef CONFIG_DEVFS_FS
     devfs_handle = devfs_register (NULL, "cpu/mtrr", DEVFS_FL_DEFAULT, 0, 0,
 				   S_IFREG | S_IRUGO | S_IWUSR,
 				   &mtrr_fops, NULL);
+#endif
     init_table ();
     return 0;
 }   /*  End Function mtrr_init  */

Robert Love