Skip to content

Commit b67eeff

Browse files
committed
Merge tag 'mips-fixes_6.10_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer: - fix lseek in o32 compat mode - fix for microMIPS MT ASE helpers * tag 'mips-fixes_6.10_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: mips: fix compat_sys_lseek syscall MIPS: mipsmtregs: Fix target register for MFTC0
2 parents b9e6612 + 0d5679a commit b67eeff

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/mips/include/asm/mipsmtregs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ static inline void ehb(void)
322322
" .set push \n" \
323323
" .set "MIPS_ISA_LEVEL" \n" \
324324
_ASM_SET_MFTC0 \
325-
" mftc0 $1, " #rt ", " #sel " \n" \
325+
" mftc0 %0, " #rt ", " #sel " \n" \
326326
_ASM_UNSET_MFTC0 \
327327
" .set pop \n" \
328328
: "=r" (__res)); \

arch/mips/kernel/syscalls/syscall_o32.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
17 o32 break sys_ni_syscall
2828
# 18 was sys_stat
2929
18 o32 unused18 sys_ni_syscall
30-
19 o32 lseek sys_lseek
30+
19 o32 lseek sys_lseek compat_sys_lseek
3131
20 o32 getpid sys_getpid
3232
21 o32 mount sys_mount
3333
22 o32 umount sys_oldumount

0 commit comments

Comments
 (0)