From patchwork Thu Nov 18 04:52:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 72049 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id B849DB7B0A for ; Thu, 18 Nov 2010 15:56:58 +1100 (EST) Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id CB536B71B0; Thu, 18 Nov 2010 15:56:35 +1100 (EST) Received: by localhost.localdomain (Postfix, from userid 1000) id E6850CDEE0; Thu, 18 Nov 2010 15:56:34 +1100 (EST) Message-Id: <20101118045247.654743185@neuling.org> User-Agent: quilt/0.48-1 Date: Thu, 18 Nov 2010 15:52:43 +1100 From: mikey@neuling.org To: Benjamin Herrenschmidt Subject: [PATCH 2/4] powerpc: remove POWER6 oprofile workarounds for POWER7 References: <20101118045241.071482503@neuling.org> Content-Disposition: inline; filename=p7-oprofile.patch Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org These are not needed on POWER7 so remove them. Signed-off-by: Michael Neuling --- arch/powerpc/kernel/cputable.c | 4 ---- 1 file changed, 4 deletions(-) Index: linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c =================================================================== --- linux-2.6-ozlabs.orig/arch/powerpc/kernel/cputable.c +++ linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c @@ -459,10 +459,6 @@ .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 */