---

yaml --- r: 145969 b: refs/heads/master c: 1f3d7b6 h: refs/heads/master i: 145967: f9c879d v: v3
git-mirror · May 8, 2009 · 88d0e40 · 88d0e40
1 parent 7000c93
commit 88d0e40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dcdb5a9e7c235e6e80f1f4d5b8247b3e5347e48
+refs/heads/master: 1f3d7b60691993d8d368d8dd7d5d85871d41e8f5
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
@@ -356,14 +356,11 @@ static void exit_sysfs(void)
 #define exit_sysfs() do { } while (0)
 #endif /* CONFIG_PM */
 
-static int p4force;
-module_param(p4force, int, 0);
-
 static int __init p4_init(char **cpu_type)
 {
 	__u8 cpu_model = boot_cpu_data.x86_model;
 
-	if (!p4force && (cpu_model > 6 || cpu_model == 5))
+	if (cpu_model > 6 || cpu_model == 5)
 		return 0;
 
 #ifndef CONFIG_SMP