diff options
| author | Matias Elo <matias.elo@nokia.com> | 2018-07-09 15:56:24 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2018-07-11 12:59:12 +0300 |
| commit | db103d74409e0b16b49ac56aff56f20e37537b55 (patch) | |
| tree | 8b8c45bb838ed19da2d3581481bdc9c0c025f39d | |
| parent | ddb5f8e1e9c3b9579d7399178340c0e6d830dbc9 (diff) | |
Port 3ee54c08 "linux-gen: ticketlock: remove separate API inlining header"
Signed-off-by: Matias Elo <matias.elo@nokia.com>
| -rw-r--r-- | platform/linux-dpdk/Makefile.am | 5 | ||||
| -rw-r--r-- | platform/linux-dpdk/odp_queue_basic.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 21a15c375..5b4883ccf 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -37,8 +37,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/thread_inlines.h \ include/odp/api/plat/thread_inlines_api.h \ - include/odp/api/plat/ticketlock_inlines.h \ - include/odp/api/plat/ticketlock_inlines_api.h + include/odp/api/plat/ticketlock_inlines.h odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ @@ -197,7 +196,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_std_clib.c \ ../linux-generic/odp_sync.c \ ../linux-generic/odp_thread_api.c \ - ../linux-generic/odp_ticketlock.c + ../linux-generic/odp_ticketlock_api.c endif if ARCH_IS_ARM diff --git a/platform/linux-dpdk/odp_queue_basic.c b/platform/linux-dpdk/odp_queue_basic.c index 2695aa67f..3237ddcf7 100644 --- a/platform/linux-dpdk/odp_queue_basic.c +++ b/platform/linux-dpdk/odp_queue_basic.c @@ -30,8 +30,8 @@ #define NUM_INTERNAL_QUEUES 64 #include <odp/api/plat/ticketlock_inlines.h> -#define LOCK(queue_ptr) _odp_ticketlock_lock(&((queue_ptr)->s.lock)) -#define UNLOCK(queue_ptr) _odp_ticketlock_unlock(&((queue_ptr)->s.lock)) +#define LOCK(queue_ptr) odp_ticketlock_lock(&((queue_ptr)->s.lock)) +#define UNLOCK(queue_ptr) odp_ticketlock_unlock(&((queue_ptr)->s.lock)) #define LOCK_INIT(queue_ptr) odp_ticketlock_init(&((queue_ptr)->s.lock)) #include <string.h> |