Commit b67eeff7 authored by Linus Torvalds's avatar Linus Torvalds

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
parents b9e6612d 0d5679a0
...@@ -322,7 +322,7 @@ static inline void ehb(void) ...@@ -322,7 +322,7 @@ static inline void ehb(void)
" .set push \n" \ " .set push \n" \
" .set "MIPS_ISA_LEVEL" \n" \ " .set "MIPS_ISA_LEVEL" \n" \
_ASM_SET_MFTC0 \ _ASM_SET_MFTC0 \
" mftc0 $1, " #rt ", " #sel " \n" \ " mftc0 %0, " #rt ", " #sel " \n" \
_ASM_UNSET_MFTC0 \ _ASM_UNSET_MFTC0 \
" .set pop \n" \ " .set pop \n" \
: "=r" (__res)); \ : "=r" (__res)); \
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
17 o32 break sys_ni_syscall 17 o32 break sys_ni_syscall
# 18 was sys_stat # 18 was sys_stat
18 o32 unused18 sys_ni_syscall 18 o32 unused18 sys_ni_syscall
19 o32 lseek sys_lseek 19 o32 lseek sys_lseek compat_sys_lseek
20 o32 getpid sys_getpid 20 o32 getpid sys_getpid
21 o32 mount sys_mount 21 o32 mount sys_mount
22 o32 umount sys_oldumount 22 o32 umount sys_oldumount
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment