Commit 5f95063c authored May 15, 2016 by Linus Torvalds

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
 "Just the missing compat entry for the new pread/writev2"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Use compat version for preadv2 and pwritev2

parents 272911b8 9a7a076e

arch/x86/entry/syscalls/syscall_32.tbl

+2 −2

Original line number	Diff line number	Diff line
		@@ -384,5 +384,5 @@
		375 i386 membarrier sys_membarrier
		376 i386 mlock2 sys_mlock2
		377 i386 copy_file_range sys_copy_file_range
		378 i386 preadv2 sys_preadv2
		379 i386 pwritev2 sys_pwritev2
		378 i386 preadv2 sys_preadv2 compat_sys_preadv2
		379 i386 pwritev2 sys_pwritev2 compat_sys_pwritev2