diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-15 08:07:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-15 08:07:35 -0700 |
| commit | 5f95063c686a86e7214988e04f08b9c0003cf83f (patch) | |
| tree | 43b4c4761f8a88a2efd9224a9ea0310c67a07624 | |
| parent | 272911b889f47aa5bc3e004804fc2382f0ac6ce6 (diff) | |
| parent | 9a7a076e8e4ffcfec05e3cafe4c4e31d41ddbaa0 (diff) | |
| download | linux-5f95063c686a86e7214988e04f08b9c0003cf83f.tar.gz linux-5f95063c686a86e7214988e04f08b9c0003cf83f.tar.bz2 linux-5f95063c686a86e7214988e04f08b9c0003cf83f.zip | |
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
| -rw-r--r-- | arch/x86/entry/syscalls/syscall_32.tbl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index b30dd8154cc2..4cddd17153fb 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -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 |