From: Michael Neuling <mikey@neuling.org>
Date: Wed, 17 Nov 2010 18:52:43 +0000 (+0000)
Subject: powerpc: Remove POWER6 oprofile workarounds for POWER7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d32bb1827da3ebb413f6cb492990a42ab030559;p=linux-beck.git

powerpc: Remove POWER6 oprofile workarounds for POWER7

These are not needed on POWER7 so remove them.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 75062cb40e7b..65813ee98b7d 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -459,10 +459,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.pmc_type		= PPC_PMC_IBM,
 		.oprofile_cpu_type	= "ppc64/power7",
 		.oprofile_type		= PPC_OPROFILE_POWER4,
-		.oprofile_mmcra_sihv	= POWER6_MMCRA_SIHV,
-		.oprofile_mmcra_sipr	= POWER6_MMCRA_SIPR,
-		.oprofile_mmcra_clear	= POWER6_MMCRA_THRM |
-			POWER6_MMCRA_OTHER,
 		.platform		= "power7",
 	},
 	{	/* Cell Broadband Engine */