X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=55900988028642192657dfc88948ce4f9355502c;hb=6fa0d97f663351869797d35ddb504489e223fa7c;hp=bd1ef699ba5c650eab2e25bab03847d84e774231;hpb=bedbae4d5f523e62d8fff9f3a42f39a6a03d0382;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index bd1ef69..5590098 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -112,7 +112,7 @@ struct marker {
 		);										\
 		asm volatile (									\
 		     ".section __markers,\"aw\",@progbits\n\t"					\
-		     ".align 8\n\t"								\
+		     ".balign 8\n\t" 								\
 		     "2:\n\t" \
 		     _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) ")\n\t" /* channel string */ \
 		     _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) ")\n\t" /* name string */ \
@@ -121,7 +121,7 @@ struct marker {
 		     ".byte 0\n\t" /* ptype */							\
 		     ".word 0\n\t" /* channel_id */						\
 		     ".word 0\n\t" /* event_id */						\
-		     ".align " XSTR(__WORDSIZE) " / 8\n\t" /* alignment */			\
+		     ".balign " XSTR(__WORDSIZE) " / 8\n\t" /* alignment */			\
 		     _ASM_PTR "(marker_probe_cb)\n\t" /* call */				\
 		     _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
 		     _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */			\
@@ -130,8 +130,8 @@ struct marker {
 		     _ASM_PTR "0\n\t" /* tp_cb */						\
 		     _ASM_PTR "(1f)\n\t" /* location */						\
 		     ".previous\n\t"								\
+		     ARCH_COPY_ADDR("%[outptr]")						\
 		     "1:\n\t"									\
-		     ARCH_COPY_ADDR("2b", "%[outptr]") "\n\t"					\
 		: [outptr] "=r" (m) );								\
 												\
 		save_registers(&regs)