From 868d059a1405f814048041a0329021122542520c Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 5 Feb 2013 19:11:36 +0100 Subject: [PATCH] mman: rename MAP_UNINITIALIZE to MAP_UNINITIALIZED The name was changed to include a trailing 'D' when it went into the kernel. Signed-off-by: Bernhard Reutner-Fischer --- ldso/ldso/dl-elf.c | 2 +- ldso/ldso/ldso.c | 2 +- libc/stdlib/malloc-simple/alloc.c | 4 ++-- libc/stdlib/malloc-standard/malloc.h | 6 +++--- libc/stdlib/malloc/malloc.c | 2 +- libc/sysdeps/linux/alpha/bits/mman.h | 2 +- libc/sysdeps/linux/common/bits/mman-common.h | 2 +- libc/sysdeps/linux/hppa/bits/mman.h | 2 +- libc/sysdeps/linux/mips/bits/mman.h | 2 +- libc/sysdeps/linux/powerpc/bits/mman.h | 2 +- libc/sysdeps/linux/sparc/bits/mman.h | 2 +- libc/sysdeps/linux/xtensa/bits/mman.h | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 02e59a349..96459f379 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -503,7 +503,7 @@ struct elf_resolve *_dl_load_elf_shared_library(unsigned rflags, return NULL; } header = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0); + MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZED, -1, 0); if (_dl_mmap_check_error(header)) { _dl_dprintf(2, "%s:%i: can't map '%s'\n", _dl_progname, __LINE__, libname); _dl_internal_error_number = LD_ERROR_MMAP_FAILED; diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index becabd39b..70413d563 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -239,7 +239,7 @@ void *_dl_malloc(size_t size) _dl_debug_early("mmapping more memory\n"); _dl_mmap_zero = _dl_malloc_addr = _dl_mmap((void *) 0, rounded_size, - PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0); + PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZED, -1, 0); if (_dl_mmap_check_error(_dl_mmap_zero)) { _dl_dprintf(2, "%s: mmap of a spare page failed!\n", _dl_progname); _dl_exit(20); diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c index 11d4dcf23..6028dcb30 100644 --- a/libc/stdlib/malloc-simple/alloc.c +++ b/libc/stdlib/malloc-simple/alloc.c @@ -37,7 +37,7 @@ void *malloc(size_t size) #ifdef __ARCH_USE_MMU__ # define MMAP_FLAGS MAP_PRIVATE | MAP_ANONYMOUS #else -# define MMAP_FLAGS MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZE +# define MMAP_FLAGS MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZED #endif result = mmap((void *) 0, size + sizeof(size_t), PROT_READ | PROT_WRITE, @@ -64,7 +64,7 @@ void * calloc(size_t nmemb, size_t lsize) result = malloc(size); #ifndef __ARCH_USE_MMU__ - /* mmap'd with MAP_UNINITIALIZE, we have to blank memory ourselves */ + /* mmap'd with MAP_UNINITIALIZED, we have to blank memory ourselves */ if (result != NULL) { memset(result, 0, size); } diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h index 9b411bdb8..d945627c6 100644 --- a/libc/stdlib/malloc-standard/malloc.h +++ b/libc/stdlib/malloc-standard/malloc.h @@ -353,13 +353,13 @@ __UCLIBC_MUTEX_EXTERN(__malloc_lock) #endif #ifdef __ARCH_USE_MMU__ -# define _MAP_UNINITIALIZE 0 +# define _MAP_UNINITIALIZED 0 #else -# define _MAP_UNINITIALIZE MAP_UNINITIALIZE +# define _MAP_UNINITIALIZED MAP_UNINITIALIZED #endif #define MMAP(addr, size, prot) \ - (mmap((addr), (size), (prot), MAP_PRIVATE|MAP_ANONYMOUS|_MAP_UNINITIALIZE, 0, 0)) + (mmap((addr), (size), (prot), MAP_PRIVATE|MAP_ANONYMOUS|_MAP_UNINITIALIZED, 0, 0)) /* ----------------------- Chunk representations ----------------------- */ diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c index 550d5b994..f6bf10a93 100644 --- a/libc/stdlib/malloc/malloc.c +++ b/libc/stdlib/malloc/malloc.c @@ -124,7 +124,7 @@ __malloc_from_heap (size_t size, struct heap_free_area **heap MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); #else block = mmap ((void *)0, block_size, PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZE, 0, 0); + MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZED, 0, 0); #endif #endif /* MALLOC_USE_SBRK */ diff --git a/libc/sysdeps/linux/alpha/bits/mman.h b/libc/sysdeps/linux/alpha/bits/mman.h index 6123ee076..a9820d596 100644 --- a/libc/sysdeps/linux/alpha/bits/mman.h +++ b/libc/sysdeps/linux/alpha/bits/mman.h @@ -70,7 +70,7 @@ # define MAP_NORESERVE 0x10000 /* Don't check for reservations. */ # define MAP_POPULATE 0x20000 /* Populate (prefault) pagetables. */ # define MAP_NONBLOCK 0x40000 /* Do not block on IO. */ -# define MAP_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could +# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized. */ #endif diff --git a/libc/sysdeps/linux/common/bits/mman-common.h b/libc/sysdeps/linux/common/bits/mman-common.h index 4a7c8e307..6cde5daa3 100644 --- a/libc/sysdeps/linux/common/bits/mman-common.h +++ b/libc/sysdeps/linux/common/bits/mman-common.h @@ -63,7 +63,7 @@ # define MAP_POPULATE 0x08000 /* Populate (prefault) pagetables. */ # define MAP_NONBLOCK 0x10000 /* Do not block on IO. */ # define MAP_STACK 0x20000 /* Allocation is for a stack. */ -# define MAP_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could +# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized. */ #endif diff --git a/libc/sysdeps/linux/hppa/bits/mman.h b/libc/sysdeps/linux/hppa/bits/mman.h index c066d161d..ca2787f7d 100644 --- a/libc/sysdeps/linux/hppa/bits/mman.h +++ b/libc/sysdeps/linux/hppa/bits/mman.h @@ -44,7 +44,7 @@ #define MAP_GROWSDOWN 0x8000 /* stack-like segment */ #define MAP_POPULATE 0x10000 /* populate (prefault) pagetables */ #define MAP_NONBLOCK 0x20000 /* do not block on IO */ -#define MAP_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could +#define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized. */ #define MS_SYNC 1 /* synchronous memory sync */ diff --git a/libc/sysdeps/linux/mips/bits/mman.h b/libc/sysdeps/linux/mips/bits/mman.h index 07d0a4df7..ca1497ebc 100644 --- a/libc/sysdeps/linux/mips/bits/mman.h +++ b/libc/sysdeps/linux/mips/bits/mman.h @@ -65,7 +65,7 @@ # define MAP_LOCKED 0x8000 /* pages are locked */ # define MAP_POPULATE 0x10000 /* populate (prefault) pagetables */ # define MAP_NONBLOCK 0x20000 /* do not block on IO */ -# define MAP_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could +# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized. */ #endif diff --git a/libc/sysdeps/linux/powerpc/bits/mman.h b/libc/sysdeps/linux/powerpc/bits/mman.h index 00f453dc2..c39e7929d 100644 --- a/libc/sysdeps/linux/powerpc/bits/mman.h +++ b/libc/sysdeps/linux/powerpc/bits/mman.h @@ -62,7 +62,7 @@ # define MAP_NORESERVE 0x00040 /* Don't check for reservations. */ # define MAP_POPULATE 0x08000 /* Populate (prefault) pagetables. */ # define MAP_NONBLOCK 0x10000 /* Do not block on IO. */ -# define MAP_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could +# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized. */ #endif diff --git a/libc/sysdeps/linux/sparc/bits/mman.h b/libc/sysdeps/linux/sparc/bits/mman.h index 9deafb3e1..cf1d18096 100644 --- a/libc/sysdeps/linux/sparc/bits/mman.h +++ b/libc/sysdeps/linux/sparc/bits/mman.h @@ -64,7 +64,7 @@ # define _MAP_NEW 0x80000000 /* Binary compatibility with SunOS. */ # define MAP_POPULATE 0x8000 /* Populate (prefault) pagetables. */ # define MAP_NONBLOCK 0x10000 /* Do not block on IO. */ -# define MAP_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could +# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized. */ #endif diff --git a/libc/sysdeps/linux/xtensa/bits/mman.h b/libc/sysdeps/linux/xtensa/bits/mman.h index 1a8fd8e57..a42e92663 100644 --- a/libc/sysdeps/linux/xtensa/bits/mman.h +++ b/libc/sysdeps/linux/xtensa/bits/mman.h @@ -63,7 +63,7 @@ # define MAP_NORESERVE 0x0400 /* Don't check for reservations. */ # define MAP_POPULATE 0x10000 /* Populate (prefault) pagetables. */ # define MAP_NONBLOCK 0x20000 /* Do not block on IO. */ -# define MAP_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could +# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized. */ #endif -- 2.11.0