diff options
| author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2019-02-20 19:07:12 +0100 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2019-03-13 11:37:29 -0400 |
| commit | 4b125dd408d54487dc8843b9553502aa0c4167f8 (patch) | |
| tree | 548fc74ef23bf3c918d7fd1e4dd9257f01774108 | |
| parent | 81221e13f93171508ec6f66f3c9c3ac439c6acd2 (diff) | |
| download | musl-4b125dd408d54487dc8843b9553502aa0c4167f8.tar.gz musl-4b125dd408d54487dc8843b9553502aa0c4167f8.tar.xz musl-4b125dd408d54487dc8843b9553502aa0c4167f8.zip | |
fix POSIX_FADV_DONTNEED/_NOREUSE on s390x
On s390x, POSIX_FADV_DONTNEED and POSIX_FADV_NOREUSE have different values than on all other architectures that Linux supports. Handle this difference by wrapping their definitions in include/fcntl.h in #ifdef, so that arch/s390x/bits/fcntl.h can override them.
| -rw-r--r-- | arch/s390x/bits/fcntl.h | 3 | ||||
| -rw-r--r-- | include/fcntl.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390x/bits/fcntl.h b/arch/s390x/bits/fcntl.h index 1eca6ba5..a231efb4 100644 --- a/arch/s390x/bits/fcntl.h +++ b/arch/s390x/bits/fcntl.h @@ -38,3 +38,6 @@ #define F_GETOWN_EX 16 #define F_GETOWNER_UIDS 17 + +#define POSIX_FADV_DONTNEED 6 +#define POSIX_FADV_NOREUSE 7 diff --git a/include/fcntl.h b/include/fcntl.h index 4d91338b..f6c192f5 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -66,8 +66,10 @@ int posix_fallocate(int, off_t, off_t); #define POSIX_FADV_RANDOM 1 #define POSIX_FADV_SEQUENTIAL 2 #define POSIX_FADV_WILLNEED 3 +#ifndef POSIX_FADV_DONTNEED #define POSIX_FADV_DONTNEED 4 #define POSIX_FADV_NOREUSE 5 +#endif #undef SEEK_SET #undef SEEK_CUR |