Merge branches 'at91', 'imx', 'iop', 'ixp', 'ks8695', 'misc', 'ns9xxx', 'pxa' and...

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a0362d5..9a54148 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -34,7 +34,6 @@ parameter is applicable:
        APIC    APIC support is enabled.
        APM     Advanced Power Management support is enabled.
        AX25    Appropriate AX.25 support is enabled.
-       CD      Appropriate CD support is enabled.
        DRM     Direct Rendering Management support is enabled.
        EDD     BIOS Enhanced Disk Drive Services (EDD) is enabled
        EFI     EFI Partitioning (GPT) is enabled
@@ -319,9 +318,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        autotest        [IA64]
 
-       aztcd=          [HW,CD] Aztech CD268 CDROM driver
-                       Format: <io>,0x79 (?)
-
        baycom_epp=     [HW,AX25]
                        Format: <io>,<mode>
 
@@ -364,10 +360,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        possible to determine what the correct size should be.
                        This option provides an override for these situations.
 
-       cdu31a=         [HW,CD]
-                       Format: <io>,<irq>[,PAS]
-                       See header of drivers/cdrom/cdu31a.c.
-
        chandev=        [HW,NET] Generic channel device initialisation
 
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
@@ -421,9 +413,6 @@ and is between 256 and 4096 characters. It is defined in the file
        hpet=           [IA-32,HPET] option to disable HPET and use PIT.
                        Format: disable
 
-       cm206=          [HW,CD]
-                       Format: { auto | [<io>,][<irq>] }
-
        com20020=       [HW,NET] ARCnet - COM20020 chipset
                        Format:
                        <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]]
@@ -660,9 +649,6 @@ and is between 256 and 4096 characters. It is defined in the file
        gpt             [EFI] Forces disk with valid GPT signature but
                        invalid Protective MBR to be treated as GPT.
 
-       gscd=           [HW,CD]
-                       Format: <io>
-
        gvp11=          [HW,SCSI]
 
        hashdist=       [KNL,NUMA] Large hashes allocated during boot
@@ -826,14 +812,37 @@ and is between 256 and 4096 characters. It is defined in the file
                        tasks in the system -- can cause problems and
                        suboptimal load balancer performance.
 
-       isp16=          [HW,CD]
-                       Format: <io>,<irq>,<dma>,<setup>
-
        iucv=           [HW,NET]
 
        js=             [HW,JOY] Analog joystick
                        See Documentation/input/joystick.txt.
 
+       kernelcore=nn[KMG]      [KNL,IA-32,IA-64,PPC,X86-64] This parameter
+                       specifies the amount of memory usable by the kernel
+                       for non-movable allocations.  The requested amount is
+                       spread evenly throughout all nodes in the system. The
+                       remaining memory in each node is used for Movable
+                       pages. In the event, a node is too small to have both
+                       kernelcore and Movable pages, kernelcore pages will
+                       take priority and other nodes will have a larger number
+                       of kernelcore pages.  The Movable zone is used for the
+                       allocation of pages that may be reclaimed or moved
+                       by the page migration subsystem.  This means that
+                       HugeTLB pages may not be allocated from this zone.
+                       Note that allocations like PTEs-from-HighMem still
+                       use the HighMem zone if it exists, and the Normal
+                       zone if it does not.
+
+       movablecore=nn[KMG]     [KNL,IA-32,IA-64,PPC,X86-64] This parameter
+                       is similar to kernelcore except it specifies the
+                       amount of memory used for migratable allocations.
+                       If both kernelcore and movablecore is specified,
+                       then kernelcore will be at *least* the specified
+                       value but may be more. If movablecore on its own
+                       is specified, the administrator must be careful
+                       that the amount of memory usable for all allocations
+                       is not too small.
+
        keepinitrd      [HW,ARM]
 
        kstack=N        [IA-32,X86-64] Print N words from the kernel stack
@@ -967,11 +976,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        mcatest=        [IA-64]
 
-       mcd=            [HW,CD]
-                       Format: <port>,<irq>,<mitsumi_bug_93_wait>
-
-       mcdx=           [HW,CD]
-
        mce             [IA-32] Machine Check Exception
 
        md=             [HW] RAID subsystems devices and level
@@ -1181,6 +1185,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nosmp           [SMP] Tells an SMP kernel to act as a UP kernel.
 
+       nosoftlockup    [KNL] Disable the soft-lockup detector.
+
        nosync          [HW,M68K] Disables sync negotiation for all devices.
 
        notsc           [BUGS=IA-32] Disable Time Stamp Counter
@@ -1202,9 +1208,6 @@ and is between 256 and 4096 characters. It is defined in the file
        oprofile.timer= [HW]
                        Use timer interrupt instead of performance counters
 
-       optcd=          [HW,CD]
-                       Format: <io>
-
        osst=           [HW,SCSI] SCSI Tape Driver
                        Format: <buffer_size>,<write_threshold>
                        See also Documentation/scsi/st.txt.
@@ -1504,6 +1507,10 @@ and is between 256 and 4096 characters. It is defined in the file
 
        rootfstype=     [KNL] Set root filesystem type
 
+       rootwait        [KNL] Wait (indefinitely) for root device to show up.
+                       Useful for devices that are detected asynchronously
+                       (e.g. USB and MMC devices).
+
        rw              [KNL] Mount root device read-write on boot
 
        S               [KNL] Run init in single mode
@@ -1516,11 +1523,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        sbni=           [NET] Granch SBNI12 leased line adapter
 
-       sbpcd=          [HW,CD] Soundblaster CD adapter
-                       Format: <io>,<type>
-                       See a comment before function sbpcd_setup() in
-                       drivers/cdrom/sbpcd.c.
-
        sc1200wdt=      [HW,WDT] SC1200 WDT (watchdog) driver
                        Format: <io>[,<timeout>[,<isapnp>]]
 
@@ -1573,10 +1575,6 @@ and is between 256 and 4096 characters. It is defined in the file
        simeth=         [IA-64]
        simscsi=
 
-       sjcd=           [HW,CD]
-                       Format: <io>,<irq>,<dma>
-                       See header of drivers/cdrom/sjcd.c.
-
        slram=          [HW,MTD]
 
        slub_debug[=options[,slabs]]    [MM, SLUB]
@@ -1753,9 +1751,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        snd-ymfpci=     [HW,ALSA]
 
-       sonycd535=      [HW,CD]
-                       Format: <io>[,<irq>]
-
        sonypi.*=       [HW] Sony Programmable I/O Control Device driver
                        See Documentation/sonypi.txt