aboutsummaryrefslogtreecommitdiff
path: root/platform/linux-generic/odp_shared_memory.c
diff options
context:
space:
mode:
authorChristophe Milard <christophe.milard@linaro.org>2016-12-05 19:26:55 +0100
committerMaxim Uvarov <maxim.uvarov@linaro.org>2017-01-12 18:01:11 +0300
commit7f97683b1afc4826825f0db0fcac40858892494a (patch)
treedf6cf3eaa31afba367373c65c772b4ca32b51fd1 /platform/linux-generic/odp_shared_memory.c
parent52592157f25c9e2e3876dc3624cf91b1b71127ad (diff)
linux-gen: shared_memory: remove flag forcing mlock
The _ishm flag _ODP_ISHM_LOCK is no longer set when doing shm_reserve(), hence enabling non-root user to exceed the 64MB mlock memory limit (ulimit). Signed-off-by: Christophe Milard <christophe.milard@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'platform/linux-generic/odp_shared_memory.c')
-rw-r--r--platform/linux-generic/odp_shared_memory.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index d2bb74c0b..ba32deecd 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -58,9 +58,6 @@ odp_shm_t odp_shm_reserve(const char *name, uint64_t size, uint64_t align,
flgs = get_ishm_flags(flags);
- /* all mem reserved through this interface is requested to be locked: */
- flgs |= (flags & _ODP_ISHM_LOCK);
-
block_index = _odp_ishm_reserve(name, size, -1, align, flgs, flags);
if (block_index >= 0)
return to_handle(block_index);