1 files changed, 9 insertions, 15 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c7c8eca5b2b3..f3dc951e949f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1579,20 +1579,12 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nmi_watchdog=   [KNL,BUGS=X86] Debugging features for SMP kernels
                         Format: [panic,][num]
-                        Valid num: 0,1,2
+                        Valid num: 0
                         0 - turn nmi_watchdog off
-                        1 - use the IO-APIC timer for the NMI watchdog
-                        2 - use the local APIC for the NMI watchdog using
-                        a performance counter. Note: This will use one
-                        performance counter and the local APIC's performance
-                        vector.
                         When panic is specified, panic when an NMI watchdog
                         timeout occurs.
                         This is useful when you use a panic=... timeout and
                         need the box quickly up again.
-                        Instead of 1 and 2 it is possible to use the following
-                        symbolic names: lapic and ioapic
-                        Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
 
         netpoll.carrier_timeout=
                         [NET] Specifies amount of time (in seconds) that
@@ -1622,6 +1614,8 @@ and is between 256 and 4096 characters. It is defined in the file
         noapic          [SMP,APIC] Tells the kernel to not make use of any
                         IOAPICs that may be present in the system.
 
+        noautogroup     Disable scheduler automatic task group creation.
+
         nobats          [PPC] Do not use BATs for mapping kernel lowmem
                         on "Classic" PPC cores.
 
@@ -1759,7 +1753,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nousb           [USB] Disable the USB subsystem
 
-        nowatchdog      [KNL] Disable the lockup detector.
+        nowatchdog      [KNL] Disable the lockup detector (NMI watchdog).
 
         nowb            [ARM]
 
@@ -2175,11 +2169,6 @@ 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.
 
-        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
 
@@ -2385,6 +2374,11 @@ and is between 256 and 4096 characters. It is defined in the file
                         improve throughput, but will also increase the
                         amount of memory reserved for use by the client.
 
+        swapaccount[=0|1]
+                        [KNL] Enable accounting of swap in memory resource
+                        controller if no parameter or 1 is given or disable
+                        it if 0 is given (See Documentation/cgroups/memory.txt)
+
         swiotlb=        [IA-64] Number of I/O TLB slabs
 
         switches=       [HW,M68k]