From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 27 Apr 2009 15:44:12 +0000 (+0200)
Subject: oprofile: remove undocumented oprofile.p4force option
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1f3d7b60691993d8d368d8dd7d5d85871d41e8f5;p=deliverable%2Flinux.git

oprofile: remove undocumented oprofile.p4force option

There are no new P4s and the oprofile code knows about all existing
ones, so we don't really need the p4force option anymore.

Remove it.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
---

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index e5171c99e157..f472c0c48a3e 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/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