From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 23 Mar 2017 14:53:02 +0000 (+0100)
Subject: arch: drop ALIGN_STR
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2416
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2e13371acd35c8bb0aa4d03b2fdaf803971e571;p=xen.git

arch: drop ALIGN_STR

... as being unused and having been unusable: It was clearly intended
for use in asm(), yet was placed inside __ASSEMBLY__ conditionals.

Also drop __ALIGN{,_STR} - there's no need to have a second flavor of
these constructs with no difference in behavior.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>
---

diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index 6a92f53f72..b2edf95f72 100644
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -54,11 +54,8 @@
 #define CONFIG_AEABI
 
 /* Linkage for ARM */
-#define __ALIGN .align 2
-#define __ALIGN_STR ".align 2"
 #ifdef __ASSEMBLY__
-#define ALIGN __ALIGN
-#define ALIGN_STR __ALIGN_STR
+#define ALIGN .align 2
 #define ENTRY(name)                             \
   .globl name;                                  \
   ALIGN;                                        \
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index b9a6d94d60..8ed69b64b2 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -50,11 +50,8 @@
 #define OPT_CONSOLE_STR "vga"
 
 /* Linkage for x86 */
-#define __ALIGN .align 16,0x90
-#define __ALIGN_STR ".align 16,0x90"
 #ifdef __ASSEMBLY__
-#define ALIGN __ALIGN
-#define ALIGN_STR __ALIGN_STR
+#define ALIGN .align 16,0x90
 #define ENTRY(name)                             \
   .globl name;                                  \
   ALIGN;                                        \