Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / include / asm-parisc / compat.h

diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h
index 71b4eee..7f32611 100644 (file)
--- a/include/asm-parisc/compat.h
+++ b/include/asm-parisc/compat.h
@@ -5,7 +5,7 @@
  */
 #include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/personality.h>
+#include <linux/thread_info.h>
 
 #define COMPAT_USER_HZ 100
 
@@ -31,8 +31,10 @@ typedef s32  compat_timer_t;
 
 typedef s32    compat_int_t;
 typedef s32    compat_long_t;
+typedef s64    compat_s64;
 typedef u32    compat_uint_t;
 typedef u32    compat_ulong_t;
+typedef u64    compat_u64;
 
 struct compat_timespec {
        compat_time_t           tv_sec;
@@ -130,7 +132,7 @@ typedef u32         compat_sigset_word;
  * A pointer passed in from user mode. This should not
  * be used for syscall parameters, just declare them
  * as pointers because the syscall entry code will have
- * appropriately comverted them already.
+ * appropriately converted them already.
  */
 typedef        u32             compat_uptr_t;
 
@@ -152,7 +154,7 @@ static __inline__ void __user *compat_alloc_user_space(long len)
 
 static inline int __is_compat_task(struct task_struct *t)
 {
-       return personality(t->personality) == PER_LINUX32;
+       return test_ti_thread_flag(task_thread_info(t), TIF_32BIT);
 }
 
 static inline int is_compat_task(void)