powerpc/security: Fix build break

Message ID 20190515045206.10610-1-joel@jms.id.au
State New
Headers show
Series
  • powerpc/security: Fix build break
Related show

Commit Message

Joel Stanley May 15, 2019, 4:52 a.m.
This fixes a build break introduced in with the recent round of CPU
bug patches.

  arch/powerpc/kernel/security.c: In function ‘setup_barrier_nospec’:
  arch/powerpc/kernel/security.c:59:21: error: implicit declaration of
  function ‘cpu_mitigations_off’ [-Werror=implicit-function-declaration]
    if (!no_nospec && !cpu_mitigations_off())
                       ^~~~~~~~~~~~~~~~~~~

Fixes: 782e69efb3df ("powerpc/speculation: Support 'mitigations=' cmdline option")
Signed-off-by: Joel Stanley <joel@jms.id.au>

---
This should be applied to the 4.14 and 4.19 trees. There is no issue
with 5.1. The commit message contains a fixes line for the commit in
Linus tree.
---
 arch/powerpc/kernel/security.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.20.1

Comments

Greg KH May 15, 2019, 5:18 a.m. | #1
On Wed, May 15, 2019 at 02:22:06PM +0930, Joel Stanley wrote:
> This fixes a build break introduced in with the recent round of CPU

> bug patches.

> 

>   arch/powerpc/kernel/security.c: In function ‘setup_barrier_nospec’:

>   arch/powerpc/kernel/security.c:59:21: error: implicit declaration of

>   function ‘cpu_mitigations_off’ [-Werror=implicit-function-declaration]

>     if (!no_nospec && !cpu_mitigations_off())

>                        ^~~~~~~~~~~~~~~~~~~

> 

> Fixes: 782e69efb3df ("powerpc/speculation: Support 'mitigations=' cmdline option")

> Signed-off-by: Joel Stanley <joel@jms.id.au>

> ---

> This should be applied to the 4.14 and 4.19 trees. There is no issue

> with 5.1. The commit message contains a fixes line for the commit in

> Linus tree.

> ---

>  arch/powerpc/kernel/security.c | 1 +

>  1 file changed, 1 insertion(+)


Isn't this just commit 42e2acde1237 ("powerpc/64s: Include cpu header")?

thanks,

greg k-h
Greg KH May 15, 2019, 6:08 a.m. | #2
On Wed, May 15, 2019 at 07:18:30AM +0200, Greg Kroah-Hartman wrote:
> On Wed, May 15, 2019 at 02:22:06PM +0930, Joel Stanley wrote:

> > This fixes a build break introduced in with the recent round of CPU

> > bug patches.

> > 

> >   arch/powerpc/kernel/security.c: In function ‘setup_barrier_nospec’:

> >   arch/powerpc/kernel/security.c:59:21: error: implicit declaration of

> >   function ‘cpu_mitigations_off’ [-Werror=implicit-function-declaration]

> >     if (!no_nospec && !cpu_mitigations_off())

> >                        ^~~~~~~~~~~~~~~~~~~

> > 

> > Fixes: 782e69efb3df ("powerpc/speculation: Support 'mitigations=' cmdline option")

> > Signed-off-by: Joel Stanley <joel@jms.id.au>

> > ---

> > This should be applied to the 4.14 and 4.19 trees. There is no issue

> > with 5.1. The commit message contains a fixes line for the commit in

> > Linus tree.

> > ---

> >  arch/powerpc/kernel/security.c | 1 +

> >  1 file changed, 1 insertion(+)

> 

> Isn't this just commit 42e2acde1237 ("powerpc/64s: Include cpu header")?


Which I have now queued up.

Patch

diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index e9af5d9badf2..68d4ec373cfc 100644
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -4,6 +4,7 @@ 
 //
 // Copyright 2018, Michael Ellerman, IBM Corporation.
 
+#include <linux/cpu.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/seq_buf.h>