From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755293AbdD0KBm (ORCPT ); Thu, 27 Apr 2017 06:01:42 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59326 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751104AbdD0KBe (ORCPT ); Thu, 27 Apr 2017 06:01:34 -0400 Date: Thu, 27 Apr 2017 12:01:24 +0200 From: Greg KH To: Arnd Bergmann Cc: stable@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH, 3.18-stable regression] ARM: psci: fix header file Message-ID: <20170427100124.GE1755@kroah.com> References: <20170421135923.2735181-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170421135923.2735181-1-arnd@arndb.de> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 21, 2017 at 03:59:17PM +0200, Arnd Bergmann wrote: > 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(-) This should have already been fixed in 3.18.50 as dbcfee724255 was reverted there. Because of that, this patch does not apply to the 3.18-stable tree. thanks, greg k-h