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 de4de3e7bc1bdfed1ad514b742d3ffa30cfabaaf..c86c074597129a5b4434b0e35c432a0a28636b11 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -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".