diff mbox series

igb_uio: fix build issue with lock down checks

Message ID 1530267237-17275-1-git-send-email-david.marchand@6wind.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series igb_uio: fix build issue with lock down checks |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

David Marchand June 29, 2018, 10:13 a.m. UTC 
  Caught on ubuntu-16.04 with hwe kernel for aarch64:

$ uname -a
Linux ubuntu1604arm64es 4.13.0-43-generic #48~16.04.1-Ubuntu SMP Thu May
17 13:08:01 UTC 2018 aarch64 aarch64 aarch64 GNU/Linux

== Build kernel/linux/igb_uio
  CC [M] .../kernel/linux/igb_uio/igb_uio.o
In file included from .../kernel/linux/igb_uio/igb_uio.c:20:0:
.../igb_uio/compat.h: In function ‘igbuio_kernel_is_locked_down’:
.../igb_uio/compat.h:146:7:
error: "CONFIG_EFI_SECURE_BOOT_LOCK_DOWN" is not defined [-Werror=undef]
 #elif CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
       ^
cc1: all warnings being treated as errors

Fixes: d67014c3d38b ("igb_uio: fail and log if kernel lock down is enabled")
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
 kernel/linux/igb_uio/compat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ferruh Yigit June 29, 2018, 10:54 a.m. UTC | #1 
On 6/29/2018 11:13 AM, David Marchand wrote:
> Caught on ubuntu-16.04 with hwe kernel for aarch64:
> 
> $ uname -a
> Linux ubuntu1604arm64es 4.13.0-43-generic #48~16.04.1-Ubuntu SMP Thu May
> 17 13:08:01 UTC 2018 aarch64 aarch64 aarch64 GNU/Linux
> 
> == Build kernel/linux/igb_uio
>   CC [M] .../kernel/linux/igb_uio/igb_uio.o
> In file included from .../kernel/linux/igb_uio/igb_uio.c:20:0:
> .../igb_uio/compat.h: In function ‘igbuio_kernel_is_locked_down’:
> .../igb_uio/compat.h:146:7:
> error: "CONFIG_EFI_SECURE_BOOT_LOCK_DOWN" is not defined [-Werror=undef]
>  #elif CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
>        ^
> cc1: all warnings being treated as errors
> 
> Fixes: d67014c3d38b ("igb_uio: fail and log if kernel lock down is enabled")
> Signed-off-by: David Marchand <david.marchand@6wind.com>

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

Thanks for the fix.
Thomas Monjalon July 11, 2018, 4:50 p.m. UTC | #2 
29/06/2018 12:54, Ferruh Yigit:
> On 6/29/2018 11:13 AM, David Marchand wrote:
> > Caught on ubuntu-16.04 with hwe kernel for aarch64:
> > 
> > $ uname -a
> > Linux ubuntu1604arm64es 4.13.0-43-generic #48~16.04.1-Ubuntu SMP Thu May
> > 17 13:08:01 UTC 2018 aarch64 aarch64 aarch64 GNU/Linux
> > 
> > == Build kernel/linux/igb_uio
> >   CC [M] .../kernel/linux/igb_uio/igb_uio.o
> > In file included from .../kernel/linux/igb_uio/igb_uio.c:20:0:
> > .../igb_uio/compat.h: In function ‘igbuio_kernel_is_locked_down’:
> > .../igb_uio/compat.h:146:7:
> > error: "CONFIG_EFI_SECURE_BOOT_LOCK_DOWN" is not defined [-Werror=undef]
> >  #elif CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
> >        ^
> > cc1: all warnings being treated as errors
> > 
> > Fixes: d67014c3d38b ("igb_uio: fail and log if kernel lock down is enabled")
> > Signed-off-by: David Marchand <david.marchand@6wind.com>
> 
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Thanks for the fix.

Applied, thanks
diff mbox series

Patch

diff --git a/kernel/linux/igb_uio/compat.h b/kernel/linux/igb_uio/compat.h
index e5df515..8dbb896 100644
--- a/kernel/linux/igb_uio/compat.h
+++ b/kernel/linux/igb_uio/compat.h
@@ -143,7 +143,7 @@  static inline bool igbuio_kernel_is_locked_down(void)
 #ifdef CONFIG_LOCK_DOWN_KERNEL
 #ifdef CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
 	return kernel_is_locked_down(NULL);
-#elif CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
+#elif defined(CONFIG_EFI_SECURE_BOOT_LOCK_DOWN)
 	return kernel_is_locked_down();
 #else
 	return false;