static long get_page_offset(void);
#endif
-#if defined(AFS_LINUX24_ENV)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+DEFINE_MUTEX(afs_global_lock);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
DECLARE_MUTEX(afs_global_lock);
#else
struct semaphore afs_global_lock = MUTEX;
#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 */