---

yaml --- r: 230972 b: refs/heads/master c: a05c90f h: refs/heads/master v: v3
git-mirror · Jan 12, 2011 · 35e8b18 · 35e8b18
1 parent a9510b6
commit 35e8b18
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9887a1fcddef1386d3387edf6497d08670460edb
+refs/heads/master: a05c90f1948baacedd0c3e7e3250225be4cae727
diff --git a/trunk/arch/s390/include/asm/compat.h b/trunk/arch/s390/include/asm/compat.h
@@ -169,7 +169,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
 
 static inline int is_compat_task(void)
 {
-	return test_thread_flag(TIF_31BIT);
+	return is_32bit_task();
 }
 
 #else

diff --git a/trunk/arch/s390/include/asm/thread_info.h b/trunk/arch/s390/include/asm/thread_info.h
@@ -118,6 +118,12 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SINGLE_STEP	(1<<TIF_FREEZE)
 #define _TIF_FREEZE		(1<<TIF_FREEZE)
 
+#ifdef CONFIG_64BIT
+#define is_32bit_task()		(test_thread_flag(TIF_31BIT))
+#else
+#define is_32bit_task()		(1)
+#endif
+
 #endif /* __KERNEL__ */
 
 #define PREEMPT_ACTIVE		0x4000000
-Original file line number
+Diff line change
@@ Expand Up @@
     static inline int is_compat_task(void)
     {
-    	return test_thread_flag(TIF_31BIT);
+    	return is_32bit_task();
     }
     #else
@@ Expand Down @@