From 88d0e407e81e656c691dcb199b28b4c0cb26636a Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 27 Apr 2009 17:44:12 +0200
Subject: [PATCH] --- yaml --- r: 145969 b: refs/heads/master c:
 1f3d7b60691993d8d368d8dd7d5d85871d41e8f5 h: refs/heads/master i:   145967:
 f9c879d7bafa94f97c68549279640fa12f9ab1c9 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/oprofile/nmi_int.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1ef810668188..08786d4ff201 100644
--- 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
index e5171c99e157..f472c0c48a3e 100644
--- 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