Message ID | 1456658360-16080-2-git-send-email-zhaoshenglong@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sun, 28 Feb 2016, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > It needs to copy and change the contents of some ACPI and EFI tables for > Dom0. Here define a enum for those tables. > > Signed-off-by: Parth Dixit <parth.dixit@linaro.org> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > xen/include/asm-arm/acpi.h | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/xen/include/asm-arm/acpi.h b/xen/include/asm-arm/acpi.h > index a0f2f24..7f59761 100644 > --- a/xen/include/asm-arm/acpi.h > +++ b/xen/include/asm-arm/acpi.h > @@ -30,6 +30,18 @@ > #define COMPILER_DEPENDENT_UINT64 unsigned long long > #define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR > > +/* Tables marked as reserved in efi table */ > +typedef enum { > + TBL_FADT, > + TBL_MADT, > + TBL_STAO, > + TBL_XSDT, > + TBL_RSDP, > + TBL_EFIT, > + TBL_MMAP, > + TBL_MMAX, > +} EFI_MEM_RES; > + > bool_t __init acpi_psci_present(void); > bool_t __init acpi_psci_hvc_present(void); > void __init acpi_smp_init_cpus(void); > -- > 2.0.4 > >
>>> On 28.02.16 at 12:18, <zhaoshenglong@huawei.com> wrote: > --- a/xen/include/asm-arm/acpi.h > +++ b/xen/include/asm-arm/acpi.h > @@ -30,6 +30,18 @@ > #define COMPILER_DEPENDENT_UINT64 unsigned long long > #define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR > > +/* Tables marked as reserved in efi table */ > +typedef enum { > + TBL_FADT, > + TBL_MADT, > + TBL_STAO, > + TBL_XSDT, > + TBL_RSDP, > + TBL_EFIT, > + TBL_MMAP, > + TBL_MMAX, > +} EFI_MEM_RES; > + > bool_t __init acpi_psci_present(void); > bool_t __init acpi_psci_hvc_present(void); > void __init acpi_smp_init_cpus(void); This patch apparently expected the other series to be fully applied first, which afaics hasn't been stated anywhere. I've fixed up the context, but please avoid the committer needing to do such by explicitly stating interdependencies between individually submitted series, or by keeping the later series RFC (making clear it is not expected to go in yet). Jan
diff --git a/xen/include/asm-arm/acpi.h b/xen/include/asm-arm/acpi.h index a0f2f24..7f59761 100644 --- a/xen/include/asm-arm/acpi.h +++ b/xen/include/asm-arm/acpi.h @@ -30,6 +30,18 @@ #define COMPILER_DEPENDENT_UINT64 unsigned long long #define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR +/* Tables marked as reserved in efi table */ +typedef enum { + TBL_FADT, + TBL_MADT, + TBL_STAO, + TBL_XSDT, + TBL_RSDP, + TBL_EFIT, + TBL_MMAP, + TBL_MMAX, +} EFI_MEM_RES; + bool_t __init acpi_psci_present(void); bool_t __init acpi_psci_hvc_present(void); void __init acpi_smp_init_cpus(void);