Unverified Commit e4b74a43 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5621 irqchip/gic-v3: Fix a system stall when using pseudo NMI with CONFIG_ARM64_NMI closed 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjie Ruan <ruanjinjie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AUXUIYTZFJIQMOOLABA2GWN2W3LNDHDD/ 
 
https://gitee.com/openeuler/kernel/issues/I9CHAE 
 
Link:https://gitee.com/openeuler/kernel/pulls/5621

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 398d8373 f7cea6fe

arch/arm64/include/asm/ptrace.h

+2 −3
Original line number Diff line number Diff line
@@ -244,11 +244,10 @@ static inline void forget_syscall(struct pt_regs *regs) 
		true)



#define interrupts_enabled(regs)			\

	(!((regs)->pstate & PSR_ALLINT_BIT) && !((regs)->pstate & PSR_I_BIT) && \

	 irqs_priority_unmasked(regs))

	(!((regs)->pstate & PSR_I_BIT) && irqs_priority_unmasked(regs))



#define fast_interrupts_enabled(regs) \

	(!((regs)->pstate & PSR_ALLINT_BIT) && !(regs)->pstate & PSR_F_BIT)

	(!(regs)->pstate & PSR_F_BIT)



static inline unsigned long user_stack_pointer(struct pt_regs *regs)

{

arch/arm64/include/uapi/asm/ptrace.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#define PSR_D_BIT	0x00000200

#define PSR_BTYPE_MASK	0x00000c00

#define PSR_SSBS_BIT	0x00001000

#define PSR_ALLINT_BIT	0x00002000

#define PSR_PAN_BIT	0x00400000

#define PSR_UAO_BIT	0x00800000

#define PSR_DIT_BIT	0x01000000