linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH, 3.18-stable regression] ARM: psci: fix header file
@ 2017-04-21 13:59 Arnd Bergmann
  2017-04-27 10:01 ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2017-04-21 13:59 UTC (permalink / raw)
  To: stable
  Cc: gregkh, Arnd Bergmann, Russell King, linux-arm-kernel, linux-kernel

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 <arnd@arndb.de>
---
 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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH, 3.18-stable regression] ARM: psci: fix header file
  2017-04-21 13:59 [PATCH, 3.18-stable regression] ARM: psci: fix header file Arnd Bergmann
@ 2017-04-27 10:01 ` Greg KH
  2017-04-27 11:11   ` Arnd Bergmann
  0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2017-04-27 10:01 UTC (permalink / raw)
  To: Arnd Bergmann; +Cc: stable, Russell King, linux-arm-kernel, linux-kernel

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 <arnd@arndb.de>
> ---
>  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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH, 3.18-stable regression] ARM: psci: fix header file
  2017-04-27 10:01 ` Greg KH
@ 2017-04-27 11:11   ` Arnd Bergmann
  0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2017-04-27 11:11 UTC (permalink / raw)
  To: Greg KH; +Cc: stable, Russell King, Linux ARM, Linux Kernel Mailing List

On Thu, Apr 27, 2017 at 12:01 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> 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 <arnd@arndb.de>
>> ---
>>  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.

Confirmed. The report was for 3.18.49 and I already noticed the error
is gone in the 3.18.50 kernelci build report.

      Arnd

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-04-27 11:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-21 13:59 [PATCH, 3.18-stable regression] ARM: psci: fix header file Arnd Bergmann
2017-04-27 10:01 ` Greg KH
2017-04-27 11:11   ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).