* Hopefully fix sparc64 kernel support. Thanks, Troy Benjegerdes.

    (Closes: #219429)

diff --git a/aclocal.m4 b/aclocal.m4
index 1df8eef3c587ca558fe6af3444aa4a4b860298cc..224d6563cb71e021b8c57ed9b03bc55e2c25976d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -3747,6 +3747,8 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS64="-O2 -D_LARGEFILE64_SOURCE -m64"
+               XLDFLAGS64="-m64"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;

diff --git a/configure b/configure
index ef7a48c2f3826f507a11d443d3926aa8c4ba5bd9..32383d96acccdb1104abab1e2b5d4c782f9f296e 100755 (executable)
--- a/configure
+++ b/configure
@@ -7551,6 +7551,8 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS64="-O2 -D_LARGEFILE64_SOURCE -m64"
+               XLDFLAGS64="-m64"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;

diff --git a/configure-libafs b/configure-libafs
index 3fc69ce9728c25528908b56d50283132474bef3f..5996f0ca0ed83723d08852b507cdb30a0f942445 100755 (executable)
--- a/configure-libafs
+++ b/configure-libafs
@@ -7551,6 +7551,8 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS64="-O2 -D_LARGEFILE64_SOURCE -m64"
+               XLDFLAGS64="-m64"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;

diff --git a/debian/changelog b/debian/changelog
index 704ff9901c33b4edb08fc701e89d61d8a903dd8c..3ecc80d795c8fa51ded7e90ac24e9e46b26523c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.4.0-4) unstable; urgency=low
+
+  * Hopefully fix sparc64 kernel support.  Thanks, Troy Benjegerdes.
+    (Closes: #219429)
+
+ --
+
 openafs (1.4.0-3) unstable; urgency=low
 
   * Apply upstream patch from Chas Williams to be more careful about what

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 9e7872b8f56cde9c5a7f0eb9397dec5158db4056..379cf06fee5d715df5e5be63e06eeeb2cc26d483 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -26,12 +26,16 @@ RCSID
 #ifdef AFS_AMD64_LINUX20_ENV
 #include "../asm/ia32_unistd.h"
 #endif
+#ifdef AFS_SPARC64_LINUX20_ENV
+#include <linux/ioctl32.h>
+#endif
 
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/kernel.h>
 #endif
 
 #ifdef HAVE_KERNEL_LINUX_SEQ_FILE_H
@@ -283,29 +287,27 @@ afs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
     if (cmd != VIOC_SYSCALL && cmd != VIOC_SYSCALL32) return -EINVAL;
 
 #ifdef NEED_IOCTL32
+#ifdef AFS_LINUX26_ENV 
+#ifdef AFS_S390X_LINUX26_ENV
+    if (test_thread_flag(TIF_31BIT))
+#else
+    if (test_thread_flag(TIF_32BIT))
+#endif /* AFS_S390X_LINUX26_ENV */
+#else
 #ifdef AFS_SPARC64_LINUX24_ENV
     if (current->thread.flags & SPARC_FLAG_32BIT)
 #elif defined(AFS_SPARC64_LINUX20_ENV)
     if (current->tss.flags & SPARC_FLAG_32BIT)
 #elif defined(AFS_AMD64_LINUX20_ENV)
-#ifdef AFS_LINUX26_ENV
-    if (test_thread_flag(TIF_IA32))
-#else
     if (current->thread.flags & THREAD_IA32)
-#endif
 #elif defined(AFS_PPC64_LINUX20_ENV)
-#ifdef AFS_PPC64_LINUX26_ENV
-    if (current->thread_info->flags & _TIF_32BIT)
-#else /*Linux 2.6 */
     if (current->thread.flags & PPC_FLAG_32BIT)
-#endif
-#elif defined(AFS_S390X_LINUX26_ENV)
-    if (test_thread_flag(TIF_31BIT))
 #elif defined(AFS_S390X_LINUX20_ENV)
     if (current->thread.flags & S390_FLAG_31BIT)
 #else
 #error Not done for this linux type
-#endif
+#endif /* AFS_LINUX26_ENV */
+#endif /* NEED_IOCTL32 */
     {
        if (copy_from_user(&sysargs32, (void *)arg,
                           sizeof(struct afsprocdata32)))

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index a1e2f87675f97662b440e4d107dbade42441b2f9..5f5efe2340b16ccf91a366ffef7e75370e80b452 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -646,6 +646,8 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS64="-O2 -D_LARGEFILE64_SOURCE -m64"
+               XLDFLAGS64="-m64"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;

diff --git a/src/config/param.sparc64_linux26.h b/src/config/param.sparc64_linux26.h
index 579da5e90edeb16e9e6569d5f5ab0454c47d7642..30a3e9d63fe08b3c340aaebd7704c30d63f7510e 100644 (file)
--- a/src/config/param.sparc64_linux26.h
+++ b/src/config/param.sparc64_linux26.h
@@ -59,8 +59,8 @@
 #define CONFIG_SMP 1
 #endif
 #define __SMP__
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #endif /* __KERNEL__  && !DUMP_KERNEL */
 #include <afs/afs_sysnames.h>