Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757524Ab0GWS7H (ORCPT ); Fri, 23 Jul 2010 14:59:07 -0400 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 X-IronPort-AV: E=McAfee;i="5400,1158,6052"; a="48450454" X-IronPort-AV: E=Sophos;i="4.55,247,1278313200"; d="scan'208";a="69829415" From: Jeff Ohlstein 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 , Russell King , Catalin Marinas , Tony Lindgren , "Kirill A. Shutemov" 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> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1279911483-7039-1-git-send-email-johlstei@codeaurora.org> References: <1279911483-7039-1-git-send-email-johlstei@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1047 Lines: 32 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/