diff options
| author | Roger A. Faulkner <Roger.Faulkner@Sun.COM> | 2009-03-25 17:21:37 -0700 |
|---|---|---|
| committer | Roger A. Faulkner <Roger.Faulkner@Sun.COM> | 2009-03-25 17:21:37 -0700 |
| commit | 09ce0d4acf1a79c720d7e54b60e87cbfa0f1b2d6 (patch) | |
| tree | 93c46b6617bd292c19e8b839ab1233af69b7dfc5 /usr/src/lib/libc/common/sys | |
| parent | 7a088f03b431bdffa96c3b2175964d4d38420caa (diff) | |
| download | illumos-joyent-09ce0d4acf1a79c720d7e54b60e87cbfa0f1b2d6.tar.gz | |
6816409 mutex_lock() for process robust mutex could not return EOWNERDEAD with 137111-01 or later
--HG--
rename : usr/src/lib/libc/common/sys/mmap.s => usr/src/lib/libc/common/sys/__mmap.s
rename : usr/src/lib/libc/common/sys/munmap.s => usr/src/lib/libc/common/sys/__munmap.s
Diffstat (limited to 'usr/src/lib/libc/common/sys')
| -rw-r--r-- | usr/src/lib/libc/common/sys/__mmap.s (renamed from usr/src/lib/libc/common/sys/mmap.s) | 28 | ||||
| -rw-r--r-- | usr/src/lib/libc/common/sys/__munmap.s (renamed from usr/src/lib/libc/common/sys/munmap.s) | 20 |
2 files changed, 20 insertions, 28 deletions
diff --git a/usr/src/lib/libc/common/sys/mmap.s b/usr/src/lib/libc/common/sys/__mmap.s index 4175283eb8..62fd93e7ce 100644 --- a/usr/src/lib/libc/common/sys/mmap.s +++ b/usr/src/lib/libc/common/sys/__mmap.s @@ -20,22 +20,14 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - .file "mmap.s" - -#include <sys/asm_linkage.h> - -#if !defined(_LARGEFILE_SOURCE) - ANSI_PRAGMA_WEAK(mmap,function) -#else - ANSI_PRAGMA_WEAK(mmap64,function) -#endif + .file "__mmap.s" #include "SYS.h" #include <sys/mman.h> /* Need _MAP_NEW definition */ @@ -43,12 +35,12 @@ #if !defined(_LARGEFILE_SOURCE) /* - * C library -- mmap - * caddr_t mmap(caddr_t addr, size_t len, int prot, + * Raw system call, private to libc: + * caddr_t __mmap(caddr_t addr, size_t len, int prot, * int flags, int fd, off_t off) */ - ENTRY(mmap) + ENTRY(__mmap) #if defined(__sparc) /* this depends upon the _MAP_NEW flag being in the top bits */ sethi %hi(_MAP_NEW), %g1 @@ -57,17 +49,17 @@ SYSTRAP_RVAL1(mmap) SYSCERROR RET - SET_SIZE(mmap) + SET_SIZE(__mmap) #else /* - * C library -- mmap64 - * caddr_t mmap64(caddr_t addr, size_t len, int prot, + * Raw system call, private to libc: + * caddr_t __mmap64(caddr_t addr, size_t len, int prot, * int flags, int fd, off64_t off) */ - ENTRY(mmap64) + ENTRY(__mmap64) #if defined(__sparc) /* this depends upon the _MAP_NEW flag being in the top bits */ sethi %hi(_MAP_NEW), %g1 @@ -76,6 +68,6 @@ SYSTRAP_RVAL1(mmap64) SYSCERROR RET - SET_SIZE(mmap64) + SET_SIZE(__mmap64) #endif diff --git a/usr/src/lib/libc/common/sys/munmap.s b/usr/src/lib/libc/common/sys/__munmap.s index 2ea70a1454..7aae4de151 100644 --- a/usr/src/lib/libc/common/sys/munmap.s +++ b/usr/src/lib/libc/common/sys/__munmap.s @@ -20,24 +20,24 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ - .file "munmap.s" + .file "__munmap.s" -/* C library -- munmap */ -/* int munmap(caddr_t addr, size_t len) */ - -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(munmap,function) +/* + * Raw system call: + * int __munmap(caddr_t addr, size_t len) + */ #include "SYS.h" - SYSCALL_RVAL1(munmap) + ENTRY(__munmap) + SYSTRAP_RVAL1(munmap) + SYSCERROR RETC - SET_SIZE(munmap) + SET_SIZE(__munmap) |