* In all cases, only build the module appropriate to the kernel we're

    building against.  Building an SMP module against a non-SMP kernel
    fails due to missing defines.  (Closes: #225907)

diff --git a/debian/changelog b/debian/changelog
index 30d05baa3bc851e5995f61070d08064ec762004a..9ad5bf6d2e4511773c2480f089c7cd6fc46f8a20 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ openafs (1.3.82-1) unstable; urgency=low
     - Proper locking for preempt kernels.  This bug manifested as an
       inability to shut down AFS cleanly.  (Closes: #308399, #304040)
     - Correctly handle the inotify semaphore.  (Closes: #303495)
+  * In all cases, only build the module appropriate to the kernel we're
+    building against.  Building an SMP module against a non-SMP kernel
+    fails due to missing defines.  (Closes: #225907)
 
  --
 

diff --git a/src/cf/linux-test3.m4 b/src/cf/linux-test3.m4
index 58360f6553b35acfe5181892c76ff4a4fe53f310..dee92c9ae713f886f0dcd9b413c7fac9c81f87e5 100644 (file)
--- a/src/cf/linux-test3.m4
+++ b/src/cf/linux-test3.m4
@@ -53,11 +53,6 @@ lose;
   ac_cv_linux_config_modversions=no)])
   AC_MSG_RESULT($ac_cv_linux_config_modversions)
   AC_MSG_CHECKING(which kernel modules to build)
-  if false; then
-      MPS="MP SP"
-  elif test "x$ac_cv_linux_config_modversions" = "xno" -a "$AFS_SYSKVERS" -lt 26; then
-      MPS="MP SP"
-  else
   AC_CACHE_VAL(ac_cv_linux_config_smp, [
   AC_TRY_COMPILE(
 [#include <linux/config.h>