From patchwork Thu May 2 21:02:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2513841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id A70403FCA5 for ; Thu, 2 May 2013 21:05:57 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0fx-0006Fv-JG; Thu, 02 May 2013 21:04:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0fO-00024q-4U; Thu, 02 May 2013 21:03:50 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY0ee-0001y4-Gk for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 21:03:09 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0LdcDS-1U6xcY03VK-00j5Ii; Thu, 02 May 2013 23:02:40 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/9] ARM: SPEAr: conditionalize SMP code Date: Thu, 2 May 2013 23:02:55 +0200 Message-Id: <1367528578-518090-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1367528578-518090-1-git-send-email-arnd@arndb.de> References: <1367528578-518090-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:InHJ81B+FHYE13j1LWs5jxN+WFf43DEnx/diRfdzsjh OP1wR338qLfO5vzQnsJQVITY26lyo6rsDGnZu493Ffkjy4R6rU OTvv/OYUz1HKWzfLEsBE/v52nOe5YC+G8MA659PztXeXUtGiBE RAUc/NT0gSwioOe1jokjH4mYKTTexulBe06/27H9GtCZbW01N6 vKmdpSSvhI8zooTbvW0gQuiBpi+q4U90X1t1VOgMJtL8tHSbDC jACRQr/m7EV+9V4Rq4CgDap0LTjX6o8QL0LHVCCbKGfxJc0453 3rfWJSxp5LAWTr5D+EtJgDRJXaKPwoqKmYPf+FOhCPJatPa8AC wtDNsU+p2gtadCv709iZXZu2anyqx33V9UzcAPCby X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_170304_853829_9BA3DF54 X-CRM114-Status: UNSURE ( 7.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, Viresh Kumar , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 Some constant definitions are only defined for spear13xx, so we must not attempt to build SPEAr SMP support when that SoC is not enabled. arch/arm/mach-spear/platsmp.c:25:35: error: 'VA_SCU_BASE' undeclared here (not in a function) arch/arm/mach-spear/platsmp.c: In function 'spear13xx_smp_prepare_cpus': arch/arm/mach-spear/platsmp.c:111:58: error: 'SYS_LOCATION' undeclared (first use in this function) Cc: Viresh Kumar Signed-off-by: Arnd Bergmann --- arch/arm/mach-spear/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-spear/Makefile b/arch/arm/mach-spear/Makefile index af9bffb..a946c19 100644 --- a/arch/arm/mach-spear/Makefile +++ b/arch/arm/mach-spear/Makefile @@ -7,10 +7,10 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include # Common support obj-y := restart.o time.o -obj-$(CONFIG_SMP) += headsmp.o platsmp.o -obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o +smp-$(CONFIG_SMP) += headsmp.o platsmp.o +smp-$(CONFIG_HOTPLUG_CPU) += hotplug.o -obj-$(CONFIG_ARCH_SPEAR13XX) += spear13xx.o +obj-$(CONFIG_ARCH_SPEAR13XX) += spear13xx.o $(smp-y) obj-$(CONFIG_MACH_SPEAR1310) += spear1310.o obj-$(CONFIG_MACH_SPEAR1340) += spear1340.o