-# define TASK_SIZE (0x40000000000UL)
-# define TASK31_SIZE (0x80000000UL)
-# define TASK_UNMAPPED_BASE (test_thread_flag(TIF_31BIT) ? \
- (TASK31_SIZE / 2) : (TASK_SIZE / 2))
+# define TASK_SIZE (test_thread_flag(TIF_31BIT) ? \
+ (0x80000000UL) : (0x40000000000UL))
+# define TASK_UNMAPPED_BASE (TASK_SIZE / 2)
+# define DEFAULT_TASK_SIZE (0x40000000000UL)