From c2e13371acd35c8bb0aa4d03b2fdaf803971e571 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 23 Mar 2017 15:53:02 +0100 Subject: [PATCH] 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 Reviewed-by: Andrew Cooper Reviewed-by: Julien Grall --- 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 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; \ -- 2.39.5