From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 15 Dec 2015 13:16:09 +0000 (+0100)
Subject: x86: use tag in C UNLIKELY blocks, rather than a literal ".tag"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2084
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e904233f39534d6a20ad11bbcefda6fe3486fd23;p=xen.git

x86: use tag in C UNLIKELY blocks, rather than a literal ".tag"

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h
index 7cf440846d..b5f79d824b 100644
--- a/xen/include/asm-x86/asm_defns.h
+++ b/xen/include/asm-x86/asm_defns.h
@@ -180,16 +180,16 @@ void ret_from_intr(void);
 
 #endif
 
-#define UNLIKELY_START(cond, tag)          \
-        "j" #cond " .Lunlikely%=.tag;\n\t" \
-        UNLIKELY_START_SECTION "\n\t"      \
-        SUBSECTION_LBL(unlikely) "\n"      \
-        ".Lunlikely%=.tag:"
+#define UNLIKELY_START(cond, tag)                   \
+        "j" #cond " .Lunlikely." #tag ".%=;\n\t"   \
+        UNLIKELY_START_SECTION "\n\t"               \
+        SUBSECTION_LBL(unlikely) "\n"               \
+        ".Lunlikely." #tag ".%=:"
 
 #define UNLIKELY_END(tag)                  \
-        "jmp .Llikely%=.tag;\n\t"          \
+        "jmp .Llikely." #tag ".%=;\n\t"    \
         UNLIKELY_END_SECTION "\n"          \
-        ".Llikely%=.tag:"
+        ".Llikely." #tag ".%=:"
 
 #endif