diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /Documentation/kernel-parameters.txt | |
| parent | ftrace: display start of CPU buffer in trace output (diff) | |
| parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent (diff) | |
| download | linux-dev-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.tar.xz linux-dev-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.zip | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4862284d3119..196fd1c62a2f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1003,13 +1003,15 @@ and is between 256 and 4096 characters. It is defined in the file 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> + 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". @@ -1478,8 +1480,6 @@ and is between 256 and 4096 characters. It is defined in the file 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. |