--- zzzz-none-000/linux-2.6.28.10/kernel/futex.c	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/kernel/futex.c	2009-10-13 10:25:03.000000000 +0000
@@ -2085,8 +2085,10 @@
 	 * implementation, the non functional ones will return
 	 * -ENOSYS.
 	 */
+/*--- #ifndef CONFIG_ARCH_PUMA5 ---*/
 	curval = cmpxchg_futex_value_locked(NULL, 0, 0);
 	if (curval == -EFAULT)
+/*--- #endif ---*/ /*--- #ifndef CONFIG_ARCH_PUMA5 ---*/
 		futex_cmpxchg_enabled = 1;
 
 	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {