Skip to content

Commit 204f144

Browse files
torvaldstorvalds
committed
Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull fs/compat.c cleanups from Al Viro: "More moving of compat syscalls from fs/compat.c to fs/*.c where the native counterparts live. And death to compat_sys_getdents64() - the only architecture that used to need it was ia64, and _that_ has lost biarch support quite a few years ago" * 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs/compat.c: trim unused includes move compat_rw_copy_check_uvector() over to fs/read_write.c fhandle: move compat syscalls from compat.c open: move compat syscalls from compat.c stat: move compat syscalls from compat.c fcntl: move compat syscalls from compat.c readdir: move compat syscalls from compat.c statfs: move compat syscalls from compat.c utimes: move compat syscalls from compat.c move compat select-related syscalls to fs/select.c Remove compat_sys_getdents64()
2 parents da7b66f + 801b25f commit 204f144

18 files changed

Lines changed: 1139 additions & 1267 deletions

File tree

‎arch/arm64/include/asm/unistd.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616
#ifdef CONFIG_COMPAT
17-
#define __ARCH_WANT_COMPAT_SYS_GETDENTS64
1817
#define __ARCH_WANT_COMPAT_STAT64
1918
#define __ARCH_WANT_SYS_GETHOSTNAME
2019
#define __ARCH_WANT_SYS_PAUSE

‎arch/arm64/include/asm/unistd32.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ __SYSCALL(__NR_setfsuid32, sys_setfsuid)
456456
#define __NR_setfsgid32 216
457457
__SYSCALL(__NR_setfsgid32, sys_setfsgid)
458458
#define __NR_getdents64 217
459-
__SYSCALL(__NR_getdents64, compat_sys_getdents64)
459+
__SYSCALL(__NR_getdents64, sys_getdents64)
460460
#define __NR_pivot_root 218
461461
__SYSCALL(__NR_pivot_root, sys_pivot_root)
462462
#define __NR_mincore 219

‎arch/x86/entry/syscalls/syscall_32.tbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
217 i386 pivot_root sys_pivot_root
227227
218 i386 mincore sys_mincore
228228
219 i386 madvise sys_madvise
229-
220 i386 getdents64 sys_getdents64 compat_sys_getdents64
229+
220 i386 getdents64 sys_getdents64
230230
221 i386 fcntl64 sys_fcntl64 compat_sys_fcntl64
231231
# 222 is unused
232232
# 223 is unused

‎arch/x86/include/asm/unistd.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
# include <asm/unistd_64.h>
2424
# include <asm/unistd_64_x32.h>
2525
# define __ARCH_WANT_COMPAT_SYS_TIME
26-
# define __ARCH_WANT_COMPAT_SYS_GETDENTS64
2726
# define __ARCH_WANT_COMPAT_SYS_PREADV64
2827
# define __ARCH_WANT_COMPAT_SYS_PWRITEV64
2928
# define __ARCH_WANT_COMPAT_SYS_PREADV64V2

0 commit comments

Comments
 (0)