Use <bits/mman.h> on ia64

This commit is contained in:
Andreas Jaeger 2013-03-11 19:56:44 +01:00
parent 3ad6c54707
commit a0f487b2af
2 changed files with 7 additions and 74 deletions

View File

@ -1,3 +1,8 @@
2013-03-11 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/ia64/bits/mman.h: Remove all defines
provided by bits/mman-linux.h and include <bits/mman-linux.h>.
2013-03-10 Mike Frysinger <vapier@gentoo.org> 2013-03-10 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/ia64/makecontext.c (__makecontext): Change * sysdeps/unix/sysv/linux/ia64/makecontext.c (__makecontext): Change

View File

@ -23,36 +23,6 @@
/* The following definitions basically come from the kernel headers. /* The following definitions basically come from the kernel headers.
But the kernel header is not namespace clean. */ But the kernel header is not namespace clean. */
/* Protections are chosen from these bits, OR'd together. The
implementation does not necessarily support PROT_EXEC or PROT_WRITE
without PROT_READ. The only guarantees are that no writing will be
allowed without PROT_WRITE and no access will be allowed for PROT_NONE. */
#define PROT_READ 0x1 /* Page can be read. */
#define PROT_WRITE 0x2 /* Page can be written. */
#define PROT_EXEC 0x4 /* Page can be executed. */
#define PROT_NONE 0x0 /* Page can not be accessed. */
#define PROT_GROWSDOWN 0x01000000 /* Extend change to start of
growsdown vma (mprotect only). */
#define PROT_GROWSUP 0x02000000 /* Extend change to start of
growsup vma (mprotect only). */
/* Sharing types (must choose one and only one of these). */
#define MAP_SHARED 0x01 /* Share changes. */
#define MAP_PRIVATE 0x02 /* Changes are private. */
#ifdef __USE_MISC
# define MAP_TYPE 0x0f /* Mask for type of mapping. */
#endif
/* Other flags. */
#define MAP_FIXED 0x10 /* Interpret addr exactly. */
#ifdef __USE_MISC
# define MAP_FILE 0
# define MAP_ANONYMOUS 0x20 /* Don't use a file. */
# define MAP_ANON MAP_ANONYMOUS
#endif
/* These are Linux-specific. */ /* These are Linux-specific. */
#ifdef __USE_MISC #ifdef __USE_MISC
# define MAP_GROWSDOWN 0x00100 /* Stack-like segment. */ # define MAP_GROWSDOWN 0x00100 /* Stack-like segment. */
@ -67,47 +37,5 @@
# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */ # define MAP_HUGETLB 0x40000 /* Create huge page mapping. */
#endif #endif
/* Flags to `msync'. */ /* Include generic Linux declarations. */
#define MS_ASYNC 0x1 /* Sync memory asynchronously. */ #include <bits/mman-linux.h>
#define MS_INVALIDATE 0x2 /* Invalidate the caches. */
#define MS_SYNC 0x4 /* Synchronous memory sync. */
/* Flags for `mlockall'. */
#define MCL_CURRENT 0x1 /* Lock all currently mapped pages. */
#define MCL_FUTURE 0x2 /* Lock all additions to address
space. */
/* Flags for `mremap'. */
#ifdef __USE_GNU
# define MREMAP_MAYMOVE 1
# define MREMAP_FIXED 2
#endif
/* 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 4 /* 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_HUGEPAGE 14 /* Worth backing with hugepages. */
# define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages. */
# define MADV_DONTDUMP 16 /* Explicity exclude from the core dump,
overrides the coredump filter bits. */
# define MADV_DODUMP 17 /* Clear the MADV_DONTDUMP flag. */
# define MADV_HWPOISON 100 /* Poison a page for testing. */
#endif
/* The POSIX people had to invent similar names for the same things. */
#ifdef __USE_XOPEN2K
# define POSIX_MADV_NORMAL 0 /* No further special treatment. */
# define POSIX_MADV_RANDOM 1 /* Expect random page references. */
# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */
# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */
# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */
#endif