From patchwork Fri Aug 22 02:06:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 4760421 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E2F289F344 for ; Fri, 22 Aug 2014 02:09:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F94E20172 for ; Fri, 22 Aug 2014 02:09:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4441E20160 for ; Fri, 22 Aug 2014 02:09:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XKeGR-0003r7-EZ; Fri, 22 Aug 2014 02:07:39 +0000 Received: from mezzanine.sirena.org.uk ([2400:8900::f03c:91ff:fedb:4f4]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XKeGO-0003mX-U3 for linux-arm-kernel@lists.infradead.org; Fri, 22 Aug 2014 02:07:37 +0000 Received: from [208.59.64.2] (helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XKeFk-0002y1-P5; Fri, 22 Aug 2014 02:06:58 +0000 Received: from broonie by finisterre with local (Exim 4.84_RC1) (envelope-from ) id 1XKeFR-0004EN-Gq; Thu, 21 Aug 2014 21:06:37 -0500 From: Mark Brown To: Marc Carino , Brian Norris , Christian Daudt , Matt Porter Date: Thu, 21 Aug 2014 21:06:34 -0500 Message-Id: <1408673194-16228-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.1.0.rc1 X-SA-Exim-Connect-IP: 208.59.64.2 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Subject: [PATCH] ARM: bcm: Don't build brcmstb SMP code when building for V6 X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140821_190737_103220_7502047C X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: -0.7 (/) Cc: linaro-kernel@lists.linaro.org, Arnd Bergmann , Mark Brown , bcm-kernel-feedback-list@broadcom.com, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mark Brown The brcmstb SMP code contains isb() and dsb() which are not supported when building for -march=armv6 as happens when building allmodconfig. Since I have not been able to identify a way to override the compiler architecture selection per file add a Kconfig dependency to ensure this code is not built if V6 support is enabled. There is doubtless a better solution. Signed-off-by: Mark Brown --- arch/arm/mach-bcm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index fc93800..372132d 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -102,6 +102,7 @@ config ARCH_BCM_5301X config ARCH_BRCMSTB bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7 depends on MMU + depends on !CPU_V6 select ARM_GIC select MIGHT_HAVE_PCI select HAVE_SMP