From: Dmitry Eremin-Solenikov <[email protected]>
Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
---
/** Email created from pull request 108 (lumag:symbols-cleanup)
** https://github.com/Linaro/odp/pull/108
** Patch: https://github.com/Linaro/odp/pull/108.patch
** Base sha: e420668cd3886f003c8bd6022e210bf08a0ee3b5
** Merge commit sha: 4ec4664e462d336f5b34b03ec598531c07ebf235
**/
.../include/odp_schedule_scalable_ordered.h | 9 ---------
.../linux-generic/odp_schedule_scalable_ordered.c | 19 ++++++++++---------
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h
b/platform/linux-generic/include/odp_schedule_scalable_ordered.h
index 941304b7..1c365a2b 100644
--- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h
+++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h
@@ -115,17 +115,8 @@ reorder_window_t *rwin_alloc(_odp_ishm_pool_t *pool,
unsigned lock_count);
int rwin_free(_odp_ishm_pool_t *pool, reorder_window_t *rwin);
bool rwin_reserve(reorder_window_t *rwin, uint32_t *sn);
-void rwin_insert(reorder_window_t *rwin,
- reorder_context_t *rctx,
- uint32_t sn,
- void (*callback)(reorder_context_t *));
void rctx_init(reorder_context_t *rctx, uint16_t idx,
reorder_window_t *rwin, uint32_t sn);
-void rctx_free(const reorder_context_t *rctx);
-void olock_unlock(const reorder_context_t *rctx, reorder_window_t *rwin,
- uint32_t lock_index);
-void olock_release(const reorder_context_t *rctx);
-void rctx_retire(reorder_context_t *first);
void rctx_release(reorder_context_t *rctx);
int rctx_save(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], int num);
diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c
b/platform/linux-generic/odp_schedule_scalable_ordered.c
index 90ddb61c..e4468a90 100644
--- a/platform/linux-generic/odp_schedule_scalable_ordered.c
+++ b/platform/linux-generic/odp_schedule_scalable_ordered.c
@@ -71,10 +71,10 @@ bool rwin_reserve(reorder_window_t *rwin, uint32_t *sn)
return true;
}
-void rwin_insert(reorder_window_t *rwin,
- reorder_context_t *rctx,
- uint32_t sn,
- void (*callback)(reorder_context_t *))
+static void rwin_insert(reorder_window_t *rwin,
+ reorder_context_t *rctx,
+ uint32_t sn,
+ void (*callback)(reorder_context_t *))
{
/* Initialise to silence scan-build */
hc_t old = {0, 0};
@@ -172,7 +172,7 @@ void rctx_init(reorder_context_t *rctx, uint16_t idx,
rctx->numevts = 0;
}
-inline void rctx_free(const reorder_context_t *rctx)
+static inline void rctx_free(const reorder_context_t *rctx)
{
const reorder_context_t *const base = &rctx[-(int)rctx->idx];
const uint32_t first = rctx->idx;
@@ -206,8 +206,9 @@ inline void rctx_free(const reorder_context_t *rctx)
}
}
-inline void olock_unlock(const reorder_context_t *rctx, reorder_window_t *rwin,
- uint32_t lock_index)
+static inline void olock_unlock(const reorder_context_t *rctx,
+ reorder_window_t *rwin,
+ uint32_t lock_index)
{
if ((rctx->olock_flags & (1U << lock_index)) == 0) {
/* Use relaxed ordering, we are not releasing any updates */
@@ -215,7 +216,7 @@ inline void olock_unlock(const reorder_context_t *rctx,
reorder_window_t *rwin,
}
}
-void olock_release(const reorder_context_t *rctx)
+static void olock_release(const reorder_context_t *rctx)
{
reorder_window_t *rwin;
int i;
@@ -246,7 +247,7 @@ static void blocking_enqueue(queue_entry_t *q,
odp_buffer_hdr_t **evts, int num)
}
}
-void rctx_retire(reorder_context_t *first)
+static void rctx_retire(reorder_context_t *first)
{
reorder_context_t *rctx;
queue_entry_t *q;