]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
csky: fix csky_cmpxchg_fixup not working
authorYang Li <yang.li85200@gmail.com>
Wed, 16 Oct 2024 09:56:26 +0000 (17:56 +0800)
committerGuo Ren (Alibaba DAMO Academy) <guoren@kernel.org>
Sun, 19 Oct 2025 06:42:40 +0000 (02:42 -0400)
In the csky_cmpxchg_fixup function, it is incorrect to use the global
variable csky_cmpxchg_stw to determine the address where the exception
occurred.The global variable csky_cmpxchg_stw stores the opcode at the
time of the exception, while &csky_cmpxchg_stw shows the address where
the exception occurred.

Signed-off-by: Yang Li <yang.li85200@gmail.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
arch/csky/mm/fault.c

index a6ca7dff421532086cb0987b187ec86cf9243076..7ff4011089850044717d4de9aee67699dd7da711 100644 (file)
@@ -45,8 +45,8 @@ static inline void csky_cmpxchg_fixup(struct pt_regs *regs)
        if (trap_no(regs) != VEC_TLBMODIFIED)
                return;
 
-       if (instruction_pointer(regs) == csky_cmpxchg_stw)
-               instruction_pointer_set(regs, csky_cmpxchg_ldw);
+       if (instruction_pointer(regs) == (unsigned long)&csky_cmpxchg_stw)
+               instruction_pointer_set(regs, (unsigned long)&csky_cmpxchg_ldw);
        return;
 }
 #endif