diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-04 22:52:26 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-04 22:52:26 +0000 |
| commit | 005d20f04dff3665c9533417bdad06d7d208bf9a (patch) | |
| tree | bfe0aa8c46149f67794cd45a4fdb259c57b521cf /include/sys/mman.h | |
| parent | d8059900ddf188607828b12a174b83decade3d61 (diff) | |
Sync up w/ glibc
Diffstat (limited to 'include/sys/mman.h')
| -rw-r--r-- | include/sys/mman.h | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/include/sys/mman.h b/include/sys/mman.h index a0ac6f981..587dff60d 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -1,5 +1,5 @@ /* Definitions for BSD-style memory management. - Copyright (C) 1994-1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1994-2000, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -60,9 +60,9 @@ extern void *mmap (void *__addr, size_t __len, int __prot, #else # ifdef __REDIRECT extern void * __REDIRECT (mmap, - (void *__addr, size_t __len, int __prot, - int __flags, int __fd, __off64_t __offset) __THROW, - mmap64); + (void *__addr, size_t __len, int __prot, + int __flags, int __fd, __off64_t __offset), + mmap64); # else # define mmap mmap64 # endif @@ -83,8 +83,11 @@ extern int mprotect (void *__addr, size_t __len, int __prot) __THROW; /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are - unpredictable before this is done. Flags are from the MS_* set. */ -extern int msync (void *__addr, size_t __len, int __flags) __THROW; + unpredictable before this is done. Flags are from the MS_* set. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern int msync (void *__addr, size_t __len, int __flags); #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows @@ -96,7 +99,7 @@ extern int madvise (void *__addr, size_t __len, int __advice) __THROW; extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW; #endif -#if defined __ARCH_HAS_MMU__ +#ifdef __ARCH_HAS_MMU__ /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to be memory resident. */ extern int mlock (__const void *__addr, size_t __len) __THROW; @@ -126,7 +129,15 @@ extern void *mremap (void *__addr, size_t __old_len, size_t __new_len, The status is returned in a vector of bytes. The least significant bit of each byte is 1 if the referenced page is in memory, otherwise it is zero. */ -extern int mincore (void *__start, size_t __len, unsigned char *__vec); +extern int mincore (void *__start, size_t __len, unsigned char *__vec) + __THROW; + +#if 0 +/* Remap arbitrary pages of a shared backing store within an existing + VMA. */ +extern int remap_file_pages (void *__start, size_t __size, int __prot, + size_t __pgoff, int __flags) __THROW; +#endif #endif |