diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.com> | 2015-10-19 18:14:39 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.com> | 2015-10-22 12:00:06 -0200 |
| commit | c2c904ffd3bef6270746cacde403c29dbfa60a4d (patch) | |
| tree | 46dbedfaf1828dfd1edaba1a31e00712a166c5d3 | |
| parent | 751709fec943a853c2543eb6f7995cae723f7b78 (diff) | |
| download | glibc-c2c904ffd3bef6270746cacde403c29dbfa60a4d.tar.gz glibc-c2c904ffd3bef6270746cacde403c29dbfa60a4d.tar.xz glibc-c2c904ffd3bef6270746cacde403c29dbfa60a4d.zip | |
Cleanup sync_file_range implementation
Since GLIBC requires a minimum 2.6.32 kernel, the patch cleanups the mips code to assume __NR_sync_file_range and the powerpc one to either assume __NR_sync_file_range2 or __NR_sync_file_range. Checked on powerpc64le and build for mips (ABIO32, ABIN32, and ABI64). * sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c (__NR_sync_file_range2): Assume it is always defined. * sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c (__NR_sync_file_range): Assume it is always defined.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c | 11 |
3 files changed, 7 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index 6160f177a9..b4bb023858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-10-22 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c + (__NR_sync_file_range2): Assume it is always defined. + * sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c + (__NR_sync_file_range): Assume it is always defined. + 2015-10-22 Andreas Schwab <schwab@suse.de> * sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat): Use diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c b/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c index b79e44d0eb..0d851682d6 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c +++ b/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c @@ -23,8 +23,6 @@ #include <sysdep-cancel.h> #include <sys/syscall.h> - -#ifdef __NR_sync_file_range int sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) { @@ -33,12 +31,3 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) __LONG_LONG_PAIR ((long) (to >> 32), (long) to), flags); } -#else -int -sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) -{ - __set_errno (ENOSYS); - return -1; -} -stub_warning (sync_file_range) -#endif diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c index 9f46458581..92245f9631 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c @@ -23,19 +23,8 @@ #include <sysdep-cancel.h> #include <sys/syscall.h> - -#if defined __NR_sync_file_range2 int sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) { return SYSCALL_CANCEL (sync_file_range2, fd, flags, from, to); } -#else -int -sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) -{ - __set_errno (ENOSYS); - return -1; -} -stub_warning (sync_file_range) -#endif |