Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76260774 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "Bugfixes, a pvspinlock optimization, and documentation moving"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: X86: Boost queue head vCPU to mitigate lock waiter preemption
  Documentation: move Documentation/virtual to Documentation/virt
  KVM: nVMX: Set cached_vmcs12 and cached_shadow_vmcs12 NULL after free
  KVM: X86: Dynamically allocate user_fpu
  KVM: X86: Fix fpu state crash in kvm guest
  Revert "kvm: x86: Use task structs fpu field for user"
  KVM: nVMX: Clear pending KVM_REQ_GET_VMCS12_PAGES when leaving nested
parents c2626876 266e85a5

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2545,7 +2545,7 @@ 
			mem_encrypt=on:		Activate SME

			mem_encrypt=off:	Do not activate SME



			Refer to Documentation/virtual/kvm/amd-memory-encryption.rst

			Refer to Documentation/virt/kvm/amd-memory-encryption.rst

			for details on when memory encryption can be activated.



	mem_sleep_default=	[SUSPEND] Default system suspend mode:

Documentation/virtual/kvm/api.txt→Documentation/virt/kvm/api.txt

+1 −1
Original line number Diff line number Diff line
@@ -3781,7 +3781,7 @@ encrypted VMs. 


Currently, this ioctl is used for issuing Secure Encrypted Virtualization

(SEV) commands on AMD Processors. The SEV commands are defined in

Documentation/virtual/kvm/amd-memory-encryption.rst.

Documentation/virt/kvm/amd-memory-encryption.rst.



4.111 KVM_MEMORY_ENCRYPT_REG_REGION