Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 343e0f0f84b60e9f62bcdef4963f5c8912073c8a..c86c074597129a5b4434b0e35c432a0a28636b11 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -100,7 +100,7 @@ parameter is applicable:
        X86-32  X86-32, aka i386 architecture is enabled.
        X86-64  X86-64 architecture is enabled.
                        More X86-64 boot options can be found in
        X86-32  X86-32, aka i386 architecture is enabled.
        X86-64  X86-64 architecture is enabled.
                        More X86-64 boot options can be found in

-                       Documentation/x86_64/boot-options.txt .
+                       Documentation/x86/x86_64/boot-options.txt .

        X86     Either 32bit or 64bit x86 (same as X86-32+X86-64)
 
 In addition, the following text indicates that the option:
        X86     Either 32bit or 64bit x86 (same as X86-32+X86-64)
 
 In addition, the following text indicates that the option:


@@ -112,10 +112,10 @@ In addition, the following text indicates that the option:
 Parameters denoted with BOOT are actually interpreted by the boot
 loader, and have no meaning to the kernel directly.
 Do not modify the syntax of boot loader parameters without extreme
 Parameters denoted with BOOT are actually interpreted by the boot
 loader, and have no meaning to the kernel directly.
 Do not modify the syntax of boot loader parameters without extreme

-need or coordination with <Documentation/i386/boot.txt>.
+need or coordination with <Documentation/x86/i386/boot.txt>.

 
 There are also arch-specific kernel-parameters not documented here.
 
 There are also arch-specific kernel-parameters not documented here.

-See for example <Documentation/x86_64/boot-options.txt>.
+See for example <Documentation/x86/x86_64/boot-options.txt>.

 
 Note that ALL kernel parameters listed below are CASE SENSITIVE, and that
 a trailing = on the name of any parameter states that that parameter will
 
 Note that ALL kernel parameters listed below are CASE SENSITIVE, and that
 a trailing = on the name of any parameter states that that parameter will


@@ -995,13 +995,15 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format:
                        <cpu number>,...,<cpu number>
                        or
                        Format:
                        <cpu number>,...,<cpu number>
                        or

-                       <cpu number>-<cpu number>  (must be a positive range in ascending order)
+                       <cpu number>-<cpu number>
+                       (must be a positive range in ascending order)

                        or a mixture
                        <cpu number>,...,<cpu number>-<cpu number>
                        or a mixture
                        <cpu number>,...,<cpu number>-<cpu number>

+

                        This option can be used to specify one or more CPUs
                        to isolate from the general SMP balancing and scheduling
                        This option can be used to specify one or more CPUs
                        to isolate from the general SMP balancing and scheduling

-                       algorithms. The only way to move a process onto or off
-                       an "isolated" CPU is via the CPU affinity syscalls.
+                       algorithms. You can move a process onto or off an
+                       "isolated" CPU via the CPU affinity syscalls or cpuset.

                        <cpu number> begins at 0 and the maximum value is
                        "number of CPUs in system - 1".
 
                        <cpu number> begins at 0 and the maximum value is
                        "number of CPUs in system - 1".
 


@@ -1222,7 +1224,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        mce             [X86-32] Machine Check Exception
 
 
        mce             [X86-32] Machine Check Exception
 

-       mce=option      [X86-64] See Documentation/x86_64/boot-options.txt
+       mce=option      [X86-64] See Documentation/x86/x86_64/boot-options.txt

 
        md=             [HW] RAID subsystems devices and level
                        See Documentation/md.txt.
 
        md=             [HW] RAID subsystems devices and level
                        See Documentation/md.txt.


@@ -1470,8 +1472,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        Valid arguments: on, off
                        Default: on
 
                        Valid arguments: on, off
                        Default: on
 

-       noirqbalance    [X86-32,SMP,KNL] Disable kernel irq balancing
-

        noirqdebug      [X86-32] Disables the code which attempts to detect and
                        disable unhandled interrupt sources.
 
        noirqdebug      [X86-32] Disables the code which attempts to detect and
                        disable unhandled interrupt sources.
 


@@ -1728,7 +1728,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        See Documentation/paride.txt.
 
        pirq=           [SMP,APIC] Manual mp-table setup
                        See Documentation/paride.txt.
 
        pirq=           [SMP,APIC] Manual mp-table setup

-                       See Documentation/i386/IO-APIC.txt.
+                       See Documentation/x86/i386/IO-APIC.txt.

 
        plip=           [PPT,NET] Parallel port network link
                        Format: { parport<nr> | timid | 0 }
 
        plip=           [PPT,NET] Parallel port network link
                        Format: { parport<nr> | timid | 0 }


@@ -2343,7 +2343,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        See Documentation/fb/modedb.txt.
 
        vga=            [BOOT,X86-32] Select a particular video mode
                        See Documentation/fb/modedb.txt.
 
        vga=            [BOOT,X86-32] Select a particular video mode

-                       See Documentation/i386/boot.txt and
+                       See Documentation/x86/i386/boot.txt and

                        Documentation/svga.txt.
                        Use vga=ask for menu.
                        This is actually a boot loader parameter; the value is
                        Documentation/svga.txt.
                        Use vga=ask for menu.
                        This is actually a boot loader parameter; the value is