diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-12-07 21:56:24 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-12-07 21:56:24 +0000 |
| commit | be8f016b3dda04aed8f271840afb6a2054fa2f5a (patch) | |
| tree | 4eda6cc3170214057f2d5e33eee8795634501ec5 /ports/sysdeps/unix/sysv/linux | |
| parent | fb0265684ef7d202acf7f26152909d2adf94575d (diff) | |
| download | eglibc2-be8f016b3dda04aed8f271840afb6a2054fa2f5a.tar.gz | |
Merge changes between r9378 and r9423 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@9424 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'ports/sysdeps/unix/sysv/linux')
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h | 2 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h | 22 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h index 710bace21..1e716438d 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h @@ -210,7 +210,7 @@ extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count) /* Selective file content synch'ing. */ -extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to, +extern int sync_file_range (int __fd, __off64_t __offset, __off64_t __count, unsigned int __flags); diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h index 2f0e56491..3c205f8b8 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h @@ -1,5 +1,6 @@ /* Definitions for POSIX memory map interface. Linux/Alpha version. - Copyright (C) 1997, 1998, 2000, 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2000, 2003, 2006, 2009 + 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 @@ -91,14 +92,17 @@ /* Advice to `madvise'. */ #ifdef __USE_BSD -# define MADV_NORMAL 0 /* No further special treatment. */ -# define MADV_RANDOM 1 /* Expect random page references. */ -# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */ -# define MADV_WILLNEED 3 /* Will need these pages. */ -# define MADV_DONTNEED 6 /* Don't need these pages. */ -# define MADV_REMOVE 9 /* Remove these pages and resources. */ -# define MADV_DONTFORK 10 /* Do not inherit across fork. */ -# define MADV_DOFORK 11 /* Do inherit across fork. */ +# define MADV_NORMAL 0 /* No further special treatment. */ +# define MADV_RANDOM 1 /* Expect random page references. */ +# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */ +# define MADV_WILLNEED 3 /* Will need these pages. */ +# define MADV_DONTNEED 6 /* Don't need these pages. */ +# define MADV_REMOVE 9 /* Remove these pages and resources. */ +# define MADV_DONTFORK 10 /* Do not inherit across fork. */ +# define MADV_DOFORK 11 /* Do inherit across fork. */ +# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */ +# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */ +# define MADV_HWPOISON 100 /* Poison a page for testing. */ #endif /* The POSIX people had to invent similar names for the same things. */ diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h index 42748be76..0aaabe295 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h @@ -41,7 +41,7 @@ Use neat tidy anonymous unions and structures when possible. */ -#ifdef __USE_MISC +#if defined __USE_MISC || defined __USE_XOPEN2K8 # if __GNUC_PREREQ(3,3) # define __ST_TIME(X) \ __extension__ union { \ |