From owner-svn-src-head@freebsd.org Mon Oct 30 08:56:06 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48BFEE57C09; Mon, 30 Oct 2017 08:56:06 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15DA37E5E6; Mon, 30 Oct 2017 08:56:06 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U8u5ms061416; Mon, 30 Oct 2017 08:56:05 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U8u51Z061414; Mon, 30 Oct 2017 08:56:05 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201710300856.v9U8u51Z061414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 30 Oct 2017 08:56:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325134 - in head: libexec/rtld-elf sbin/ldconfig X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head: libexec/rtld-elf sbin/ldconfig X-SVN-Commit-Revision: 325134 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:56:06 -0000 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;