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/include/odp_queue_scalable_internal.h | |
| 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/include/odp_queue_scalable_internal.h')
| -rw-r--r-- | platform/linux-generic/include/odp_queue_scalable_internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index 6f9b85c85..3c74d1699 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -18,12 +18,12 @@ extern "C" { #include <odp_forward_typedefs_internal.h> #include <odp_queue_if.h> #include <odp_event_internal.h> -#include <odp_align_internal.h> #include <odp/api/packet_io.h> #include <odp/api/align.h> #include <odp/api/hints.h> #include <odp/api/ticketlock.h> #include <odp_config_internal.h> +#include <odp_macros_internal.h> #include <odp_schedule_scalable.h> #include <odp_schedule_scalable_ordered.h> @@ -55,7 +55,7 @@ struct queue_entry_s { union queue_entry_u { struct queue_entry_s s; - uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; + uint8_t pad[_ODP_ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; }; int _odp_queue_deq(sched_elem_t *q, _odp_event_hdr_t *event_hdr[], int num); @@ -71,7 +71,7 @@ static inline void *shm_pool_alloc_align(_odp_ishm_pool_t *pool, uint32_t size) { void *addr; - addr = _odp_ishm_pool_alloc(pool, ROUNDUP_CACHE_LINE(size)); + addr = _odp_ishm_pool_alloc(pool, _ODP_ROUNDUP_CACHE_LINE(size)); ODP_ASSERT(((uintptr_t)addr & (ODP_CACHE_LINE_SIZE - 1)) == 0); return addr; |