DEVEL15-linux-2-6-27-20080816

LICENSE IPL10
FIXES 111634

add support for 2.6.27, which removes asm/semaphore.h

(cherry picked from commit d7a5619e5bd8241dd13611a4be37f04f3aa4ed27)

diff --git a/acinclude.m4 b/acinclude.m4
index 895c82dac465198c42fb18c8cb3a02259ce281bb..dc9cbf302a18c380519628a7f70b86a1b3059de5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -741,6 +741,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_NEW_EXPORT_OPS
                 LINUX_CONFIG_H_EXISTS
                 LINUX_COMPLETION_H_EXISTS
+                LINUX_SEMAPHORE_H_EXISTS
                 LINUX_EXPORTFS_H_EXISTS
                 LINUX_DEFINES_FOR_EACH_PROCESS
                 LINUX_DEFINES_PREV_TASK

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 09a87e066c046c444cec8070919ec30d84871a02..07c5add2db88f8af73ead3a4f41366f693e7a691 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -108,7 +108,11 @@ struct xfs_inode_info {
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#if defined(LINUX_SEMAPHORE_H)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 #include <linux/mutex.h>
 #endif

diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index 10032ed1868b50ed4f2ababdc0ad07d8024f6e93..af278de98017465fca5eb7e999f50299b826fd3c 100644 (file)
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -1079,3 +1079,16 @@ _eops.fh_to_parent(NULL, NULL, 0, 0);],
     AC_DEFINE([NEW_EXPORT_OPS], 1, [define if kernel uses new export ops])
   fi])
  
+AC_DEFUN([LINUX_SEMAPHORE_H_EXISTS], [
+  AC_MSG_CHECKING([for linux/semaphore.h existance])
+  AC_CACHE_VAL([ac_cv_linux_semaphore_h_exists], [
+    AC_TRY_KBUILD(
+[#include <linux/semaphore.h>],
+[return;],
+      ac_cv_linux_semaphore_h_exists=yes,
+      ac_cv_linux_semaphore_h_exists=no)])
+  AC_MSG_RESULT($ac_cv_linux_semaphore_h_exists)
+  if test "x$ac_cv_linux_semaphore_h_exists" = "xyes"; then
+    AC_DEFINE([LINUX_SEMAPHORE_H], 1, [define if linux/semaphore.h exists])
+  fi])
+