From: Julian Seward Date: Sun, 23 Nov 2014 12:30:23 +0000 (+0000) Subject: Merge, from trunk, r14631 X-Git-Tag: svn/VALGRIND_3_10_1~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dd6291e3717534c651a6f25e8de4c86eb154535;p=thirdparty%2Fvalgrind.git Merge, from trunk, r14631 14631 Enable sys_fadvise64_64 on arm32. git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14754 --- diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c index b2ba414f6b..baa6380f27 100644 --- a/coregrind/m_syswrap/syswrap-arm-linux.c +++ b/coregrind/m_syswrap/syswrap-arm-linux.c @@ -1088,7 +1088,6 @@ static SyscallTableEntry syscall_main_table[] = { LINX_(__NR_tgkill, sys_tgkill), // 270 */Linux GENX_(__NR_utimes, sys_utimes), // 271 -// LINX_(__NR_fadvise64_64, sys_fadvise64_64), // 272 */(Linux?) GENX_(__NR_vserver, sys_ni_syscall), // 273 LINX_(__NR_mbind, sys_mbind), // 274 ?/? @@ -1189,6 +1188,8 @@ static SyscallTableEntry syscall_main_table[] = { // correspond to what's in include/vki/vki-scnums-arm-linux.h. // From here onwards, please ensure the numbers are correct. + LINX_(__NR_arm_fadvise64_64, sys_fadvise64_64), // 270 */(Linux?) + LINX_(__NR_pselect6, sys_pselect6), // 335 LINXY(__NR_ppoll, sys_ppoll), // 336