diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:51:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:51:10 -0700 |
| commit | 57eee9ae7bbcfb692dc96c739a5184adb6349733 (patch) | |
| tree | dd268927f30b91e8cbf95ec58e6004673b71fe40 /Documentation | |
| parent | 8f40642ad315c553bab4ae800766ade07e574a77 (diff) | |
| parent | 7e4e0bd50e80df2fe5501f48f872448376cdd997 (diff) | |
| download | linux-57eee9ae7bbcfb692dc96c739a5184adb6349733.tar.gz linux-57eee9ae7bbcfb692dc96c739a5184adb6349733.tar.bz2 linux-57eee9ae7bbcfb692dc96c739a5184adb6349733.zip | |
Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
oprofile: introduce module_param oprofile.cpu_type
oprofile: add support for Core i7 and Atom
oprofile: remove undocumented oprofile.p4force option
oprofile: re-add force_arch_perfmon option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index af43f45e8358..f08e2bebb186 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1665,6 +1665,14 @@ and is between 256 and 4096 characters. It is defined in the file oprofile.timer= [HW] Use timer interrupt instead of performance counters + oprofile.cpu_type= Force an oprofile cpu type + This might be useful if you have an older oprofile + userland or if you want common events. + Format: { archperfmon } + archperfmon: [X86] Force use of architectural + perfmon on Intel CPUs instead of the + CPU specific event set. + osst= [HW,SCSI] SCSI Tape Driver Format: <buffer_size>,<write_threshold> See also Documentation/scsi/st.txt. |