Merge branch 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index abd575c..c479d30 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -48,6 +48,7 @@ parameter is applicable:
        ISAPNP  ISA PnP code is enabled.
        ISDN    Appropriate ISDN support is enabled.
        JOY     Appropriate joystick support is enabled.
+       LIBATA  Libata driver is enabled
        LP      Printer support is enabled.
        LOOP    Loopback device support is enabled.
        M68k    M68k architecture is enabled.
@@ -863,7 +864,14 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <1-256>
 
        maxcpus=        [SMP] Maximum number of processors that an SMP kernel
-                       should make use of
+                       should make use of.
+                       Using "nosmp" or "maxcpus=0" will disable SMP
+                       entirely (the MPS table probe still happens, though).
+                       A command-line option of "maxcpus=<NUM>", where <NUM>
+                       is an integer greater than 0, limits the maximum number
+                       of CPUs activated in SMP mode to <NUM>.
+                       Using "maxcpus=1" on an SMP kernel is the trivial
+                       case of an SMP kernel with only one CPU.
 
        max_addr=[KMG]  [KNL,BOOT,ia64] All physical memory greater than or
                        equal to this physical address is ignored.
@@ -1038,6 +1046,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        emulation library even if a 387 maths coprocessor
                        is present.
 
+       noacpi          [LIBATA] Disables use of ACPI in libata suspend/resume
+                       when set.
+                       Format: <int>
+
        noaliencache    [MM, NUMA] Disables the allcoation of alien caches in
                        the slab allocator.  Saves per-node memory, but will
                        impact performance on real NUMA hardware.
@@ -1275,6 +1287,12 @@ and is between 256 and 4096 characters. It is defined in the file
                                This sorting is done to get a device
                                order compatible with older (<= 2.4) kernels.
                nobfsort        Don't sort PCI devices into breadth-first order.
+               cbiosize=nn[KMG]        The fixed amount of bus space which is
+                               reserved for the CardBus bridge's IO window.
+                               The default value is 256 bytes.
+               cbmemsize=nn[KMG]       The fixed amount of bus space which is
+                               reserved for the CardBus bridge's memory
+                               window. The default value is 64 megabytes.
 
        pcmv=           [HW,PCMCIA] BadgePAD 4