diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
| commit | 61be7fdec2f51b99570cd5dcc30c7848c8e56513 (patch) | |
| tree | 4a73ee635bc3e35dc54f75caddd26ffb6238bb5c /Documentation/kernel-parameters.txt | |
| parent | 12a81c8df13c60904febcafcf6b90ca1acb67122 (diff) | |
| parent | eb703f98191a505f78d0066712ad67d5dedc4c90 (diff) | |
Merge branch 'perf/nmi' into perf/core
Conflicts:
kernel/Makefile
Merge reason: Add the now complete topic, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 2b2407d9a6d0..c45a3548537a 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1812,6 +1812,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1812 | 1812 | ||
| 1813 | nousb [USB] Disable the USB subsystem | 1813 | nousb [USB] Disable the USB subsystem |
| 1814 | 1814 | ||
| 1815 | nowatchdog [KNL] Disable the lockup detector. | ||
| 1816 | |||
| 1815 | nowb [ARM] | 1817 | nowb [ARM] |
| 1816 | 1818 | ||
| 1817 | nox2apic [X86-64,APIC] Do not enable x2APIC mode. | 1819 | nox2apic [X86-64,APIC] Do not enable x2APIC mode. |