diff --git a/[refs] b/[refs]
index 6abed7f55c32..d7e027feb255 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e968bad788de922a755a84b92cb29f8c1342e4
+refs/heads/master: 10a6007bda48e3524e24ce1ad46dc7be1add6a0e
diff --git a/trunk/include/asm-generic/uaccess.h b/trunk/include/asm-generic/uaccess.h
index 9788568f7978..5f6ee6138f9a 100644
--- a/trunk/include/asm-generic/uaccess.h
+++ b/trunk/include/asm-generic/uaccess.h
@@ -7,7 +7,6 @@
  * address space, e.g. all NOMMU machines.
  */
 #include <linux/sched.h>
-#include <linux/mm.h>
 #include <linux/string.h>
 
 #include <asm/segment.h>
@@ -32,7 +31,9 @@ static inline void set_fs(mm_segment_t fs)
 }
 #endif
 
+#ifndef segment_eq
 #define segment_eq(a, b) ((a).seg == (b).seg)
+#endif
 
 #define VERIFY_READ	0
 #define VERIFY_WRITE	1