+diff -Nurb linux-2.6.22-580/include/linux/mutex.h linux-2.6.22-590/include/linux/mutex.h
+--- linux-2.6.22-580/include/linux/mutex.h 2008-04-30 09:19:15.000000000 -0400
++++ linux-2.6.22-590/include/linux/mutex.h 2008-04-29 17:09:49.000000000 -0400
+@@ -53,6 +53,10 @@
+ struct thread_info *owner;
+ const char *name;
+ void *magic;
++#else
++#ifdef CONFIG_CHOPSTIX
++ struct thread_info *owner;
++#endif
+ #endif
+
+ #ifdef CONFIG_DEBUG_LOCK_ALLOC