From: Russ Allbery <rra@stanford.edu>
Date: Tue, 28 Feb 2006 21:22:50 +0000 (+0000)
Subject: STABLE14-amd64-linux26-fix-20060228
X-Git-Tag: openafs-stable-1_4_1-rc9~18
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7be2c24edb94f978ea8686357b71f2e0f342a566;p=packages%2Fo%2Fopenafs.git

STABLE14-amd64-linux26-fix-20060228


Restore the previous code for AMD64 under Linux 2.6, as the generic
Linux 2.6 code apparently does not work with all AMD64 kernels.


(cherry picked from commit 79a7ddac4da960e3337b7792f8a44fc82514f81d)
---

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 4e90c1cee..fcc42b0f9 100644
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -290,6 +290,8 @@ afs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 #ifdef AFS_LINUX26_ENV 
 #ifdef AFS_S390X_LINUX26_ENV
     if (test_thread_flag(TIF_31BIT))
+#elif AFS_AMD64_LINUX20_ENV
+    if (test_thread_flag(TIF_IA32))
 #else
     if (test_thread_flag(TIF_32BIT))
 #endif /* AFS_S390X_LINUX26_ENV */