Changeset 147

Timestamp:

01/07/99 21:07:15 (14 years ago)

Author:

frodo

Message:

i2c-proc bug resolved

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/i2c-proc.c (modified) (2 diffs)
• src/i2c-proc.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -14 +14 @@
       cvs diff -r V2-0-0 -r V2-0-1 -u
 
+2.1.1 (19990107)
+  Module i2c-proc.o: Hack to make /proc/bus/ possible for kernels 2.0.35
+                     and older
+  Module gl518sm.o: Miscelaneous bugs and problems solved
 
 2.1.0 (19981230)

lm-sensors/trunk/kernel/i2c-proc.c

@@ -71 +71 @@
     /* gid */           0,
     /* size */          0,
-    /* ops */           &proc_dir_inode_operations,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,36))
+    /* ops */           &proc_dir_inode_operations, 
+#endif
   };
 
@@ -171 +173 @@
 #else /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,29)) */
   /* In Linux 2.0.x, there is no /proc/bus! But I hope no other module
-     introduced it, or we are fucked. */
+     introduced it, or we are fucked. And 2.0.35 and earlier does not
+     export proc_dir_inode_operations, so we grab it from proc_net,
+     which also uses it. Not nice. */
+/* #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,0,36) */
+  proc_bus_dir.ops = proc_net.ops;
+/* #endif */
   if ((res = proc_register_dynamic(&proc_root, &proc_bus_dir))) {
     printk("i2c-proc.o: Could not create /proc/bus/, module not inserted.\n");

lm-sensors/trunk/src/i2c-proc.c

@@ -71 +71 @@
     /* gid */           0,
     /* size */          0,
-    /* ops */           &proc_dir_inode_operations,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,36))
+    /* ops */           &proc_dir_inode_operations, 
+#endif
   };
 
@@ -171 +173 @@
 #else /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,29)) */
   /* In Linux 2.0.x, there is no /proc/bus! But I hope no other module
-     introduced it, or we are fucked. */
+     introduced it, or we are fucked. And 2.0.35 and earlier does not
+     export proc_dir_inode_operations, so we grab it from proc_net,
+     which also uses it. Not nice. */
+/* #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,0,36) */
+  proc_bus_dir.ops = proc_net.ops;
+/* #endif */
   if ((res = proc_register_dynamic(&proc_root, &proc_bus_dir))) {
     printk("i2c-proc.o: Could not create /proc/bus/, module not inserted.\n");