[S390] Add four level page tables for CONFIG_64BIT=y.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 14 insertions, 10 deletions

diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index e8785634cbdb..5a21f457d583 100644
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -64,24 +64,28 @@ extern int get_cpu_capability(unsigned int *);
  */
 #ifndef __s390x__
 
-# define TASK_SIZE              (0x80000000UL)
-# define TASK_UNMAPPED_BASE     (TASK_SIZE / 2)
-# define DEFAULT_TASK_SIZE      (0x80000000UL)
+#define TASK_SIZE               (1UL << 31)
+#define TASK_UNMAPPED_BASE      (1UL << 30)
 
 #else /* __s390x__ */
 
-# define TASK_SIZE_OF(tsk)      (test_tsk_thread_flag(tsk, TIF_31BIT) ? \
-                                        (0x80000000UL) : (0x40000000000UL))
-# define TASK_SIZE              TASK_SIZE_OF(current)
-# define TASK_UNMAPPED_BASE     (TASK_SIZE / 2)
-# define DEFAULT_TASK_SIZE      (0x40000000000UL)
+#define TASK_SIZE_OF(tsk)       (test_tsk_thread_flag(tsk,TIF_31BIT) ? \
+                                        (1UL << 31) : (1UL << 53))
+#define TASK_UNMAPPED_BASE      (test_thread_flag(TIF_31BIT) ? \
+                                        (1UL << 30) : (1UL << 41))
+#define TASK_SIZE               TASK_SIZE_OF(current)
 
 #endif /* __s390x__ */
 
 #ifdef __KERNEL__
 
-#define STACK_TOP               TASK_SIZE
-#define STACK_TOP_MAX           DEFAULT_TASK_SIZE
+#ifndef __s390x__
+#define STACK_TOP               (1UL << 31)
+#else /* __s390x__ */
+#define STACK_TOP               (1UL << (test_thread_flag(TIF_31BIT) ? 31:53))
+#endif /* __s390x__ */
+
+#define STACK_TOP_MAX           STACK_TOP
 
 #endif