diff options
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 | ||||
-rw-r--r-- | arch/x86/oprofile/nmi_int.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 92e1ab8178a8..c59e965a748d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1728,8 +1728,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1728 | oprofile.cpu_type= Force an oprofile cpu type | 1728 | oprofile.cpu_type= Force an oprofile cpu type |
1729 | This might be useful if you have an older oprofile | 1729 | This might be useful if you have an older oprofile |
1730 | userland or if you want common events. | 1730 | userland or if you want common events. |
1731 | Format: { archperfmon } | 1731 | Format: { arch_perfmon } |
1732 | archperfmon: [X86] Force use of architectural | 1732 | arch_perfmon: [X86] Force use of architectural |
1733 | perfmon on Intel CPUs instead of the | 1733 | perfmon on Intel CPUs instead of the |
1734 | CPU specific event set. | 1734 | CPU specific event set. |
1735 | 1735 | ||
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index b07dd8d0b321..89b9a5cd63da 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
@@ -390,7 +390,7 @@ static int __init p4_init(char **cpu_type) | |||
390 | static int force_arch_perfmon; | 390 | static int force_arch_perfmon; |
391 | static int force_cpu_type(const char *str, struct kernel_param *kp) | 391 | static int force_cpu_type(const char *str, struct kernel_param *kp) |
392 | { | 392 | { |
393 | if (!strcmp(str, "archperfmon")) { | 393 | if (!strcmp(str, "arch_perfmon")) { |
394 | force_arch_perfmon = 1; | 394 | force_arch_perfmon = 1; |
395 | printk(KERN_INFO "oprofile: forcing architectural perfmon\n"); | 395 | printk(KERN_INFO "oprofile: forcing architectural perfmon\n"); |
396 | } | 396 | } |