diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-10-21 16:17:16 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-10-21 16:17:16 +0300 |
| commit | ded7c4eb0028518f05bb4ebfa3e617169730d658 (patch) | |
| tree | 4f4970b070a2240354f8d640418385f0043bf84c | |
| parent | b01ba1daf4b36ff92a96415075dcb2e3cb7c2fb7 (diff) | |
| download | illumos-packaging-ded7c4eb0028518f05bb4ebfa3e617169730d658.tar.gz | |
sys/mman.h expose memcntl()
| -rw-r--r-- | uts/debian/changelog | 8 | ||||
| -rw-r--r-- | uts/debian/patches/series | 2 | ||||
| -rw-r--r-- | uts/debian/patches/sys_mman.h.patch (renamed from uts/debian/patches/sys_mman.h-bsd_source.patch) | 12 |
3 files changed, 19 insertions, 3 deletions
diff --git a/uts/debian/changelog b/uts/debian/changelog index 99dc54b..50e4ef1 100644 --- a/uts/debian/changelog +++ b/uts/debian/changelog @@ -1,3 +1,11 @@ +uts (5.10.18.git.2a44663-1) UNRELEASED; urgency=medium + + * sys/mman.h: expose memcntl, renamed: + debian/patches/sys_mman.h-bsd_source.patch -> + debian/patches/sys_mman.h.patch + + -- Igor Pashev <pashev.igor@gmail.com> Wed, 21 Oct 2015 16:15:41 +0300 + uts (5.10.18.git.2a44663-0.1) unstable; urgency=medium * Here we go! diff --git a/uts/debian/patches/series b/uts/debian/patches/series index 36c661e..a7acf6b 100644 --- a/uts/debian/patches/series +++ b/uts/debian/patches/series @@ -36,7 +36,7 @@ add-loff_t.patch add-MIN-MAX.patch dyson-nobody-uid-is-65534.patch sysmacros-gnu-compat.patch -sys_mman.h-bsd_source.patch +sys_mman.h.patch boolean_t-guard.patch sys_types.h-includes-features.h.patch msghdr-xpg42.patch diff --git a/uts/debian/patches/sys_mman.h-bsd_source.patch b/uts/debian/patches/sys_mman.h.patch index b69681b..f6e094f 100644 --- a/uts/debian/patches/sys_mman.h-bsd_source.patch +++ b/uts/debian/patches/sys_mman.h.patch @@ -2,7 +2,15 @@ Index: uts/usr/src/uts/common/sys/mman.h =================================================================== --- uts.orig/usr/src/uts/common/sys/mman.h +++ uts/usr/src/uts/common/sys/mman.h -@@ -238,6 +238,9 @@ extern int munlock(const void *, size_t) +@@ -230,6 +230,7 @@ extern int munmap(void *, size_t); + extern int mprotect(void *, size_t, int); + extern int msync(void *, size_t, int); + #if (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2)) || defined(__EXTENSIONS__) ++extern int memcntl(void *, size_t, int, void *, int, int); + extern int mlock(const void *, size_t); + extern int munlock(const void *, size_t); + #endif /* (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2))... */ +@@ -238,6 +239,9 @@ extern int munlock(const void *, size_t) !defined(__PRAGMA_REDEFINE_EXTNAME)) extern void *mmap64(void *, size_t, int, int, int, off64_t); #endif /* _LARGEFILE64_SOURCE... */ @@ -12,7 +20,7 @@ Index: uts/usr/src/uts/common/sys/mman.h #else /* (_POSIX_C_SOURCE > 2) || defined(_XPG4_2) */ extern caddr_t mmap(caddr_t, size_t, int, int, int, off_t); extern int munmap(caddr_t, size_t); -@@ -302,7 +305,7 @@ struct memcntl_mha32 { +@@ -302,7 +306,7 @@ struct memcntl_mha32 { #endif /* !defined(_ASM) */ #endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */ |