diff options
| author | Avi Kivity <avi@redhat.com> | 2009-07-27 12:00:14 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-07-27 12:00:14 +0300 |
| commit | 0b972aaabb95808397c61483bd061f4e9ed10e11 (patch) | |
| tree | 6c304825c68ad19bf9987fb7ca525a30b0a10d19 /Documentation/kernel-parameters.txt | |
| parent | 9c0d5faa5449f1d83d35444e3da371684cb49940 (diff) | |
| parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8ca488d8fbd3..5b7a706df28a 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1759,8 +1759,8 @@ and is between 256 and 4096 characters. It is defined in the file 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 + Format: { arch_perfmon } + arch_perfmon: [X86] Force use of architectural perfmon on Intel CPUs instead of the CPU specific event set. |