>>> On 19.03.19 at 14:09, <andrew.coop...@citrix.com> wrote: > On 19/03/2019 13:05, Wei Liu wrote: >> @@ -20,13 +19,22 @@ ENTRY(efi_start) >> #else /* !EFI */ >> >> #define FORMAT "elf64-x86-64" >> -#define SECTION_ALIGN PAGE_SIZE >> #define DECL_SECTION(x) x : AT(ADDR(x) - __XEN_VIRT_START) >> >> ENTRY(start_pa) >> >> #endif /* EFI */ >> >> +#ifdef CONFIG_XEN_ALIGN_2M >> +#define SECTION_ALIGN MB(2) >> +#else /* Default alignment */ >> +#ifdef EFI >> +#define SECTION_ALIGN MB(2) >> +#else >> +#define SECTION_ALIGN PAGE_SIZE >> +#endif >> +#endif > > As a trivial change, can this please be: > > #ifdef CONFIG_XEN_ALIGN_2M > # define SECTION_ALIGN MB(2) > #else /* Default alignment */ > # ifdef EFI > # define SECTION_ALIGN MB(2) > # else > # define SECTION_ALIGN PAGE_SIZE > # endif > #endif > > To help highlight the nesting levels.
#if defined(CONFIG_XEN_ALIGN_2M) || defined(EFI) # define SECTION_ALIGN MB(2) #else # define SECTION_ALIGN PAGE_SIZE #endif ? Then Reviewed-by: Jan Beulich <jbeul...@suse.com> (but I can live with Andrew's variant too, if need be) Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
