diff options
| author | Zoltan Kiss <zoltan.kiss@linaro.org> | 2015-11-03 15:26:06 +0000 |
|---|---|---|
| committer | Zoltan Kiss <zoltan.kiss@linaro.org> | 2015-11-03 15:53:59 +0000 |
| commit | f8c6fcc8e510f1ba7c0c258e13a994dc5836933e (patch) | |
| tree | 84d252edd371f2e4fb0c10225daf8ec9dcd833b3 /helper/test/odp_thread.c | |
| parent | d8bceaec15a1ca37cd23d420b1f285c94e5736fc (diff) | |
| parent | fdcd79c00c5c493106a532e29f680cf89c188d05 (diff) | |
Merge branch 'master' of https://git.linaro.org/lng/odp to 1.4.0.0
Merging commits from mainline odp.git master branch, up until fdcd79c0 "test:
l2fwd: separate rx and tx drop counters"
Conflicts:
configure.ac
test/validation/Makefile.am
Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
Diffstat (limited to 'helper/test/odp_thread.c')
| -rw-r--r-- | helper/test/odp_thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/helper/test/odp_thread.c b/helper/test/odp_thread.c index 1de30ab67..592f85624 100644 --- a/helper/test/odp_thread.c +++ b/helper/test/odp_thread.c @@ -40,7 +40,7 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) } /* discover how many threads this system can support */ - num_workers = odp_cpumask_def_worker(&cpu_mask, NUMBER_WORKERS); + num_workers = odp_cpumask_default_worker(&cpu_mask, NUMBER_WORKERS); if (num_workers < NUMBER_WORKERS) { printf("System can only support %d threads and not the %d requested\n", num_workers, NUMBER_WORKERS); |