[Xen-changelog] [xen master] arch: drop ALIGN_STR

[patchbot@xxxxxxx]

commit c2e13371acd35c8bb0aa4d03b2fdaf803971e571
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Mar 23 15:53:02 2017 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Mar 23 15:53:02 2017 +0100

    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@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Julien Grall <julien.grall@xxxxxxx>
---
 xen/include/asm-arm/config.h | 5 +----
 xen/include/asm-x86/config.h | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index 6a92f53..b2edf95 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 b9a6d94..8ed69b6 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;                                        \
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog