=================================================================== RCS file: /cvs/openafs/acinclude.m4,v retrieving revision 1.114.2.103 retrieving revision 1.114.2.104 diff -u -r1.114.2.103 -r1.114.2.104 --- openafs/acinclude.m4 2008/07/11 09:54:35 1.114.2.103 +++ openafs/acinclude.m4 2008/08/16 19:43:13 1.114.2.104 @@ -608,6 +608,7 @@ LINUX_KMEM_CACHE_CREATE_TAKES_DTOR LINUX_CONFIG_H_EXISTS LINUX_COMPLETION_H_EXISTS + LINUX_SEMAPHORE_H_EXISTS LINUX_DEFINES_FOR_EACH_PROCESS LINUX_DEFINES_PREV_TASK LINUX_FS_STRUCT_SUPER_HAS_ALLOC_INODE =================================================================== RCS file: /cvs/openafs/src/afs/sysincludes.h,v retrieving revision 1.28.2.15 retrieving revision 1.28.2.16 diff -u -r1.28.2.15 -r1.28.2.16 --- openafs/src/afs/sysincludes.h 2007/11/23 13:45:04 1.28.2.15 +++ openafs/src/afs/sysincludes.h 2008/08/16 19:43:15 1.28.2.16 @@ -108,7 +108,11 @@ #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 =================================================================== RCS file: /cvs/openafs/src/cf/linux-test4.m4,v retrieving revision 1.20.2.49 retrieving revision 1.20.2.50 diff -u -r1.20.2.49 -r1.20.2.50 --- openafs/src/cf/linux-test4.m4 2008/06/09 03:39:44 1.20.2.49 +++ openafs/src/cf/linux-test4.m4 2008/08/16 19:43:15 1.20.2.50 @@ -1032,3 +1032,16 @@ AC_DEFINE([EXPORTED_PROC_ROOT_FS], 1, [define if proc_root_fs is exported]) 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]) +