2019-12-23 13:33:39

by Jason A. Donenfeld

Subject: [PATCH] powerpc/shared: include correct header for static key

Recently, the spinlock implementation grew a static key optimization,
but the jump_label.h header include was left out, leading to build
errors:

linux/arch/powerpc/include/asm/spinlock.h:44:7: error: implicit declaration of function ‘static_branch_unlikely’ [-Werror=implicit-function-declaration]
44 | if (!static_branch_unlikely(&shared_processor))

This commit adds the missing header.

Fixes: 656c21d6af5d ("powerpc/shared: Use static key to detect shared processor")
Cc: Srikar Dronamraju <[email protected]>
Signed-off-by: Jason A. Donenfeld <[email protected]>
---
arch/powerpc/include/asm/spinlock.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index 1b55fc08f853..860228e917dc 100644
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -15,6 +15,7 @@
*
* (the type definitions are in asm/spinlock_types.h)
*/
+#include <linux/jump_label.h>
#include <linux/irqflags.h>
#ifdef CONFIG_PPC64
#include <asm/paca.h>
--
2.24.1

2019-12-24 16:24:28

by Srikar Dronamraju

Subject: Re: [PATCH] powerpc/shared: include correct header for static key

* Jason A. Donenfeld <[email protected]> [2019-12-23 14:31:47]:

> Recently, the spinlock implementation grew a static key optimization,
> but the jump_label.h header include was left out, leading to build
> errors:
>
> linux/arch/powerpc/include/asm/spinlock.h:44:7: error: implicit declaration of function ???static_branch_unlikely??? [-Werror=implicit-function-declaration]
> 44 | if (!static_branch_unlikely(&shared_processor))
>
> This commit adds the missing header.

Right, This was in v4 version of the patchset
(http://lkml.kernel.org/r/[email protected])
but we missed it in the final v5 version.

Thanks for noticing and fixing it.

Reviewed-by: Srikar Dronamraju <[email protected]>

>
> Fixes: 656c21d6af5d ("powerpc/shared: Use static key to detect shared processor")
> Cc: Srikar Dronamraju <[email protected]>
> Signed-off-by: Jason A. Donenfeld <[email protected]>
> ---
> arch/powerpc/include/asm/spinlock.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
> index 1b55fc08f853..860228e917dc 100644
> --- a/arch/powerpc/include/asm/spinlock.h
> +++ b/arch/powerpc/include/asm/spinlock.h
> @@ -15,6 +15,7 @@
> *
> * (the type definitions are in asm/spinlock_types.h)
> */
> +#include <linux/jump_label.h>
> #include <linux/irqflags.h>
> #ifdef CONFIG_PPC64
> #include <asm/paca.h>
> --
> 2.24.1
>

--
Thanks and Regards
Srikar Dronamraju

2020-01-06 05:25:40

by Michael Ellerman

Subject: Re: [PATCH] powerpc/shared: include correct header for static key

On Mon, 2019-12-23 at 13:31:47 UTC, "Jason A. Donenfeld" wrote:
> Recently, the spinlock implementation grew a static key optimization,
> but the jump_label.h header include was left out, leading to build
> errors:
>
> linux/arch/powerpc/include/asm/spinlock.h:44:7: error: implicit declaration of function ‘static_branch_unlikely’ [-Werror=implicit-function-declaration]
> 44 | if (!static_branch_unlikely(&shared_processor))
>
> This commit adds the missing header.
>
> Fixes: 656c21d6af5d ("powerpc/shared: Use static key to detect shared processor")
> Cc: Srikar Dronamraju <[email protected]>
> Signed-off-by: Jason A. Donenfeld <[email protected]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/6da3eced8c5f3b03340b0c395bacd552c4d52411

cheers