This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via c14ec3dc896e0dd14d0491f09f81ce09e9d53bc2 (commit) from 50ebc616ddd9d05651923134d7bfaa02c103fbce (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit c14ec3dc896e0dd14d0491f09f81ce09e9d53bc2 Author: Christophe Milard christophe.milard@linaro.org Date: Mon Jan 23 09:47:57 2017 +0100
linux-gen: _ishm: fix normal page fallback
Fixing failure due to lack of huge pages. Fixes: https://bugs.linaro.org/show_bug.cgi?id=2842
Signed-off-by: Christophe Milard christophe.milard@linaro.org Reviewed-and-tested-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index f889834..3797f20 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -547,7 +547,7 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, addr = alloc_fragment(len, block_index, align, &fragment); if (!addr) { ODP_ERR("alloc_fragment failed.\n"); - if (new_block->filename[0]) { + if (!new_block->external_fd) { close(*fd); *fd = -1; delete_file(new_block); @@ -562,7 +562,7 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, if (mapped_addr == NULL) { if (flags & _ODP_ISHM_SINGLE_VA) free_fragment(fragment); - if (new_block->filename[0]) { + if (!new_block->external_fd) { close(*fd); *fd = -1; delete_file(new_block);
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/_ishm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive