watchdog: Improve initialisation error message and documentation

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 92e83e5..01ece1b 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1759,7 +1759,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nousb           [USB] Disable the USB subsystem
 
 
        nousb           [USB] Disable the USB subsystem
 

-       nowatchdog      [KNL] Disable the lockup detector.
+       nowatchdog      [KNL] Disable the lockup detector (NMI watchdog).

 
        nowb            [ARM]
 
 
        nowb            [ARM]
 


@@ -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.
 
        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
 


@@ -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.
 
                        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]
        swiotlb=        [IA-64] Number of I/O TLB slabs
 
        switches=       [HW,M68k]