Re: [Xen-devel] [PATCH for-4.5 V6 02/14] Move x86 specific funtions/variables to arch header

[Roy Franz <roy.franz@xxxxxxxxxx>]

On Wed, Sep 24, 2014 at 8:56 AM, Jan Beulich <JBeulich@xxxxxxxx> wrote:
>>>> On 24.09.14 at 07:03, <roy.franz@xxxxxxxxxx> wrote:
>> --- /dev/null
>> +++ b/xen/arch/x86/efi/efi-boot.h
>> @@ -0,0 +1,132 @@
>> +/*
>> + * Architecture specific implementation for EFI boot code.  This file
>> + * is intended to be included by common/efi/boot.c _only_, and
>> + * therefore can define arch specific global variables.
>> + */
>> +#include <asm/e820.h>
>> +#include <asm/edd.h>
>> +#define __ASSEMBLY__ /* avoid pulling in ACPI stuff (conflicts with EFI) */
>> +#include <asm/fixmap.h>
>> +#undef __ASSEMBLY__
>
> Just noticed this: Moving this here makes things even more fragile
> than they are now: If asm/fixmap.h happens to be included by any
> other header processed prior to reaching this point, the whole effect
> will be gone. Please keep this in the original place (with an #ifdef
> and comment as to why).
>
> With that adjusted
> Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
>
> Jan
>

OK, I'll move that.  Just to clarify, it's just the

>> +#define __ASSEMBLY__ /* avoid pulling in ACPI stuff (conflicts with EFI) */
>> +#include <asm/fixmap.h>
>> +#undef __ASSEMBLY__

that should be moved.

Roy

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel