Follow upstream and always enable ucontext on ia64.

diff --git a/debian/changelog b/debian/changelog
index 059b59cb7dff9e82fcc42c93da24be914e07d77b..aa982c2a7781d07940d6e28e45b4b8bffcbbefb6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,10 @@ openafs (1.4.4.dfsg1-2) unstable; urgency=low
     hack to switch from spin_lock_irq to spin_lock_irqsave to avoid the
     paravirt redirection so that the module will build.
   * Enable ucontext for all Linux builds with glibc 2.4 or later, not just
-    with i386 and amd64.  Newer versions of glibc change internal
-    structures in ways that cause the old LWP code to have stack
-    overflows.  (Closes: #419903)
+    with i386 and amd64, and (following an upstream patch) always use
+    ucontext on ia64.  Newer versions of glibc change internal structures
+    in ways that cause the old LWP code to have stack overflows.
+    (Closes: #419903) 
   * Apply upstream patch to crashes on contention in afs_xuser when a
     process in a PAG exits.  Thanks, Chaskiel Grundman.
   * When determining the AFS sysname for kernel module builds, add

diff --git a/src/config/param.ia64_linux24.h b/src/config/param.ia64_linux24.h
index e5f9a49bb39ca78eddab0af7cbb9da8eb2b37212..47c36980022cf42e8a22ad3839e8c27d0edbe0f8 100644 (file)
--- a/src/config/param.ia64_linux24.h
+++ b/src/config/param.ia64_linux24.h
@@ -87,6 +87,7 @@
 #endif
 #endif /* KERNEL */
 
+#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* _PARAM_IA64_LINUX20_H_ */
 
@@ -157,6 +158,7 @@
 #define CMSERVERPREF
 #endif
 
+#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* AFS_PARAM_H */
 

diff --git a/src/config/param.ia64_linux26.h b/src/config/param.ia64_linux26.h
index cca359e7f2480394d3d1c2cf932be08ab3aee353..d534f06c392088b0c3a212229941f8d4e5851654 100644 (file)
--- a/src/config/param.ia64_linux26.h
+++ b/src/config/param.ia64_linux26.h
@@ -96,12 +96,8 @@
 #endif
 #endif /* KERNEL */
 
+#define USE_UCONTEXT           /* should be in afsconfig.h */
 
-#ifdef __GLIBC__
-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3)
-#define USE_UCONTEXT
-#endif
-#endif
 #endif /* _PARAM_IA64_LINUX20_H_ */
 
 #else /* !defined(UKERNEL) */
@@ -172,6 +168,7 @@
 #define CMSERVERPREF
 #endif
 
+#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* AFS_PARAM_H */