c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-18 02:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix objtool configure check

Browse Source 
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💯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 <kjeld@schouten-lebbing.nl>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #10990
This commit is contained in:
Brian Behlendorf 2020-09-28 16:40:50 -07:00
parent ced5f71eec
commit 9f29a4d972
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/kernel-objtool.m4
View File

@ -6,10 +6,11 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_OBJTOOL], [
dnl # 4.6 API for compile-time stack validation dnl # 4.6 API for compile-time stack validation
ZFS_LINUX_TEST_SRC([objtool], [ ZFS_LINUX_TEST_SRC([objtool], [
#undef __ASSEMBLY__ #undef __ASSEMBLY__
#include <asm/ptrace.h>
#include <asm/frame.h> #include <asm/frame.h>
],[ ],[
#if !defined(FRAME_BEGIN) #if !defined(FRAME_BEGIN)
CTASSERT(1); #error "FRAME_BEGIN is not defined"
#endif #endif
]) ])
@ -18,7 +19,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_OBJTOOL], [
#include <linux/frame.h> #include <linux/frame.h>
],[ ],[
#if !defined(STACK_FRAME_NON_STANDARD) #if !defined(STACK_FRAME_NON_STANDARD)
CTASSERT(1); #error "STACK_FRAME_NON_STANDARD is not defined."
#endif #endif
]) ])
]) ])

3
include/sys/frame.h
View File

@ -23,7 +23,8 @@
extern "C" { extern "C" {
#endif #endif
#if defined(__KERNEL__) && defined(HAVE_STACK_FRAME_NON_STANDARD) #if defined(__KERNEL__) && defined(HAVE_KERNEL_OBJTOOL) && \
defined(HAVE_STACK_FRAME_NON_STANDARD)
#include <linux/frame.h> #include <linux/frame.h>
#else #else
#define STACK_FRAME_NON_STANDARD(func) #define STACK_FRAME_NON_STANDARD(func)