Changeset 563

Timestamp:

09/13/99 22:55:49 (14 years ago)

Author:

frodo

Message:

Updates for 2.0.x kernel compilation

Most important change: GL518SM-rev00 can't use kernel threads on 2.0 and
early 2.1 kernels

Location:

lm-sensors/trunk

Files:

• kernel/busses/i2c-isa.c (modified) (1 diff)
• kernel/chips/gl518sm.c (modified) (9 diffs)
• kernel/include/compat.h (modified) (1 diff)
• mkpatch/mkpatch.pl (modified) (4 diffs)

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

@@ -29 +29 @@
 
 #include <linux/i2c.h>
+
+#include "compat.h"
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,53)

lm-sensors/trunk/kernel/chips/gl518sm.c

@@ -151 +151 @@
          struct semaphore update_lock;
 
-         int iterate_lock, quit_thread;
+         int iterate_lock;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,68)
+         int quit_thread;
          struct task_struct *thread;
+#endif
          struct wait_queue *wq;
          
@@ -202 +205 @@
 
 static void gl518_update_client_rev00(struct i2c_client *client);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,68)
 static int gl518_update_thread(void *data);
+#endif
 static void gl518_update_iterate(struct i2c_client *client);
 
@@ -390 +395 @@
   data->iterate = 0;
   data->iterate_lock = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,68)
   data->quit_thread = 0;
   data->thread = NULL;
+#endif
   data->alarm_mask = 0xff;
   gl518_init_client((struct i2c_client *) new_client);
@@ -474 +481 @@
   gl518_list[i] = NULL;
   
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,68)
   if (data->thread) {
     data->quit_thread = 1;
     wake_up_interruptible(&data->wq);
   }
+#endif
 
   kfree(client);
@@ -632 +641 @@
 }
 
-
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,68)
 int gl518_update_thread(void *c)
 {
@@ -671 +680 @@
   return 0;
 }
+#endif
 
 /* This updates vdd, vin1, vin2 values by doing slow and multiple
@@ -710 +720 @@
       gl518_write_value(client, VIN_REG(i), max[i] << 8 | min[i]);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,68)
     if ((data->thread) && 
        ((data->quit_thread) || signal_pending(current))) 
       goto finish;
+#endif
 
     /* we wait now 1.5 seconds before comparing */
@@ -981 +993 @@
       data->valid=0;
       
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,68)
       if ((data->iterate != 2) && (data->thread)) {
          data->quit_thread = 1;
@@ -988 +1001 @@
          kernel_thread(gl518_update_thread, (void*) client, 0);
       }
+#endif
     }
   }

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

@@ -32 +32 @@
 #include <linux/module.h>
 #ifndef MODULE_AUTHOR
-#define MODULE_AUTHOR(whatever)
+#define MODULE_AUTHOR(noone)
 #endif
 #ifndef MODULE_DESCRIPTION
-#define MODULE_DESCRIPTION(whatever)
+#define MODULE_DESCRIPTION(none)
+#endif
+#ifndef MODULE_PARM
+#define MODULE_PARM(no,param)
+#endif
+#ifndef MODULE_PARM_DESC
+#define MODULE_PARM_DES(no,description)
 #endif
 #endif /* def MODULE */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
+#endif
 
 /* copy_from/to_usr is called memcpy_from/to_fs in 2.0 kernels 

lm-sensors/trunk/mkpatch/mkpatch.pl

@@ -700 +700 @@
 #ifdef MODULE
 #include <linux/module.h>
+#endif /* def MODULE */
 #ifndef MODULE_AUTHOR
-#define MODULE_AUTHOR(whatever)
+#define MODULE_AUTHOR(noone)
 #endif
 #ifndef MODULE_DESCRIPTION
-#define MODULE_DESCRIPTION(whatever)
-#endif
+#define MODULE_DESCRIPTION(none)
+#endif
+#ifndef MODULE_PARM
+#define MODULE_PARM(no,param)
+#endif
+#ifndef MODULE_PARM_DESC
+#define MODULE_PARM_DESC(no,description)
 #endif /* def MODULE */
 
 EOF
+
         if (`grep KERNEL_VERSION "$package_root/$package_file"`) {
           print OUTPUT << 'EOF';
@@ -714 +721 @@
 #ifndef KERNEL_VERSION
 #define KERNEL_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))
+#endif
+
+EOF
+        }
+        if (`grep EXPORT_NO_SYMBOLS "$package_root/$package_file"`) {
+          print OUTPUT << 'EOF';
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define EXPORT_NO_SYMBOLS
+#endif
+
+EOF
+        }
+        if (`grep EXPORT_SYMBOL "$package_root/$package_file"`) {
+          print OUTPUT << 'EOF';
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define EXPORT_SYMBOL(noexport)
 #endif
 
@@ -773 +796 @@
 EOF
         }
-        if (`grep 'ioremap\|iounmap' "$package_root/$package_file"`) {
+        if (`grep 'ioremap\\|iounmap' "$package_root/$package_file"`) {
           print OUTPUT  << 'EOF';
 /* I hope this is always correct, even for the PPC, but I really think so.
@@ -838 +861 @@
 EOF
         }
-        if (`grep 'PCI_DEVICE_ID_INTEL_82801AA_3\|PCI_DEVICE_ID_INTEL_82801AB_3' "$package_root/$package_file"`) {
+        if (`grep 'PCI_DEVICE_ID_INTEL_82801AA_3\\|PCI_DEVICE_ID_INTEL_82801AB_3' "$package_root/$package_file"`) {
           print OUTPUT << 'EOF';
 #ifndef PCI_DEVICE_ID_INTEL_82801AA_3