From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752558AbbJPWV3 (ORCPT ); Fri, 16 Oct 2015 18:21:29 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:49725 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752426AbbJPWV2 (ORCPT ); Fri, 16 Oct 2015 18:21:28 -0400 From: Arnd Bergmann To: Russell King Cc: Rob Herring , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Will Deacon , Mark Rutland , Lorenzo Pieralisi Subject: [PATCH] ARM: psci-smp is built only for SMP Date: Sat, 17 Oct 2015 00:21:07 +0200 Message-ID: <4561751.e2CPD6ukve@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:37ioZuEM2HUB6Qdvpw7P9WOc6G7l7QebgMijRmWjb4eWHg/kUP8 7gBSkFdD/2CwwGQ9WzyOt3VwmRo3pctPbCRl3uSUR4q6oxpRfopTRsvKjVJO6M+pTbw6AuJ r9AQge4c7270C8WvaWRfOgzrYBC5PRDf4I5w0VZ/7cmv0uJywOjBruhO+0EdosuwPEe2Krf cSlMovW88iDxq+nEoG3Tw== X-UI-Out-Filterresults: notjunk:1;V01:K0:FA7UVe1xfiM=:/ZeflZylMmf5EDp9StTq6E Ruj3Z1csvD40Y7gQOurFHmBCHCdcoCba7keIbiUumaBnUlq+MkKE3RsgllR2LedJn/C2yhaZ7 Mas3U0LEWCpoQcI/2iQukc4LJYNnB+BMBH8DHuep3zhbp0m+2CwGdKVE/0B5xdCNUO8UEkW9a fmqnx+R4S/q7ok15QnpwcdkRpfBykzmK9Z6wiP6fsREbBriqQ6nT/lgQdcQFHR0YhJ9AI/qPL sdo9r4/axfHNl0j1wZXd8DcznFP7Tn6y/nUcLk8K2TX+dVsQiFQOg5xzXRzjZX8xFBl7RaoLD 6SFpe4O/KgwrNASRi8pmOZeIH0QxcIfrHHy5qtec+jNcs1U5tF9xIiGRV8Ku84ILU3g92+41X 92Lh4ljQ1FWBXMzCBdoSnLyGA0vReGLUgDXryjB3ytWVxQ9XqSJ5rNp6put9+vZWnugIFrWNu dvz3ticrqqy06AWGeNwGOEhgwGhPWe+aX+TxZxyBuHp+C1WIeElvUDZ1aXnfq6kK40/c3+dEl u9qa5GaDImKrqXdd3v5mmGIxmpQWPgr6hfngoiU/ej64m19vHtoS4ZS8UFaV29iRBSDfaCvQ2 fmvRaD19fkcFal67YSYmXnFsyeVa5bkoN6i9ACkPQo3AX7cn7jFI5V7kuxVgdqF+U0Q6XD8pE nuXT53mA0kfSYwptCQHeHP8fLduoibTBoVxJ7NiD0fiIehEk8Ug1Va3AVn/WgwYobQ30Cesmv 5X1alOeXrMqw0yc5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PSCI SMP implementation is built only when both CONFIG_SMP and CONFIG_ARM_PSCI are set, so a configuration that has the latter but not the former can get a link error when it tries to call psci_smp_available(). arch/arm/mach-tegra/built-in.o: In function `tegra114_cpuidle_init': cpuidle-tegra114.c:(.init.text+0x52a): undefined reference to `psci_smp_available' This corrects the #ifdef in the psci.h header file to match the Makefile conditional we have for building that function. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index 68ee3ce17b82..b4c6d99364f1 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -16,7 +16,7 @@ extern struct smp_operations psci_smp_ops; -#ifdef CONFIG_ARM_PSCI +#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI) bool psci_smp_available(void); #else static inline bool psci_smp_available(void) { return false; }