diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-07-24 16:54:23 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-07-24 16:54:26 +0100 |
| commit | ba78d0104e4ce61135ffb26a39dac0d57b00824b (patch) | |
| tree | aeaa93c3b7febdc8bfa46510d93dd05c0e3747d3 /lib/librte_eal/common/include/rte_common.h | |
| parent | 6fce689301aa6be62eb0786519ff1eaf27bf00c8 (diff) | |
| parent | 43192222b329b3c984687235b0081c7fbfe484ba (diff) | |
Merge branch 'upstream-16.11-stable' into 16.11.x
Change-Id: I63e43d3cdc0ac549e2ff917005ccaeec9787b89e
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_eal/common/include/rte_common.h')
| -rw-r--r-- | lib/librte_eal/common/include/rte_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index db5ac91c..f5e2f886 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -105,7 +105,7 @@ typedef uint16_t unaligned_uint16_t; /*********** Macros for pointer arithmetic ********/ /** - * add a byte-value offset from a pointer + * add a byte-value offset to a pointer */ #define RTE_PTR_ADD(ptr, x) ((void*)((uintptr_t)(ptr) + (x))) @@ -323,7 +323,7 @@ rte_pause(void) {} static inline uint32_t rte_bsf32(uint32_t v) { - return __builtin_ctz(v); + return (uint32_t)__builtin_ctz(v); } #ifndef offsetof |