plat: avoid MAP_FIXED

This commit is contained in:
notaz 2015-03-25 00:38:13 +02:00
parent 9fec8a91c9
commit 26ea18173c

View file

@ -178,8 +178,10 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
req = (void *)addr;
if (need_exec)
prot |= PROT_EXEC;
/* avoid MAP_FIXED, it overrides existing mappings..
if (is_fixed)
flags |= MAP_FIXED;
*/
if (size >= HUGETLB_THRESHOLD)
flags |= MAP_HUGETLB;
@ -197,9 +199,14 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
if (ret == MAP_FAILED)
return NULL;
if (req != NULL && ret != req)
fprintf(stderr,
"warning: mmaped to %p, requested %p\n", ret, req);
if (req != NULL && ret != req) {
fprintf(stderr, "%s: mmaped to %p, requested %p\n",
is_fixed ? "error" : "warning", ret, req);
if (is_fixed) {
munmap(ret, size);
return NULL;
}
}
return ret;
}