From owner-svn-src-head@freebsd.org Wed Aug 3 06:33:07 2016 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 08356BAB519; Wed, 3 Aug 2016 06:33:07 +0000 (UTC) (envelope-from ed@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 772641BF5; Wed, 3 Aug 2016 06:33:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u736X4pn032807; Wed, 3 Aug 2016 06:33:04 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u736X4N3032803; Wed, 3 Aug 2016 06:33:04 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201608030633.u736X4N3032803@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Wed, 3 Aug 2016 06:33:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303699 - in head: lib/libc/sys sys/compat/freebsd32 sys/kern sys/sys X-SVN-Group: head 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.22 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: Wed, 03 Aug 2016 06:33:07 -0000 Author: ed Date: Wed Aug 3 06:33:04 2016 New Revision: 303699 URL: https://svnweb.freebsd.org/changeset/base/303699 Log: mprotect(): Change prototype to comply to POSIX. Our mprotect() function seems to take a "const void *" address to the pages whose permissions need to be adjusted. POSIX uses "void *". Simply stick to the POSIX one to prevent us from writing unportable code. PR: 211423 (exp-run) Tested by: antoine@ (Thanks!) Modified: head/lib/libc/sys/mprotect.2 head/sys/compat/freebsd32/syscalls.master head/sys/kern/syscalls.master head/sys/sys/mman.h Modified: head/lib/libc/sys/mprotect.2 ============================================================================== --- head/lib/libc/sys/mprotect.2 Wed Aug 3 06:32:44 2016 (r303698) +++ head/lib/libc/sys/mprotect.2 Wed Aug 3 06:33:04 2016 (r303699) @@ -28,7 +28,7 @@ .\" @(#)mprotect.2 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd June 9, 1993 +.Dd August 3, 2016 .Dt MPROTECT 2 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .In sys/mman.h .Ft int -.Fn mprotect "const void *addr" "size_t len" "int prot" +.Fn mprotect "void *addr" "size_t len" "int prot" .Sh DESCRIPTION The .Fn mprotect Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Wed Aug 3 06:32:44 2016 (r303698) +++ head/sys/compat/freebsd32/syscalls.master Wed Aug 3 06:33:04 2016 (r303699) @@ -174,7 +174,7 @@ 72 AUE_O_VADVISE NOPROTO { int ovadvise(int anom); } vadvise \ ovadvise_args int 73 AUE_MUNMAP NOPROTO { int munmap(void *addr, size_t len); } -74 AUE_MPROTECT STD { int freebsd32_mprotect(const void *addr, \ +74 AUE_MPROTECT STD { int freebsd32_mprotect(void *addr, \ size_t len, int prot); } 75 AUE_MADVISE NOPROTO { int madvise(void *addr, size_t len, \ int behav); } Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Wed Aug 3 06:32:44 2016 (r303698) +++ head/sys/kern/syscalls.master Wed Aug 3 06:33:04 2016 (r303699) @@ -175,7 +175,7 @@ 72 AUE_O_VADVISE STD { int ovadvise(int anom); } vadvise \ ovadvise_args int 73 AUE_MUNMAP STD { int munmap(void *addr, size_t len); } -74 AUE_MPROTECT STD { int mprotect(const void *addr, size_t len, \ +74 AUE_MPROTECT STD { int mprotect(void *addr, size_t len, int prot); } 75 AUE_MADVISE STD { int madvise(void *addr, size_t len, \ int behav); } Modified: head/sys/sys/mman.h ============================================================================== --- head/sys/sys/mman.h Wed Aug 3 06:32:44 2016 (r303698) +++ head/sys/sys/mman.h Wed Aug 3 06:33:04 2016 (r303699) @@ -258,7 +258,7 @@ int mlock(const void *, size_t); #define _MMAP_DECLARED void * mmap(void *, size_t, int, int, int, off_t); #endif -int mprotect(const void *, size_t, int); +int mprotect(void *, size_t, int); int msync(void *, size_t, int); int munlock(const void *, size_t); int munmap(void *, size_t);