Author: trasz
Date: Mon Oct 30 08:56:04 2017
New Revision: 325134
URL: https://svnweb.freebsd.org/changeset/base/325134
Log:
Use MAP_PRIVATE instead of obsolete MAP_COPY. No functional changes.
MFC after: 2 weeks
Modified:
head/libexec/rtld-elf/malloc.c
head/sbin/ldconfig/ldconfig.c
Modified: head/libexec/rtld-elf/malloc.c
==============================================================================
--- head/libexec/rtld-elf/malloc.c Mon Oct 30 08:55:10 2017
(r325133)
+++ head/libexec/rtld-elf/malloc.c Mon Oct 30 08:56:04 2017
(r325134)
@@ -479,7 +479,7 @@ int n;
if ((pagepool_start = mmap(0, n * pagesz,
PROT_READ|PROT_WRITE,
- MAP_ANON|MAP_COPY, fd, 0)) == (caddr_t)-1) {
+ MAP_ANON|MAP_PRIVATE, fd, 0)) == (caddr_t)-1) {
rtld_printf("Cannot map anonymous memory\n");
return 0;
}
Modified: head/sbin/ldconfig/ldconfig.c
==============================================================================
--- head/sbin/ldconfig/ldconfig.c Mon Oct 30 08:55:10 2017
(r325133)
+++ head/sbin/ldconfig/ldconfig.c Mon Oct 30 08:56:04 2017
(r325134)
@@ -550,7 +550,7 @@ readhints(void)
}
msize = PAGE_SIZE;
- addr = mmap(0, msize, PROT_READ, MAP_COPY, fd, 0);
+ addr = mmap(0, msize, PROT_READ, MAP_PRIVATE, fd, 0);
if (addr == MAP_FAILED) {
warn("%s", hints_file);
@@ -573,7 +573,7 @@ readhints(void)
if (hdr->hh_ehints > msize) {
fsize = hdr->hh_ehints;
munmap(addr, msize);
- addr = mmap(0, fsize, PROT_READ, MAP_COPY, fd, 0);
+ addr = mmap(0, fsize, PROT_READ, MAP_PRIVATE, fd, 0);
if (addr == MAP_FAILED) {
warn("%s", hints_file);
return -1;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
