summaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-11-15 14:05:18 +0400
committerIngo Molnar <mingo@elte.hu>2011-11-15 14:05:18 +0400
commitc23205c8488f11cb9ebe7a7b5851a1d8a0171011 (patch)
tree239dd82daddb1ce08b50ea9145d8f2a4685ebead /Documentation/kernel-parameters.txt
parent5d81e5cfb37a174e8ddc0413e2e70cdf05807ace (diff)
parentde346b6949063aa040ef607943b072835294f4b3 (diff)
downloadlinux-c23205c8488f11cb9ebe7a7b5851a1d8a0171011.tar.xz
Merge branch 'core' of git://amd64.org/linux/rric into perf/core
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a0c5c5f4fce6..fd5c913c33c1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1885,6 +1885,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
arch_perfmon: [X86] Force use of architectural
perfmon on Intel CPUs instead of the
CPU specific event set.
+ timer: [X86] Force use of architectural NMI
+ timer mode (see also oprofile.timer
+ for generic hr timer mode)
oops=panic Always panic on oopses. Default is to just kill the
process, but there is a small probability of