diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-11-15 11:05:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-15 11:05:18 +0100 |
| commit | c23205c8488f11cb9ebe7a7b5851a1d8a0171011 (patch) | |
| tree | 239dd82daddb1ce08b50ea9145d8f2a4685ebead /Documentation | |
| parent | 5d81e5cfb37a174e8ddc0413e2e70cdf05807ace (diff) | |
| parent | de346b6949063aa040ef607943b072835294f4b3 (diff) | |
Merge branch 'core' of git://amd64.org/linux/rric into perf/core
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a0c5c5f4fce..fd5c913c33c 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 |