csky: fix csky_cmpxchg_fixup not working

[ Upstream commit 809ef03d6d21d5fea016bbf6babeec462e37e68c ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c
index 7215a46b6b8eb8ee4fe81b781decafa75064b4e1..98699fdeeeb54cb8a14a0a0c0a85c41f610cb836 100644 (file)
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
@@ -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