[PATCH, 3.18-stable regression] ARM: psci: fix header file

[PATCH, 3.18-stable regression] ARM: psci: fix header file

[Arnd Bergmann]

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

Re: [PATCH, 3.18-stable regression] ARM: psci: fix header file

[Greg KH]

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

Patch "ARM: psci: fix header file" has been added to the 3.18-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ARM: psci: fix header file

to the 3.18-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-psci-fix-header-file.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From arnd@arndb.de  Thu Apr 27 11:58:20 2017
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 21 Apr 2017 15:59:17 +0200
Subject: ARM: psci: fix header file
To: stable@vger.kernel.org
Cc: gregkh@linuxfoundation.org, Arnd Bergmann <arnd@arndb.de>, Russell King <linux@arm.linux.org.uk>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Message-ID: <20170421135923.2735181-1-arnd@arndb.de>

From: Arnd Bergmann <arnd@arndb.de>

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 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



Patches currently in stable-queue which might be from arnd@arndb.de are

queue-3.18/acpi-power-avoid-maybe-uninitialized-warning.patch
queue-3.18/gadgetfs-fix-uninitialized-variable-in-error-handling.patch
queue-3.18/clk-at91-usb-fix-determine_rate-prototype-again.patch
queue-3.18/arm-psci-fix-header-file.patch
queue-3.18/dm-bufio-hide-bogus-warning.patch

Re: [PATCH, 3.18-stable regression] ARM: psci: fix header file

[Arnd Bergmann]

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

Re: Patch "ARM: psci: fix header file" has been added to the 3.18-stable tree

[Greg KH]

On Thu, Apr 27, 2017 at 12:04:10PM +0200, gregkh@linuxfoundation.org wrote:
> 
> This is a note to let you know that I've just added the patch titled
> 
>     ARM: psci: fix header file
> 
> to the 3.18-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> The filename of the patch is:
>      arm-psci-fix-header-file.patch
> and it can be found in the queue-3.18 subdirectory.

Oops, no, it didn't apply, forgot to delete it from the stable queue.
It's not really there.

greg k-h