Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / s390 / include / asm / processor.h

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 6b499870662f2dddbb14dd613943ef10e6303b89..52ef30cfedf00023e6f8aadd1b02adef5f8c1db2 100644 (file)
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -43,14 +43,17 @@ extern void execve_tail(void);
 #ifndef CONFIG_64BIT
 
 #define TASK_SIZE              (1UL << 31)
+#define TASK_MAX_SIZE          (1UL << 31)
 #define TASK_UNMAPPED_BASE     (1UL << 30)
 
 #else /* CONFIG_64BIT */
 
-#define TASK_SIZE_OF(tsk)      ((tsk)->mm->context.asce_limit)
+#define TASK_SIZE_OF(tsk)      ((tsk)->mm ? \
+                                (tsk)->mm->context.asce_limit : TASK_MAX_SIZE)
 #define TASK_UNMAPPED_BASE     (test_thread_flag(TIF_31BIT) ? \
                                        (1UL << 30) : (1UL << 41))
 #define TASK_SIZE              TASK_SIZE_OF(current)
+#define TASK_MAX_SIZE          (1UL << 53)
 
 #endif /* CONFIG_64BIT */