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

Commit 92778b99 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/flags: use _BITUL macro 



The defines that are used in entry.S have been partially converted to
use the _BITUL macro (setup.h). This patch converts the rest.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent ac25e790

arch/s390/include/asm/processor.h

+7 −5
Original line number Diff line number Diff line
@@ -11,17 +11,19 @@ 
#ifndef __ASM_S390_PROCESSOR_H

#define __ASM_S390_PROCESSOR_H



#include <linux/const.h>



#define CIF_MCCK_PENDING	0	/* machine check handling is pending */

#define CIF_ASCE		1	/* user asce needs fixup / uaccess */

#define CIF_NOHZ_DELAY		2	/* delay HZ disable for a tick */

#define CIF_FPU			3	/* restore vector registers */

#define CIF_IGNORE_IRQ		4	/* ignore interrupt (for udelay) */



#define _CIF_MCCK_PENDING	(1<<CIF_MCCK_PENDING)

#define _CIF_ASCE		(1<<CIF_ASCE)

#define _CIF_NOHZ_DELAY		(1<<CIF_NOHZ_DELAY)

#define _CIF_FPU		(1<<CIF_FPU)

#define _CIF_IGNORE_IRQ		(1<<CIF_IGNORE_IRQ)

#define _CIF_MCCK_PENDING	_BITUL(CIF_MCCK_PENDING)

#define _CIF_ASCE		_BITUL(CIF_ASCE)

#define _CIF_NOHZ_DELAY		_BITUL(CIF_NOHZ_DELAY)

#define _CIF_FPU		_BITUL(CIF_FPU)

#define _CIF_IGNORE_IRQ		_BITUL(CIF_IGNORE_IRQ)



#ifndef __ASSEMBLY__

arch/s390/include/asm/ptrace.h

+3 −2
Original line number Diff line number Diff line
@@ -6,13 +6,14 @@ 
#ifndef _S390_PTRACE_H

#define _S390_PTRACE_H



#include <linux/const.h>

#include <uapi/asm/ptrace.h>



#define PIF_SYSCALL		0	/* inside a system call */

#define PIF_PER_TRAP		1	/* deliver sigtrap on return to user */



#define _PIF_SYSCALL		(1<<PIF_SYSCALL)

#define _PIF_PER_TRAP		(1<<PIF_PER_TRAP)

#define _PIF_SYSCALL		_BITUL(PIF_SYSCALL)

#define _PIF_PER_TRAP		_BITUL(PIF_PER_TRAP)



#ifndef __ASSEMBLY__

arch/s390/include/asm/thread_info.h

+12 −10
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#ifndef _ASM_THREAD_INFO_H

#define _ASM_THREAD_INFO_H



#include <linux/const.h>



/*

 * Size of kernel stack for each process

 */
@@ -83,16 +85,16 @@ void arch_release_task_struct(struct task_struct *tsk); 
#define TIF_BLOCK_STEP		20	/* This task is block stepped */

#define TIF_UPROBE_SINGLESTEP	21	/* This task is uprobe single stepped */



#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)

#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1<<TIF_SECCOMP)

#define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)

#define _TIF_UPROBE		(1<<TIF_UPROBE)

#define _TIF_31BIT		(1<<TIF_31BIT)

#define _TIF_SINGLE_STEP	(1<<TIF_SINGLE_STEP)

#define _TIF_NOTIFY_RESUME	_BITUL(TIF_NOTIFY_RESUME)

#define _TIF_SIGPENDING		_BITUL(TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	_BITUL(TIF_NEED_RESCHED)

#define _TIF_SYSCALL_TRACE	_BITUL(TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_AUDIT	_BITUL(TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		_BITUL(TIF_SECCOMP)

#define _TIF_SYSCALL_TRACEPOINT	_BITUL(TIF_SYSCALL_TRACEPOINT)

#define _TIF_UPROBE		_BITUL(TIF_UPROBE)

#define _TIF_31BIT		_BITUL(TIF_31BIT)

#define _TIF_SINGLE_STEP	_BITUL(TIF_SINGLE_STEP)



#define is_32bit_task()		(test_thread_flag(TIF_31BIT))