Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eb31be3 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: remove is_32bit_task() helper 



is_32bit_task() used to be helpful when we still had CONFIG_32BIT.
Since that is gone, it is nowadays identical to is_compat_task().
So remove it.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b8eecf36

arch/s390/include/asm/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) 


static inline int is_compat_task(void)

{

	return is_32bit_task();

	return test_thread_flag(TIF_31BIT);

}



static inline void __user *arch_compat_alloc_user_space(long len)

arch/s390/include/asm/elf.h

+5 −4
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ typedef s390_regs elf_gregset_t; 
typedef s390_fp_regs compat_elf_fpregset_t;

typedef s390_compat_regs compat_elf_gregset_t;



#include <linux/compat.h>

#include <linux/sched.h>	/* for task_struct */

#include <asm/mmu_context.h>
@@ -159,7 +160,7 @@ extern unsigned int vdso_enabled; 
   the loader.  We need to make sure that it is out of the way of the program

   that it will "exec", and that there is sufficient room for the brk. 64-bit

   tasks are aligned to 4GB. */

#define ELF_ET_DYN_BASE (is_32bit_task() ? \

#define ELF_ET_DYN_BASE (is_compat_task() ? \

				(STACK_TOP / 3 * 2) : \

				(STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
@@ -212,9 +213,9 @@ do { \ 
 * of up to 1GB. For 31-bit processes the virtual address space is limited,

 * use no alignment and limit the randomization to 8MB.

 */

#define BRK_RND_MASK	(is_32bit_task() ? 0x7ffUL : 0x3ffffUL)

#define MMAP_RND_MASK	(is_32bit_task() ? 0x7ffUL : 0x3ff80UL)

#define MMAP_ALIGN_MASK	(is_32bit_task() ? 0 : 0x7fUL)

#define BRK_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ffffUL)

#define MMAP_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ff80UL)

#define MMAP_ALIGN_MASK	(is_compat_task() ? 0 : 0x7fUL)

#define STACK_RND_MASK	MMAP_RND_MASK



#define ARCH_DLINFO							    \

arch/s390/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -96,6 +96,4 @@ void arch_release_task_struct(struct task_struct *tsk); 
#define _TIF_31BIT		_BITUL(TIF_31BIT)

#define _TIF_SINGLE_STEP	_BITUL(TIF_SINGLE_STEP)



#define is_32bit_task()		(test_thread_flag(TIF_31BIT))



#endif /* _ASM_THREAD_INFO_H */