summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2013-01-18 09:42:16 (GMT)
committerVineet Gupta <vgupta@synopsys.com>2013-02-11 14:30:31 (GMT)
commit10a6007bda48e3524e24ce1ad46dc7be1add6a0e (patch)
tree28974ffa38e7acfea4ee4009a41c6a43d4166174
parent14e968bad788de922a755a84b92cb29f8c1342e4 (diff)
downloadlinux-fsl-qoriq-10a6007bda48e3524e24ce1ad46dc7be1add6a0e.tar.xz
asm-generic headers: uaccess.h to conditionally define segment_eq()
This is because mm_segment_t is exported by arch code, while seqment_eq assumes it will have .seg element. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--include/asm-generic/uaccess.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
index 9788568..5f6ee61 100644
--- a/include/asm-generic/uaccess.h
+++ b/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