Merge branch 'upstream-16.11-stable' into 16.11.x

[deb_dpdk.git] / examples / performance-thread / common / lthread.c

diff --git a/examples/performance-thread/common/lthread.c b/examples/performance-thread/common/lthread.c
index 8fbff73..77c870f 100644 (file)
--- a/examples/performance-thread/common/lthread.c
+++ b/examples/performance-thread/common/lthread.c
@@ -143,7 +143,7 @@ struct lthread_stack *_stack_alloc(void)
        struct lthread_stack *s;
 
        s = _lthread_objcache_alloc((THIS_SCHED)->stack_cache);
-       LTHREAD_ASSERT(s != NULL);
+       RTE_ASSERT(s != NULL);
 
        s->root_sched = THIS_SCHED;
        s->stack_size = LTHREAD_MAX_STACK_SIZE;
@@ -327,13 +327,14 @@ struct lthread *lthread_current(void)
 /*
  * Tasklet to cancel a thread
  */
-static void
+static void *
 _cancel(void *arg)
 {
        struct lthread *lt = (struct lthread *) arg;
 
        lt->state |= BIT(ST_LT_CANCELLED);
        lthread_detach();
+       return NULL;
 }