Browse Source

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 <rep.dot.nop@gmail.com>
Bernhard Reutner-Fischer 11 years ago
parent
commit
868d059a14

+ 1 - 1
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;

+ 1 - 1
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);

+ 2 - 2
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);
 	}

+ 3 - 3
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 ----------------------- */

+ 1 - 1
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 */

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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 */

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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