From b0d1ee365fe8b9ab077ce55231a7793ac0037b32 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Mon, 22 Sep 2008 19:06:42 -0700
Subject: [PATCH] Fix builds with 2.6.27 kernels
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* Apply upstream deltas to support 2.6.27 kernels and to stop using
  COMMON_KERN_CFLAGS for all 2.6 kernels uniformly, which fixes
  problems on amd64 with newer kernels.  Thanks, Björn Torkelsson.
  (LP: #267504)
---
 acinclude.m4                      |  1 +
 debian/changelog                  |  4 ++++
 src/afs/sysincludes.h             |  4 ++++
 src/cf/linux-test4.m4             | 12 ++++++++++++
 src/libafs/MakefileProto.LINUX.in | 12 ++++++------
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 164c310cc..a7d2c4ab5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -608,6 +608,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 		 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
diff --git a/debian/changelog b/debian/changelog
index 204eaa658..308cb4f67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ openafs (1.4.7.dfsg1-6) UNRELEASED; urgency=low
 
   * Apply upstream patch to free /proc entries in the correct order.
     Thanks, Marc Dionne.  (Closes: #493914)
+  * Apply upstream deltas to support 2.6.27 kernels and to stop using
+    COMMON_KERN_CFLAGS for all 2.6 kernels uniformly, which fixes
+    problems on amd64 with newer kernels.  Thanks, Björn Torkelsson.
+    (LP: #267504)
   * Translation updates:
     - Swedish, thanks Martin Bagge.  (Closes: #493120)
 
diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 09a87e066..07c5add2d 100644
--- 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 75949d8a4..3d0e9215d 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -1020,3 +1020,15 @@ AC_DEFUN([LINUX_EXPORTS_PROC_ROOT_FS], [
     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])
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 50a731212..b4c1e50e7 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -50,26 +50,26 @@ DEFINES = $(COMMON_DEFINES)
 CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@
 DEFINES = $(COMMON_DEFINES) -DCPU=586
 
-<amd64_linux24 amd64_linux26>
+<amd64_linux22 amd64_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -mcmodel=kernel -mno-red-zone
 DEFINES = $(COMMON_DEFINES) 
 
-<i386_umlinux22 i386_umlinux24 i386_umlinux26>
+<i386_umlinux22 i386_umlinux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@ -Wno-strict-prototypes -I$(LINUX_KERNEL_PATH)/arch/um/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/tt/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/skas/include
 DEFINES = $(COMMON_DEFINES) -DCPU=586
 
 <i386_umlinux26>
 EXTRA_CFLAGS = -I$(LINUX_KERNEL_PATH)/arch/um/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/tt/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/skas/include
 
-<alpha_linux_22 alpha_linux_24 alpha_linux_26>
+<alpha_linux_22 alpha_linux_24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -mno-fp-regs -ffixed-8
 DEFINES = $(COMMON_DEFINES)
 
-<s390_linux22 s390_linux24 s390_linux26>
+<s390_linux22 s390_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char
 DEFINES = $(COMMON_DEFINES) -D__s390__ 
 
-<s390x_linux22 s390x_linux24 s390x_linux26>
+<s390x_linux22 s390x_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char
 DEFINES = $(COMMON_DEFINES) -D__s390x__ 
 
@@ -85,7 +85,7 @@ CCFLAGS = $(COMMON_KERN_CFLAGS) \
       -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare
 DEFINES = $(COMMON_DEFINES) -DCPU=sparc64
 
-<ppc_linux22 ppc_linux24 ppc64_linux24 ppc64_linux26>
+<ppc_linux22 ppc_linux24 ppc64_linux22 ppc64_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char -msoft-float -fno-builtin -ffixed-r2
 DEFINES = $(COMMON_DEFINES) -D__powerpc__
 
-- 
2.39.5