From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1040259AbdDUOAC (ORCPT ); Fri, 21 Apr 2017 10:00:02 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58995 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1040175AbdDUN74 (ORCPT ); Fri, 21 Apr 2017 09:59:56 -0400 From: Arnd Bergmann To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, Arnd Bergmann , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH, 3.18-stable regression] ARM: psci: fix header file Date: Fri, 21 Apr 2017 15:59:17 +0200 Message-Id: <20170421135923.2735181-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:anwghF6CtPvgmZ0rb2U+wy0NsBrNm2Rkvw9hGOsSZhMPPm1vZiW MOtoNCzs7J28R9dKQrY6lZfFsSbSL4Y2r1fK6PnseP2sj+a92vrttCNCjfCrv5IcU8fxgLm uVaB0Xn2e4m6izpTgln4vpY8G1evHBkFe+2KRlR4RcSIGR5oNxkZnZcZgil0k017Y9CdOnI YzMHXrAu693cLQWEQzJtg== X-UI-Out-Filterresults: notjunk:1;V01:K0:6kaJQCpVQfs=:rwL848olUo6fF2vTCKfNHB T94uDPPyp0tgb1XnhMcFr2f77w3i3wWdLngpJSPQnMvXDCkSkUU8lcNggipIy9OP0hOnHKyXK P2oEulAUvB4aHONtCqPkNFt3RDKoQLoEFSZMkx065LXAeJhVnE4TFyVVuRd9AJx5VBEq1e2H5 w3VJ9gyjFRoHAKxMPwpb08Eap5e5Zm3tT7OKCcuat/3rWZ5hHbK3BWgdbTx6kU18P4znb2qNO iUMLf05lv1MxAmRibRTNS/tm1qlR8rSceUEhjI5iSbfduvZW+EwEAggFfkmhQnw5yvHru+ZSR p4uCgnKlXJaWHoaVi60mGCdosJ1WBy9/3jJAYE86cZm2GcTySVNkzgYz2i+6/d1Dg1dL9e2qz OjXvlWkQbXYaCuWj5OippuGn2EC5+qtz7bmuw9+CB8qCQOFlJOJSdi+4NMxvVr9GMmvt/ZQrK cRu7ZwVld8jsWczZ1Z07THhotSsPetFPki0enIYbFeASeaiTIF9O4hLtCZHAghCODyk2bSzb1 Po6lPZw5dvAB3kAHxORgh2k9v+iQLwhD/SEZAqTPrJ9gCFV0m9yL7Io2wWhl4Kcs43NVB/o81 t2OczqG1/rR5e9lZpDoOXcu/Nu7YXvR/qiDeYesHUOJWZ5jMlrG8wBHWhx8Dxm3fWY0DrJL+P o4pRJkfyqBp0i42GB7r0LFOjdtsIZYFHbbaLJTIqWcUxGK7kh4ThOTU4e4sO0dgt8IBs= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit be95485a0b828 was incorrectly backported to 3.18 and now causes a different build error when CONFIG_SMP is disabled: arch/arm/kernel/psci.c:287:12: error: redefinition of 'psci_init' This version is how it should be on 3.18, with the main psci code built for both SMP and UP, but the psci_smp_available() function only being available for SMP builds. Fixes: dbcfee724255 ("ARM: 8457/1: psci-smp is built only for SMP") Signed-off-by: Arnd Bergmann --- arch/arm/include/asm/psci.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index e3789fb02c9c..8ca5308a05d7 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -37,11 +37,15 @@ struct psci_operations { extern struct psci_operations psci_ops; extern struct smp_operations psci_smp_ops; -#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI) +#ifdef CONFIG_ARM_PSCI int psci_init(void); -bool psci_smp_available(void); #else static inline int psci_init(void) { return 0; } +#endif + +#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI) +bool psci_smp_available(void); +#else static inline bool psci_smp_available(void) { return false; } #endif -- 2.9.0