patch-2.4.0-test2 linux/arch/i386/kernel/mtrr.c

Next file: linux/arch/i386/kernel/pci-i386.c
Previous file: linux/arch/i386/kernel/msr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/arch/i386/kernel/mtrr.c linux/arch/i386/kernel/mtrr.c
@@ -1531,7 +1531,6 @@
     int i, max;
     unsigned int *fcount = file->private_data;
 
-    MOD_DEC_USE_COUNT;
     if (fcount == NULL) return 0;
     max = get_num_var_ranges ();
     for (i = 0; i < max; ++i)
@@ -1549,6 +1548,7 @@
 
 static struct file_operations mtrr_fops =
 {
+    owner:	THIS_MODULE,
     read:	mtrr_read,
     write:	mtrr_write,
     ioctl:	mtrr_ioctl,
@@ -1881,11 +1881,12 @@
 
 #ifdef CONFIG_PROC_FS
     proc_root_mtrr = create_proc_entry ("mtrr", S_IWUSR | S_IRUGO, &proc_root);
+    proc_root_mtrr->owner = THIS_MODULE;
     proc_root_mtrr->proc_fops = &mtrr_fops;
 #endif
 #ifdef CONFIG_DEVFS_FS
-    devfs_handle = devfs_register (NULL, "cpu/mtrr", 0, DEVFS_FL_DEFAULT, 0, 0,
-				   S_IFREG | S_IRUGO | S_IWUSR, 0, 0,
+    devfs_handle = devfs_register (NULL, "cpu/mtrr", DEVFS_FL_DEFAULT, 0, 0,
+				   S_IFREG | S_IRUGO | S_IWUSR,
 				   &mtrr_fops, NULL);
 #endif
     init_table ();

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