diff options
| author | Matias Elo <matias.elo@nokia.com> | 2022-06-20 17:40:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 17:40:58 +0300 |
| commit | 6cf762f28a96dc61db44697b9254327e41580a7f (patch) | |
| tree | a1de51fcf09a60bd14c260bb7c5dd44630193828 /platform/linux-generic/odp_queue_basic.c | |
| parent | 929cd75ba6654e5f635295953cbb20ffdca20c3e (diff) | |
| parent | 6d365eb66573c4cd7fab868bd69395cc9acdc123 (diff) | |
Merge ODP v1.37.0.0v1.37.0.0_DPDK_19.11
Merge ODP linux-generic v1.37.0.0 into linux-dpdk
Diffstat (limited to 'platform/linux-generic/odp_queue_basic.c')
| -rw-r--r-- | platform/linux-generic/odp_queue_basic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 5155bae4b..9a1abfd3b 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -28,6 +28,7 @@ #include <odp_global_data.h> #include <odp_queue_basic_internal.h> #include <odp_event_internal.h> +#include <odp_macros_internal.h> #include <odp/api/plat/ticketlock_inlines.h> #define LOCK(queue_ptr) odp_ticketlock_lock(&((queue_ptr)->s.lock)) @@ -77,7 +78,7 @@ static int read_config_file(queue_global_t *_odp_queue_glb) val_u32 = val; if (val_u32 > MAX_QUEUE_SIZE || val_u32 < MIN_QUEUE_SIZE || - !CHECK_IS_POWER2(val_u32)) { + !_ODP_CHECK_IS_POWER2(val_u32)) { ODP_ERR("Bad value %s = %u\n", str, val_u32); return -1; } @@ -95,7 +96,7 @@ static int read_config_file(queue_global_t *_odp_queue_glb) if (val_u32 > _odp_queue_glb->config.max_queue_size || val_u32 < MIN_QUEUE_SIZE || - !CHECK_IS_POWER2(val_u32)) { + !_ODP_CHECK_IS_POWER2(val_u32)) { ODP_ERR("Bad value %s = %u\n", str, val_u32); return -1; } @@ -1039,7 +1040,7 @@ static int queue_init(queue_entry_t *queue, const char *name, queue_size = MIN_QUEUE_SIZE; /* Round up if not already a power of two */ - queue_size = ROUNDUP_POWER2_U32(queue_size); + queue_size = _ODP_ROUNDUP_POWER2_U32(queue_size); if (queue_size > _odp_queue_glb->config.max_queue_size) { ODP_ERR("Too large queue size %u\n", queue_size); |