瀏覽代碼

x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon

The short name of the achitecture is 'arch_perfmon'. This patch
changes the kernel parameter to use this name.

Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Robert Richter 16 年之前
父節點
當前提交
8d7ff4f2a0
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      Documentation/kernel-parameters.txt
  2. 1 1
      arch/x86/oprofile/nmi_int.c

+ 2 - 2
Documentation/kernel-parameters.txt

@@ -1728,8 +1728,8 @@ and is between 256 and 4096 characters. It is defined in the file
 	oprofile.cpu_type=	Force an oprofile cpu type
 	oprofile.cpu_type=	Force an oprofile cpu type
 			This might be useful if you have an older oprofile
 			This might be useful if you have an older oprofile
 			userland or if you want common events.
 			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
 				perfmon on Intel CPUs instead of the
 				CPU specific event set.
 				CPU specific event set.
 
 

+ 1 - 1
arch/x86/oprofile/nmi_int.c

@@ -390,7 +390,7 @@ static int __init p4_init(char **cpu_type)
 static int force_arch_perfmon;
 static int force_arch_perfmon;
 static int force_cpu_type(const char *str, struct kernel_param *kp)
 static int force_cpu_type(const char *str, struct kernel_param *kp)
 {
 {
-	if (!strcmp(str, "archperfmon")) {
+	if (!strcmp(str, "arch_perfmon")) {
 		force_arch_perfmon = 1;
 		force_arch_perfmon = 1;
 		printk(KERN_INFO "oprofile: forcing architectural perfmon\n");
 		printk(KERN_INFO "oprofile: forcing architectural perfmon\n");
 	}
 	}