diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/dpdk/ipsec/ipsec.h | 4 | ||||
| -rw-r--r-- | src/plugins/flowprobe/node.c | 2 | ||||
| -rw-r--r-- | src/plugins/lb/lbhash.h | 2 | ||||
| -rw-r--r-- | src/plugins/memif/private.h | 2 | ||||
| -rw-r--r-- | src/plugins/unittest/bihash_test.c | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/dpdk/ipsec/ipsec.h b/src/plugins/dpdk/ipsec/ipsec.h index 7d7ba564544..054fe9b0223 100644 --- a/src/plugins/dpdk/ipsec/ipsec.h +++ b/src/plugins/dpdk/ipsec/ipsec.h @@ -74,6 +74,7 @@ typedef struct typedef struct { + CLIB_ALIGN_MARK (pad, 8); /* align up to 8 bytes for 32bit builds */ char *name; enum rte_crypto_sym_xform_type type; u32 alg; @@ -83,7 +84,7 @@ typedef struct u8 boundary; u8 disabled; u8 resources; -} crypto_alg_t __attribute__ ((aligned (8))); +} crypto_alg_t; typedef struct { @@ -128,6 +129,7 @@ typedef struct typedef struct { + CLIB_ALIGN_MARK (pad, 16); /* align up to 16 bytes for 32bit builds */ struct rte_cryptodev_sym_session *session; u64 dev_mask; } crypto_session_by_drv_t; diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c index 79d37f8a75e..2cd754b67bb 100644 --- a/src/plugins/flowprobe/node.c +++ b/src/plugins/flowprobe/node.c @@ -148,7 +148,7 @@ flowprobe_get_variant (flowprobe_variant_t which, /* * NTP rfc868 : 2 208 988 800 corresponds to 00:00 1 Jan 1970 GMT */ -#define NTP_TIMESTAMP 2208988800L +#define NTP_TIMESTAMP 2208988800LU static inline u32 flowprobe_common_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset) diff --git a/src/plugins/lb/lbhash.h b/src/plugins/lb/lbhash.h index 5d2ff24f044..585b377b8aa 100644 --- a/src/plugins/lb/lbhash.h +++ b/src/plugins/lb/lbhash.h @@ -84,7 +84,7 @@ lb_hash_t *lb_hash_alloc(u32 buckets, u32 timeout) return NULL; // Allocate 1 more bucket for prefetch - u32 size = ((u64)&((lb_hash_t *)(0))->buckets[0]) + + u32 size = ((uword)&((lb_hash_t *)(0))->buckets[0]) + sizeof(lb_hash_bucket_t) * (buckets + 1); u8 *mem = 0; lb_hash_t *h; diff --git a/src/plugins/memif/private.h b/src/plugins/memif/private.h index 0116de3f1c3..a938b85e7da 100644 --- a/src/plugins/memif/private.h +++ b/src/plugins/memif/private.h @@ -113,6 +113,7 @@ typedef struct typedef struct { + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); /* ring data */ memif_ring_t *ring; memif_log2_ring_size_t log2_ring_size; @@ -205,6 +206,7 @@ typedef struct typedef struct { + CLIB_ALIGN_MARK (pad, 16); /* align up to 16 bytes for 32bit builds */ void *data; u32 data_len; i16 buffer_offset; diff --git a/src/plugins/unittest/bihash_test.c b/src/plugins/unittest/bihash_test.c index 3ce41cf494d..d418ced4e6e 100644 --- a/src/plugins/unittest/bihash_test.c +++ b/src/plugins/unittest/bihash_test.c @@ -99,7 +99,7 @@ test_bihash_thread_fn (void *arg) BVT (clib_bihash_kv) kv; bihash_test_main_t *tm = &bihash_test_main; int i, j; - u32 my_thread_index = (u32) (u64) arg; + u32 my_thread_index = (uword) arg; while (tm->thread_barrier) ; @@ -150,7 +150,7 @@ test_bihash_threads (bihash_test_main_t * tm) for (i = 0; i < tm->nthreads; i++) { rv = pthread_create (&handle, NULL, test_bihash_thread_fn, - (void *) (u64) i); + (void *) (uword) i); if (rv) { clib_unix_warning ("pthread_create returned %d", rv); |