Commit 204f144c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents da7b66ff 801b25f1

arch/arm64/include/asm/unistd.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifdef CONFIG_COMPAT

#define __ARCH_WANT_COMPAT_SYS_GETDENTS64

#define __ARCH_WANT_COMPAT_STAT64

#define __ARCH_WANT_SYS_GETHOSTNAME

#define __ARCH_WANT_SYS_PAUSE

arch/arm64/include/asm/unistd32.h

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ __SYSCALL(__NR_setfsuid32, sys_setfsuid) 
#define __NR_setfsgid32 216

__SYSCALL(__NR_setfsgid32, sys_setfsgid)

#define __NR_getdents64 217

__SYSCALL(__NR_getdents64, compat_sys_getdents64)

__SYSCALL(__NR_getdents64, sys_getdents64)

#define __NR_pivot_root 218

__SYSCALL(__NR_pivot_root, sys_pivot_root)

#define __NR_mincore 219

arch/x86/entry/syscalls/syscall_32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 
217	i386	pivot_root		sys_pivot_root

218	i386	mincore			sys_mincore

219	i386	madvise			sys_madvise

220	i386	getdents64		sys_getdents64			compat_sys_getdents64

220	i386	getdents64		sys_getdents64

221	i386	fcntl64			sys_fcntl64			compat_sys_fcntl64

# 222 is unused

# 223 is unused

arch/x86/include/asm/unistd.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#  include <asm/unistd_64.h>

#  include <asm/unistd_64_x32.h>

#  define __ARCH_WANT_COMPAT_SYS_TIME

#  define __ARCH_WANT_COMPAT_SYS_GETDENTS64

#  define __ARCH_WANT_COMPAT_SYS_PREADV64

#  define __ARCH_WANT_COMPAT_SYS_PWRITEV64

#  define __ARCH_WANT_COMPAT_SYS_PREADV64V2

fs/compat.c

+0 −1191

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE