Merge commit 'upstream-x86-virt' into WIP.x86/mm
authorIngo Molnar <mingo@kernel.org>
Fri, 1 Dec 2017 09:34:04 +0000 (10:34 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 Dec 2017 12:50:01 +0000 (13:50 +0100)
Merge a minimal set of virt cleanups, for a base for the MM isolation patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/xen/enlighten_pv.c

index e55d276afc709d6be1494c1a66adbb0ac00740d2,168efb2534c0ecc9956dc499f7489d1604838bf8..fbd054d6ac973d8402146c799c2fece6432e54e7
@@@ -601,7 -601,7 +601,7 @@@ static struct trap_array_entry trap_arr
  #ifdef CONFIG_X86_MCE
        { machine_check,               xen_machine_check,               true },
  #endif
 -      { nmi,                         xen_nmi,                         true },
 +      { nmi,                         xen_xennmi,                      true },
        { overflow,                    xen_overflow,                    false },
  #ifdef CONFIG_IA32_EMULATION
        { entry_INT80_compat,          xen_entry_INT80_compat,          false },
@@@ -811,14 -811,15 +811,14 @@@ static void __init xen_write_gdt_entry_
        }
  }
  
 -static void xen_load_sp0(struct tss_struct *tss,
 -                       struct thread_struct *thread)
 +static void xen_load_sp0(unsigned long sp0)
  {
        struct multicall_space mcs;
  
        mcs = xen_mc_entry(0);
 -      MULTI_stack_switch(mcs.mc, __KERNEL_DS, thread->sp0);
 +      MULTI_stack_switch(mcs.mc, __KERNEL_DS, sp0);
        xen_mc_issue(PARAVIRT_LAZY_CPU);
 -      tss->x86_tss.sp0 = thread->sp0;
 +      this_cpu_write(cpu_tss.x86_tss.sp0, sp0);
  }
  
  void xen_set_iopl_mask(unsigned mask)
@@@ -1459,9 -1460,9 +1459,9 @@@ static uint32_t __init xen_platform_pv(
        return 0;
  }
  
- const struct hypervisor_x86 x86_hyper_xen_pv = {
+ const __initconst struct hypervisor_x86 x86_hyper_xen_pv = {
        .name                   = "Xen PV",
        .detect                 = xen_platform_pv,
-       .pin_vcpu               = xen_pin_vcpu,
+       .type                   = X86_HYPER_XEN_PV,
+       .runtime.pin_vcpu       = xen_pin_vcpu,
  };
- EXPORT_SYMBOL(x86_hyper_xen_pv);