diff options
| author |   Roger Pau Monne <roger.pau@citrix.com> | 2018-06-08 10:40:38 +0200 |
|---|---|---|
| committer |   Juergen Gross <jgross@suse.com> | 2018-06-19 13:51:00 +0200 |
| commit | 1fe83888a2b776c204cb06629700adfb8e9cc123 (patch) | |
| tree | 3d7ad3e848fceb53b69bc727af09b03839520af0 /arch/arm | |
| parent | xen/PVH: Make GDT selectors PVH-specific (diff) | |
| download | linux-dev-1fe83888a2b776c204cb06629700adfb8e9cc123.tar.xz linux-dev-1fe83888a2b776c204cb06629700adfb8e9cc123.zip | |
xen: share start flags between PV and PVH
Use a global variable to store the start flags for both PV and PVH.
This allows the xen_initial_domain macro to work properly on PVH.
Note that ARM is also switched to use the new variable.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/xen/enlighten.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 8073625371f5..07060e5b5864 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -59,6 +59,9 @@ struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata; static __read_mostly unsigned int xen_events_irq; +uint32_t xen_start_flags; +EXPORT_SYMBOL(xen_start_flags); + int xen_remap_domain_gfn_array(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *gfn, int nr, @@ -293,9 +296,7 @@ void __init xen_early_init(void) xen_setup_features(); if (xen_feature(XENFEAT_dom0)) - xen_start_info->flags |= SIF_INITDOMAIN|SIF_PRIVILEGED; - else - xen_start_info->flags &= ~(SIF_INITDOMAIN|SIF_PRIVILEGED); + xen_start_flags |= SIF_INITDOMAIN|SIF_PRIVILEGED; if (!console_set_on_cmdline && !xen_initial_domain()) add_preferred_console("hvc", 0, NULL); |