From: Russ Allbery <rra@debian.org>
Date: Sun, 9 Jul 2006 19:36:32 +0000 (+0000)
Subject: * Apply upstream fix from Derek Atkins for compilation with kernel
X-Git-Tag: debian/1.4.1-4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=30558e71d64acb73948bf203bf75c21c3eb7e178;p=packages%2Fo%2Fopenafs.git

* Apply upstream fix from Derek Atkins for compilation with kernel
  versions prior to 2.6.10.  (Closes: #376576)
---

diff --git a/debian/changelog b/debian/changelog
index 41b66fc69..672e5dd3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.4.1-4) unstable; urgency=low
+
+  * Apply upstream fix from Derek Atkins for compilation with kernel
+    versions prior to 2.6.10.  (Closes: #376576)
+
+ -- Russ Allbery <rra@debian.org>  Sun,  9 Jul 2006 12:35:44 -0700
+
 openafs (1.4.1-3) unstable; urgency=low
 
   * Include all of AFS's local XDR implementation in the build for
diff --git a/src/afs/LINUX/osi_probe.c b/src/afs/LINUX/osi_probe.c
index 3f27f0c01..16ac2ac92 100644
--- a/src/afs/LINUX/osi_probe.c
+++ b/src/afs/LINUX/osi_probe.c
@@ -117,7 +117,7 @@
 
 /* Allow the user to specify sys_call_table addresses */
 static unsigned long sys_call_table_addr[4] = { 0,0,0,0 };
-#ifdef module_param_array
+#if defined(module_param_array) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
 module_param_array(sys_call_table_addr, long, NULL, 0);
 #else
 MODULE_PARM(sys_call_table_addr, "1-4l");
@@ -134,7 +134,7 @@ MODULE_PARM(probe_carefully, "i");
 MODULE_PARM_DESC(probe_carefully, "Probe for system call tables carefully");
 
 static int probe_ignore_syscalls[8] = { -1, -1, -1, -1, -1, -1, -1, -1 };
-#ifdef module_param_array
+#if defined(module_param_array) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
 module_param_array(probe_ignore_syscalls, int, NULL, 0);
 #else
 MODULE_PARM(probe_ignore_syscalls, "1-8i");
@@ -161,7 +161,7 @@ MODULE_PARM(probe_debug, "i");
 MODULE_PARM_DESC(probe_debug, "Debugging level");
 
 static unsigned long probe_debug_addr[4] = { 0,0,0,0 };
-#ifdef module_param_array
+#if defined(module_param_array) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
 module_param_array(probe_debug_addr, long, NULL, 0);
 #else
 MODULE_PARM(probe_debug_addr, "1-4l");