diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:10:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:10:29 -0500 |
| commit | 124ba9403318d834ef21bcd899c22c870708d2c4 (patch) | |
| tree | 2ac84214085de8780dfa565be7e3ef0d675f6a68 /Documentation/kernel-parameters.txt | |
| parent | 74eec26facadbe6dbc0621bc862892c915c4534f (diff) | |
| parent | dd3c4670d7fafeb18bf7542fbcfd2606fb06a4a1 (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
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 fd5c913c33c1..1205505798cc 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1888,6 +1888,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 1888 | timer: [X86] Force use of architectural NMI | 1888 | timer: [X86] Force use of architectural NMI |
| 1889 | timer mode (see also oprofile.timer | 1889 | timer mode (see also oprofile.timer |
| 1890 | for generic hr timer mode) | 1890 | for generic hr timer mode) |
| 1891 | [s390] Force legacy basic mode sampling | ||
| 1892 | (report cpu_type "timer") | ||
| 1891 | 1893 | ||
| 1892 | oops=panic Always panic on oopses. Default is to just kill the | 1894 | oops=panic Always panic on oopses. Default is to just kill the |
| 1893 | process, but there is a small probability of | 1895 | process, but there is a small probability of |