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

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 254bfaf..ef66b3c 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5804,8 +5804,9 @@
                        panic() code such as dumping handler.
 
        xen_nopvspin    [X86,XEN]
-                       Disables the ticketlock slowpath using Xen PV
-                       optimizations.
+                       Disables the qspinlock slowpath using Xen PV optimizations.
+                       This parameter is obsoleted by "nopvspin" parameter, which
+                       has equivalent effect for XEN platform.
 
        xen_nopv        [X86]
                        Disables the PV optimizations forcing the HVM guest to
@@ -5831,6 +5832,11 @@
                        as generic guest with no PV drivers. Currently support
                        XEN HVM, KVM, HYPER_V and VMWARE guest.
 
+       nopvspin        [X86,XEN,KVM]
+                       Disables the qspinlock slow path using PV optimizations
+                       which allow the hypervisor to 'idle' the guest on lock
+                       contention.
+
        xirc2ps_cs=     [NET,PCMCIA]
                        Format:
                        <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]