evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s390/flags: fix flag handling

Browse source 
The cpu flags and pt_regs flags fields are each 64 bits in size. A flag can
be set with helper functions like set_cpu_flags().

These functions create a mask using "1U << flag". This doesn't work if flag
is larger than 31, since 1U << 32 == 0.

So fix this in case we ever will have such flag numbers.

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>
This commit is contained in:
Heiko Carstens 2015-10-06 16:23:29 +02:00 • committed by Martin Schwidefsky
parent db7e007fd6
commit ac25e790d9
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/s390/include/asm/processor.h
View file

@ -36,17 +36,17 @@
static inline void set_cpu_flag(int flag) static inline void set_cpu_flag(int flag)
{ {
S390_lowcore.cpu_flags |= (1U << flag); S390_lowcore.cpu_flags |= (1UL << flag);
} }
static inline void clear_cpu_flag(int flag) static inline void clear_cpu_flag(int flag)
{ {
S390_lowcore.cpu_flags &= ~(1U << flag); S390_lowcore.cpu_flags &= ~(1UL << flag);
} }
static inline int test_cpu_flag(int flag) static inline int test_cpu_flag(int flag)
{ {
return !!(S390_lowcore.cpu_flags & (1U << flag)); return !!(S390_lowcore.cpu_flags & (1UL << flag));
} }
#define arch_needs_cpu() test_cpu_flag(CIF_NOHZ_DELAY) #define arch_needs_cpu() test_cpu_flag(CIF_NOHZ_DELAY)

6
arch/s390/include/asm/ptrace.h
View file

@ -128,17 +128,17 @@ struct per_struct_kernel {
static inline void set_pt_regs_flag(struct pt_regs *regs, int flag) static inline void set_pt_regs_flag(struct pt_regs *regs, int flag)
{ {
regs->flags |= (1U << flag); regs->flags |= (1UL << flag);
} }
static inline void clear_pt_regs_flag(struct pt_regs *regs, int flag) static inline void clear_pt_regs_flag(struct pt_regs *regs, int flag)
{ {
regs->flags &= ~(1U << flag); regs->flags &= ~(1UL << flag);
} }
static inline int test_pt_regs_flag(struct pt_regs *regs, int flag) static inline int test_pt_regs_flag(struct pt_regs *regs, int flag)
{ {
return !!(regs->flags & (1U << flag)); return !!(regs->flags & (1UL << flag));
} }
/* /*