diff options
| author | Matias Elo <matias.elo@nokia.com> | 2021-12-17 14:00:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 14:00:35 +0200 |
| commit | c3789c8e6ec34faee0b59080c1ab187cff1dc356 (patch) | |
| tree | b19561c2fdf7e26201237004b0344d21b0038ef2 /platform/linux-generic/odp_ishm.c | |
| parent | 2ed1489ccc354300037bad2e718fe63cd6fdd7ba (diff) | |
| parent | a4f277eb71029ecf61c6b4dda7894d5e949c4852 (diff) | |
Merge ODP v1.33.0.0v1.33.0.0_DPDK_19.11
Merge ODP linux-generic v1.33.0.0 into linux-dpdk
Diffstat (limited to 'platform/linux-generic/odp_ishm.c')
| -rw-r--r-- | platform/linux-generic/odp_ishm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index a10b9d5df..dea4d56f0 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -1071,7 +1071,8 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, /* Get system page sizes: page_hp_size is 0 if no huge page available*/ page_sz = odp_sys_page_size(); - page_hp_size = odp_sys_huge_page_size(); + /* Use normal pages if ODP_SHM_NO_HP was used */ + page_hp_size = (user_flags & ODP_SHM_NO_HP) ? 0 : odp_sys_huge_page_size(); /* grab a new entry: */ for (new_index = 0; new_index < ISHM_MAX_NB_BLOCKS; new_index++) { |