Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[net-next-2.6.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4cd8b86e00ead86676c9e563efc63f0946246e0e..ed45e9802aa810a71e1f53fdde2a5d7bbba6789e 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1131,9 +1131,13 @@ and is between 256 and 4096 characters. It is defined in the file
        kvm.oos_shadow= [KVM] Disable out-of-sync shadow paging.
                        Default is 1 (enabled)
 
        kvm.oos_shadow= [KVM] Disable out-of-sync shadow paging.
                        Default is 1 (enabled)
 

-       kvm-amd.nested= [KVM,AMD] Allow nested virtualization in KVM/SVM.
+       kvm.mmu_audit=  [KVM] This is a R/W parameter which allows audit
+                       KVM MMU at runtime.

                        Default is 0 (off)
 
                        Default is 0 (off)
 

+       kvm-amd.nested= [KVM,AMD] Allow nested virtualization in KVM/SVM.
+                       Default is 1 (enabled)
+

        kvm-amd.npt=    [KVM,AMD] Disable nested paging (virtualized MMU)
                        for all guests.
                        Default is 1 (enabled) if in 64bit or 32bit-PAE mode
        kvm-amd.npt=    [KVM,AMD] Disable nested paging (virtualized MMU)
                        for all guests.
                        Default is 1 (enabled) if in 64bit or 32bit-PAE mode


@@ -1537,12 +1541,15 @@ and is between 256 and 4096 characters. It is defined in the file
                        1 to enable accounting
                        Default value is 0.
 
                        1 to enable accounting
                        Default value is 0.
 

-       nfsaddrs=       [NFS]
+       nfsaddrs=       [NFS] Deprecated.  Use ip= instead.

                        See Documentation/filesystems/nfs/nfsroot.txt.
 
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
                        See Documentation/filesystems/nfs/nfsroot.txt.
 
                        See Documentation/filesystems/nfs/nfsroot.txt.
 
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
                        See Documentation/filesystems/nfs/nfsroot.txt.
 

+       nfsrootdebug    [NFS] enable nfsroot debugging messages.
+                       See Documentation/filesystems/nfs/nfsroot.txt.
+

        nfs.callback_tcpport=
                        [NFS] set the TCP port on which the NFSv4 callback
                        channel should listen.
        nfs.callback_tcpport=
                        [NFS] set the TCP port on which the NFSv4 callback
                        channel should listen.


@@ -1698,6 +1705,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nojitter        [IA64] Disables jitter checking for ITC timers.
 
 
        nojitter        [IA64] Disables jitter checking for ITC timers.
 

+       no-kvmclock     [X86,KVM] Disable paravirtualized KVM clock driver
+

        nolapic         [X86-32,APIC] Do not enable or use the local APIC.
 
        nolapic_timer   [X86-32,APIC] Do not use the local APIC timer.
        nolapic         [X86-32,APIC] Do not enable or use the local APIC.
 
        nolapic_timer   [X86-32,APIC] Do not use the local APIC timer.


@@ -1718,7 +1727,7 @@ and is between 256 and 4096 characters. It is defined in the file
        norandmaps      Don't use address space randomization.  Equivalent to
                        echo 0 > /proc/sys/kernel/randomize_va_space
 
        norandmaps      Don't use address space randomization.  Equivalent to
                        echo 0 > /proc/sys/kernel/randomize_va_space
 

-       noreplace-paravirt      [X86-32,PV_OPS] Don't patch paravirt_ops
+       noreplace-paravirt      [X86,IA-64,PV_OPS] Don't patch paravirt_ops

 
        noreplace-smp   [X86-32,SMP] Don't replace SMP instructions
                        with UP alternatives
 
        noreplace-smp   [X86-32,SMP] Don't replace SMP instructions
                        with UP alternatives


@@ -2166,6 +2175,11 @@ and is between 256 and 4096 characters. It is defined in the file
        reset_devices   [KNL] Force drivers to reset the underlying device
                        during initialization.
 
        reset_devices   [KNL] Force drivers to reset the underlying device
                        during initialization.
 

+       resource_alloc_from_bottom
+                       Allocate new resources from the beginning of available
+                       space, not the end.  If you need to use this, please
+                       report a bug.
+

        resume=         [SWSUSP]
                        Specify the partition device for software suspend
 
        resume=         [SWSUSP]
                        Specify the partition device for software suspend
 


@@ -2432,7 +2446,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        topology informations if the hardware supports these.
                        The scheduler will make use of these informations and
                        e.g. base its process migration decisions on it.
                        topology informations if the hardware supports these.
                        The scheduler will make use of these informations and
                        e.g. base its process migration decisions on it.

-                       Default is off.
+                       Default is on.

 
        tp720=          [HW,PS2]
 
 
        tp720=          [HW,PS2]