mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-16 05:26:07 +00:00
Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git
This commit is contained in:
commit
11c3a74fd1
@ -45,8 +45,8 @@ static inline void csky_cmpxchg_fixup(struct pt_regs *regs)
|
|||||||
if (trap_no(regs) != VEC_TLBMODIFIED)
|
if (trap_no(regs) != VEC_TLBMODIFIED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (instruction_pointer(regs) == csky_cmpxchg_stw)
|
if (instruction_pointer(regs) == (unsigned long)&csky_cmpxchg_stw)
|
||||||
instruction_pointer_set(regs, csky_cmpxchg_ldw);
|
instruction_pointer_set(regs, (unsigned long)&csky_cmpxchg_ldw);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user