Changeset 545

Timestamp:

09/03/99 13:11:03 (14 years ago)

Author:

frodo

Message:

mkpatch updates

* mkpatch now correctly works when kernel-side files do not yet exist.

I forgot to propagate a change in the i2c version.

* init* handling in mkpatch and compat.h
* New i801 defines added to mkpatch

Location:

lm-sensors/trunk

Files:

• kernel/busses/i2c-i801.c (modified) (1 diff)
• kernel/include/compat.h (modified) (1 diff)
• mkpatch/mkpatch.pl (modified) (3 diffs)

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

@@ -41 +41 @@
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,54))
 #include <linux/bios32.h>
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,53)
-#include <linux/init.h>
-#else
-#define __init
-#define __initdata
 #endif
 

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

@@ -94 +94 @@
 #endif
 
+/* Including init.h should be safe, even if it is not used. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,53)
+#include <linux/init.h>
+#else
+#define __init
+#define __initdata
+#endif
+
 /* For old 2.0 kernels */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,0,34))

lm-sensors/trunk/mkpatch/mkpatch.pl

@@ -32 +32 @@
   my ($diff_command,$dummy);
 
-  $diff_command = "diff -u2 $kernel_root/$kernel_file ";
-  $diff_command .= "$package_root/$package_file";
+  $diff_command = "diff -u2";
+  if ( -e "$kernel_root/$kernel_file") {
+    $diff_command .= " $kernel_root/$kernel_file ";
+  } else {
+    $diff_command .= " /dev/null ";
+  }
+  if ( -e "$package_root/$package_file") {
+    $diff_command .= " $package_root/$package_file ";
+  } else {
+    $diff_command .= " /dev/null";
+  }
   open INPUT, "$diff_command|" or die "Can't execute `$diff_command'";
   $dummy = <INPUT>;
@@ -531 +540 @@
 #endif
 EOF
-
-        }
+        }
+        if (`grep '__init' "$package_root/$package_file"`) {
+          print OUTPUT << 'EOF';
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,53)
+#include <linux/init.h>
+#else
+#define __init
+#define __initdata
+#endif
+EOF
+        }
         if (`grep 'PCI_DEVICE_ID_VIA_82C586_3' "$package_root/$package_file"`) {
           print OUTPUT << 'EOF';
@@ -569 +587 @@
 EOF
         }
+        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
+#define PCI_DEVICE_ID_INTEL_82801AA_3  0x2413
+#endif
+#ifndef PCI_DEVICE_ID_INTEL_82801AB_3
+#define PCI_DEVICE_ID_INTEL_82801AB_3  0x2423
+#endif
+EOF
+        }
         print OUTPUT << 'EOF';
+
 /* --> END OF COMPATIBILITY SECTION */