From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Oct 2018 16:54:58 +0000 (+0100)
Subject: Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f682a7920baf7b721d01dd317f3b532265357cbb;p=linux.git

Merge branch 'x86-paravirt-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 paravirt updates from Ingo Molnar:
 "Two main changes:

   - Remove no longer used parts of the paravirt infrastructure and put
     large quantities of paravirt ops under a new config option
     PARAVIRT_XXL=y, which is selected by XEN_PV only. (Joergen Gross)

   - Enable PV spinlocks on Hyperv (Yi Sun)"

* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/hyperv: Enable PV qspinlock for Hyper-V
  x86/hyperv: Add GUEST_IDLE_MSR support
  x86/paravirt: Clean up native_patch()
  x86/paravirt: Prevent redefinition of SAVE_FLAGS macro
  x86/xen: Make xen_reservation_lock static
  x86/paravirt: Remove unneeded mmu related paravirt ops bits
  x86/paravirt: Move the Xen-only pv_mmu_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move the pv_irq_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move the Xen-only pv_cpu_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move items in pv_info under PARAVIRT_XXL umbrella
  x86/paravirt: Introduce new config option PARAVIRT_XXL
  x86/paravirt: Remove unused paravirt bits
  x86/paravirt: Use a single ops structure
  x86/paravirt: Remove clobbers from struct paravirt_patch_site
  x86/paravirt: Remove clobbers parameter from paravirt patch functions
  x86/paravirt: Make paravirt_patch_call() and paravirt_patch_jmp() static
  x86/xen: Add SPDX identifier in arch/x86/xen files
  x86/xen: Link platform-pci-unplug.o only if CONFIG_XEN_PVHVM
  x86/xen: Move pv specific parts of arch/x86/xen/mmu.c to mmu_pv.c
  x86/xen: Move pv irq related functions under CONFIG_XEN_PV umbrella
---

f682a7920baf7b721d01dd317f3b532265357cbb
diff --cc arch/x86/kernel/head_64.S
index a3618cf04cf62,827bca2c27827..747c758f67b7b
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@@ -24,9 -24,8 +24,9 @@@
  #include "../entry/calling.h"
  #include <asm/export.h>
  #include <asm/nospec-branch.h>
 +#include <asm/fixmap.h>
  
- #ifdef CONFIG_PARAVIRT
+ #ifdef CONFIG_PARAVIRT_XXL
  #include <asm/asm-offsets.h>
  #include <asm/paravirt.h>
  #define GET_CR2_INTO(reg) GET_CR2_INTO_RAX ; movq %rax, reg