Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 4c74a2f4ddfc38c3aaf79fa5f6db10bc524dc78e..6d380890e075483c4bddabf2f86aea2cce3e2849 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1390,6 +1390,11 @@
        hvc_iucv_allow= [S390]  Comma-separated list of z/VM user IDs.
                                If specified, z/VM IUCV HVC accepts connections
                                from listed z/VM user IDs only.
+
+       hv_nopvspin     [X86,HYPER_V] Disables the paravirt spinlock optimizations
+                                     which allow the hypervisor to 'idle' the
+                                     guest on lock contention.
+
        keep_bootcon    [KNL]
                        Do not unregister boot console at start. This is only
                        useful for debugging when something happens in the window