Changeset 37

Timestamp:

12/05/98 05:23:52 (15 years ago)

Author:

phil

Message:

(Phil) Fixed a couple 2.1.x issues:

- The schedule() and timeout issue (since 2.1.127 I think)

- A syntax error in piix4 (pci func 3 sensing code Frodo wrote)

Location:

lm-sensors/trunk

Files:

• kernel/busses/i2c-piix4.c (modified) (2 diffs)
• kernel/compat.h (modified) (1 diff)
• kernel/include/compat.h (modified) (1 diff)
• src/compat.h (modified) (1 diff)
• src/piix4.c (modified) (2 diffs)

lm-sensors/trunk/kernel/busses/i2c-piix4.c

@@ -111 +111 @@
     PIIX4_dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
                                 PCI_DEVICE_ID_INTEL_82371AB_3, PIIX4_dev);
-  while(PIIX4_dev && (PCI_FUNC(PIIX4_dev->devfn) != 3);
+  while(PIIX4_dev && (PCI_FUNC(PIIX4_dev->devfn) != 3));
   if(PIIX4_dev == NULL) {
 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,1,54) */
@@ -195 +195 @@
 {
       current->state = TASK_INTERRUPTIBLE;
-      current->timeout = jiffies + amount;
-      schedule();
+      current->state = TASK_INTERRUPTIBLE;
+      schedule_timeout(amount);
 }
 

lm-sensors/trunk/kernel/compat.h

@@ -50 +50 @@
 #endif
 
+/* Add a scheduling fix for the new code in kernel 2.1.127 */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,127))
+#define schedule_timeout(x) ( current->timeout = jiffies + (x), schedule() )
+#endif
+
 /* If the new PCI interface is not present, fall back on the old PCI BIOS
    interface. We also define some things to unite both interfaces. Not

lm-sensors/trunk/kernel/include/compat.h

@@ -50 +50 @@
 #endif
 
+/* Add a scheduling fix for the new code in kernel 2.1.127 */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,127))
+#define schedule_timeout(x) ( current->timeout = jiffies + (x), schedule() )
+#endif
+
 /* If the new PCI interface is not present, fall back on the old PCI BIOS
    interface. We also define some things to unite both interfaces. Not

lm-sensors/trunk/src/compat.h

@@ -50 +50 @@
 #endif
 
+/* Add a scheduling fix for the new code in kernel 2.1.127 */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,127))
+#define schedule_timeout(x) ( current->timeout = jiffies + (x), schedule() )
+#endif
+
 /* If the new PCI interface is not present, fall back on the old PCI BIOS
    interface. We also define some things to unite both interfaces. Not

lm-sensors/trunk/src/piix4.c

@@ -111 +111 @@
     PIIX4_dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
                                 PCI_DEVICE_ID_INTEL_82371AB_3, PIIX4_dev);
-  while(PIIX4_dev && (PCI_FUNC(PIIX4_dev->devfn) != 3);
+  while(PIIX4_dev && (PCI_FUNC(PIIX4_dev->devfn) != 3));
   if(PIIX4_dev == NULL) {
 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,1,54) */
@@ -195 +195 @@
 {
       current->state = TASK_INTERRUPTIBLE;
-      current->timeout = jiffies + amount;
-      schedule();
+      current->state = TASK_INTERRUPTIBLE;
+      schedule_timeout(amount);
 }