i2c-omap: fix I2C timeouts due to recursive omap_i2c_{un,}idle()

[linux-2.6-omap-h63xx.git] / include / asm-um / uaccess.h

diff --git a/include/asm-um/uaccess.h b/include/asm-um/uaccess.h
index 16c734af9193c8442fbed9ff7d561420ec8157ec..b9a895d6fa1df7cf0447573e58983f5b095e36d2 100644 (file)
--- a/include/asm-um/uaccess.h
+++ b/include/asm-um/uaccess.h
@@ -6,7 +6,15 @@
 #ifndef __UM_UACCESS_H
 #define __UM_UACCESS_H
 
-#include "linux/sched.h"
+#include <asm/errno.h>
+#include <asm/processor.h>
+
+/* thread_info has a mm_segment_t in it, so put the definition up here */
+typedef struct {
+       unsigned long seg;
+} mm_segment_t;
+
+#include "linux/thread_info.h"
 
 #define VERIFY_READ 0
 #define VERIFY_WRITE 1
@@ -80,7 +88,7 @@
         __put_user(x, private_ptr) : -EFAULT); \
 })
 
-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
+#define strlen_user(str) strnlen_user(str, ~0U >> 1)
 
 struct exception_table_entry
 {