1 files changed, 6 insertions, 6 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ed45e9802aa8..8b61c9360999 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -706,7 +706,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         arch/x86/kernel/cpu/cpufreq/elanfreq.c.
 
         elevator=       [IOSCHED]
-                        Format: {"anticipatory" | "cfq" | "deadline" | "noop"}
+                        Format: {"cfq" | "deadline" | "noop"}
                         See Documentation/block/as-iosched.txt and
                         Documentation/block/deadline-iosched.txt for details.
 
@@ -2175,11 +2175,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 +2380,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]