Message ID | 58D271B102000078001462A9@prv-mh.provo.novell.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 22/03/17 11:44, Jan Beulich wrote: > ... 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>
Hi Jan, On 22/03/17 11:44, Jan Beulich wrote: > ... 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: Julien Grall <julien.grall@arm.com> Cheers,
--- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -52,11 +52,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; \ --- 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; \