Merge pull request #2119 from yosefe/v1.2.x

[v1.2.x] UCT/UD: Fix clang5 compilation
openucx · Dec 27, 2017 · 3786a8f · 3786a8f
2 parents fc625eb + 0074783
commit 3786a8f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/uct/ib/ud/base/ud_def.h b/src/uct/ib/ud/base/ud_def.h
@@ -7,12 +7,12 @@
 #ifndef UD_DEF_H_
 #define UD_DEF_H_
 
-
-#include <ucs/sys/math.h>
-
+#include <uct/ib/base/ib_iface.h>
+#include <ucs/arch/cpu.h>
 #include <ucs/datastruct/queue.h>
 #include <ucs/datastruct/frag_list.h>
-#include <uct/ib/base/ib_iface.h>
+#include <ucs/sys/math.h>
+
 
 #define UCT_UD_QP_HASH_SIZE     256
 #define UCT_UD_TX_MODERATION    64
@@ -145,7 +145,7 @@ typedef struct uct_ud_send_skb {
     uint8_t                 flags;
     int8_t                  status;     /* used in case of failure */
     uct_ud_neth_t           neth[0];
-} UCS_S_PACKED uct_ud_send_skb_t;
+} UCS_S_PACKED UCS_V_ALIGNED(UCS_SYS_CACHE_LINE_SIZE) uct_ud_send_skb_t;
 
 
 typedef struct uct_ud_comp_desc {