diff options
| author | Brian Behlendorf <[email protected]> | 2020-09-28 16:40:50 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-28 16:40:50 -0700 |
| commit | 96951e0327ecc6f54125775ab807ba7dc9189b9b (patch) | |
| tree | d62d36dc2873a932a0dfa578bf7feaebb006cc47 /config | |
| parent | 53245fe337d1c79e28a4b3837bc589b126bc17da (diff) | |
Fix objtool configure check
The m4 objtool configure check can incorrectly fail because of a
missing header in the test. This appears to be the result of a
recent kernel change and was observed on the Fedora 5.8.11-200
kernel.
In file included from /home/fedora/zfs/build/objtool/objtool.c:75:
./arch/x86/include/asm/frame.h:100:57: error: 'struct pt_regs'
declared inside parameter list will not be visible outside
of this definition or declaration [-Werror]
The consequence of this is that the "stack_frame_non_standard"
check is never run and HAVE_STACK_FRAME_NON_STANDARD is set
incorrectly which results in a build failure. This change adds
the appropriate header to the "objtool" check so it now behaves
as intended.
Reviewed-by: Kjeld Schouten <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #10990
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-objtool.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/kernel-objtool.m4 b/config/kernel-objtool.m4 index bf60e7869..c560c4195 100644 --- a/config/kernel-objtool.m4 +++ b/config/kernel-objtool.m4 @@ -6,10 +6,11 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_OBJTOOL], [ dnl # 4.6 API for compile-time stack validation ZFS_LINUX_TEST_SRC([objtool], [ #undef __ASSEMBLY__ + #include <asm/ptrace.h> #include <asm/frame.h> ],[ #if !defined(FRAME_BEGIN) - CTASSERT(1); + #error "FRAME_BEGIN is not defined" #endif ]) @@ -18,7 +19,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_OBJTOOL], [ #include <linux/frame.h> ],[ #if !defined(STACK_FRAME_NON_STANDARD) - CTASSERT(1); + #error "STACK_FRAME_NON_STANDARD is not defined." #endif ]) ]) |