X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust%2Fprocessor.h;h=8a01a8868c19385b6990957693dd2915ce203f15;hb=34174843695ce2380fed2bddb1c631be97420f8d;hp=68ac258631a61491b287d0c1f492253dd5881fda;hpb=066b83b8dfc562e00cb61d39eca0e0f77242828c;p=lttng-ust.git

diff --git a/include/ust/processor.h b/include/ust/processor.h
index 68ac2586..8a01a886 100644
--- a/include/ust/processor.h
+++ b/include/ust/processor.h
@@ -25,7 +25,7 @@
 extern __thread long ust_reg_stack[500];
 extern volatile __thread long *ust_reg_stack_ptr;
 
-#define ____cacheline_aligned __attribute__((aligned(CACHE_LINE_SIZE)))
+#define ____cacheline_aligned __attribute__((aligned(CAA_CACHE_LINE_SIZE)))
 
 #ifdef __i386
 
@@ -293,7 +293,7 @@ static inline int fls(int x)
 	     /* Start TLS access of private reg stack pointer */ \
 	     ".byte 0x66\n\t" \
 	     "leaq ust_reg_stack_ptr@tlsgd(%%rip), %%rdi\n\t" \
-	     ".word 0x6666\n\t" \
+	     ".hword 0x6666\n\t" \
 	     "rex64\n\t" \
 	     "call __tls_get_addr@plt\n\t" \
 	     /* --- End TLS access */ \
@@ -305,7 +305,7 @@ static inline int fls(int x)
 	     /* Start TLS access of private reg stack */ \
 	     ".byte 0x66\n\t" \
 	     "leaq ust_reg_stack@tlsgd(%%rip), %%rdi\n\t" \
-	     ".word 0x6666\n\t" \
+	     ".hword 0x6666\n\t" \
 	     "rex64\n\t" \
 	     "call __tls_get_addr@plt\n\t" \
 	     /* --- End TLS access */ \