From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:39068 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756779Ab0GWS6h (ORCPT ); Fri, 23 Jul 2010 14:58:37 -0400 From: Jeff Ohlstein Subject: [PATCH 2/3] arm: mm: do not set missing flags on ScorpionMP Date: Fri, 23 Jul 2010 11:58:02 -0700 Message-Id: <1279911483-7039-3-git-send-email-johlstei@codeaurora.org> In-Reply-To: <1279911483-7039-1-git-send-email-johlstei@codeaurora.org> References: <1279911483-7039-1-git-send-email-johlstei@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: Russell King Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Walker , Steve Muckle , Jeff Ohlstein , Catalin Marinas , Tony Lindgren , "Kirill A. Shutemov" From: Steve Muckle ScorpionMP does not have the SMP/nAMP mode and TLB ops broadcasting bits in the ACTLR. Signed-off-by: Steve Muckle Signed-off-by: Jeff Ohlstein --- arch/arm/mm/proc-v7.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 7aaf88a..6bddf5d 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -190,7 +190,7 @@ cpu_v7_name: * - cache type register is implemented */ __v7_setup: -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_ARCH_MSM_SCORPIONMP) mrc p15, 0, r0, c1, c0, 1 tst r0, #(1 << 6) @ SMP/nAMP mode enabled? orreq r0, r0, #(1 << 6) | (1 << 0) @ Enable SMP/nAMP mode and -- 1.7.1.1