From 2f5a483928116781025d2334684e8a0c2eb8792e Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Sat, 1 Oct 2016 18:36:12 +0000 Subject: [PATCH] xen/x86: Fixup misc stale issues * Dom0 does now have an arch_config passed. * hypercall() and smp_alloc_memory() no longer exist. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-acked-by: Wei Liu --- xen/arch/x86/setup.c | 6 +----- xen/include/asm-x86/processor.h | 2 -- xen/include/asm-x86/smp.h | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 58b117d282..b13067132d 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1541,11 +1541,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( opt_dom0pvh ) domcr_flags |= DOMCRF_pvh | DOMCRF_hap; - /* - * Create initial domain 0. - * x86 doesn't support arch-configuration. So it's fine to pass - * NULL. - */ + /* Create initial domain 0. */ dom0 = domain_create(0, domcr_flags, 0, &config); if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) == NULL) ) panic("Error creating domain 0"); diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 3e6e35573a..6378afd126 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -612,8 +612,6 @@ struct stubs { DECLARE_PER_CPU(struct stubs, stubs); unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); -extern int hypercall(void); - int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); int rdmsr_hypervisor_regs(uint32_t idx, uint64_t *val); diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index 33c2c32f42..e3782bbef1 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -23,8 +23,6 @@ /* * Private routines/data */ - -extern void smp_alloc_memory(void); DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); -- 2.30.2