tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
authored by
Heiko Carstens
and committed by
Martin Schwidefsky
92778b99
ac25e790
+22
-17
+7
-5
arch/s390/include/asm/processor.h
+7
-5
arch/s390/include/asm/processor.h
···
11
11
#ifndef __ASM_S390_PROCESSOR_H
12
12
#define __ASM_S390_PROCESSOR_H
13
13
14
+
#include <linux/const.h>
15
+
14
16
#define CIF_MCCK_PENDING 0 /* machine check handling is pending */
15
17
#define CIF_ASCE 1 /* user asce needs fixup / uaccess */
16
18
#define CIF_NOHZ_DELAY 2 /* delay HZ disable for a tick */
17
19
#define CIF_FPU 3 /* restore vector registers */
18
20
#define CIF_IGNORE_IRQ 4 /* ignore interrupt (for udelay) */
19
21
20
-
#define _CIF_MCCK_PENDING (1<<CIF_MCCK_PENDING)
21
-
#define _CIF_ASCE (1<<CIF_ASCE)
22
-
#define _CIF_NOHZ_DELAY (1<<CIF_NOHZ_DELAY)
23
-
#define _CIF_FPU (1<<CIF_FPU)
24
-
#define _CIF_IGNORE_IRQ (1<<CIF_IGNORE_IRQ)
22
+
#define _CIF_MCCK_PENDING _BITUL(CIF_MCCK_PENDING)
23
+
#define _CIF_ASCE _BITUL(CIF_ASCE)
24
+
#define _CIF_NOHZ_DELAY _BITUL(CIF_NOHZ_DELAY)
25
+
#define _CIF_FPU _BITUL(CIF_FPU)
26
+
#define _CIF_IGNORE_IRQ _BITUL(CIF_IGNORE_IRQ)
25
27
26
28
#ifndef __ASSEMBLY__
27
29
+3
-2
arch/s390/include/asm/ptrace.h
+3
-2
arch/s390/include/asm/ptrace.h
···
6
6
#ifndef _S390_PTRACE_H
7
7
#define _S390_PTRACE_H
8
8
9
+
#include <linux/const.h>
9
10
#include <uapi/asm/ptrace.h>
10
11
11
12
#define PIF_SYSCALL 0 /* inside a system call */
12
13
#define PIF_PER_TRAP 1 /* deliver sigtrap on return to user */
13
14
14
-
#define _PIF_SYSCALL (1<<PIF_SYSCALL)
15
-
#define _PIF_PER_TRAP (1<<PIF_PER_TRAP)
15
+
#define _PIF_SYSCALL _BITUL(PIF_SYSCALL)
16
+
#define _PIF_PER_TRAP _BITUL(PIF_PER_TRAP)
16
17
17
18
#ifndef __ASSEMBLY__
18
19
+12
-10
arch/s390/include/asm/thread_info.h
+12
-10
arch/s390/include/asm/thread_info.h
···
7
7
#ifndef _ASM_THREAD_INFO_H
8
8
#define _ASM_THREAD_INFO_H
9
9
10
+
#include <linux/const.h>
11
+
10
12
/*
11
13
* Size of kernel stack for each process
12
14
*/
···
85
83
#define TIF_BLOCK_STEP 20 /* This task is block stepped */
86
84
#define TIF_UPROBE_SINGLESTEP 21 /* This task is uprobe single stepped */
87
85
88
-
#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
89
-
#define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
90
-
#define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
91
-
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
92
-
#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
93
-
#define _TIF_SECCOMP (1<<TIF_SECCOMP)
94
-
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
95
-
#define _TIF_UPROBE (1<<TIF_UPROBE)
96
-
#define _TIF_31BIT (1<<TIF_31BIT)
97
-
#define _TIF_SINGLE_STEP (1<<TIF_SINGLE_STEP)
86
+
#define _TIF_NOTIFY_RESUME _BITUL(TIF_NOTIFY_RESUME)
87
+
#define _TIF_SIGPENDING _BITUL(TIF_SIGPENDING)
88
+
#define _TIF_NEED_RESCHED _BITUL(TIF_NEED_RESCHED)
89
+
#define _TIF_SYSCALL_TRACE _BITUL(TIF_SYSCALL_TRACE)
90
+
#define _TIF_SYSCALL_AUDIT _BITUL(TIF_SYSCALL_AUDIT)
91
+
#define _TIF_SECCOMP _BITUL(TIF_SECCOMP)
92
+
#define _TIF_SYSCALL_TRACEPOINT _BITUL(TIF_SYSCALL_TRACEPOINT)
93
+
#define _TIF_UPROBE _BITUL(TIF_UPROBE)
94
+
#define _TIF_31BIT _BITUL(TIF_31BIT)
95
+
#define _TIF_SINGLE_STEP _BITUL(TIF_SINGLE_STEP)
98
96
99
97
#define is_32bit_task() (test_thread_flag(TIF_31BIT))
100
98