Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e94693f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool updates from Ingo Molnar:
 "This is an extensive rewrite of the objdump tool to track all stack
  pointer modifications through the machine instructions of disassembled
  functions found in kernel .o files.

  This re-design removes the prior dependency on CONFIG_FRAME_POINTERS,
  with the goal to prepare the tool to generate kernel debuginfo data in
  the future. There's also an increase in checking/tracking robustness
  as a side effect as well.

  No (intended) changes to existing functionality"

* 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Silence warnings for functions which use IRET
  objtool: Implement stack validation 2.0
  objtool, x86: Add several functions and files to the objtool whitelist
  objtool: Move checking code to check.c
parents 26d3a77d 2513cbf9

arch/x86/crypto/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Arch-specific CryptoAPI modules.

#



OBJECT_FILES_NON_STANDARD := y



avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no)

avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

				$(comma)4)$(comma)%ymm2,yes,no)

arch/x86/crypto/sha1-mb/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Arch-specific CryptoAPI modules.

#



OBJECT_FILES_NON_STANDARD := y



avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

                                $(comma)4)$(comma)%ymm2,yes,no)

ifeq ($(avx2_supported),yes)

arch/x86/crypto/sha256-mb/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Arch-specific CryptoAPI modules.

#



OBJECT_FILES_NON_STANDARD := y



avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

                                $(comma)4)$(comma)%ymm2,yes,no)

ifeq ($(avx2_supported),yes)

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ OBJECT_FILES_NON_STANDARD_head_$(BITS).o := y 
OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o	:= y

OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o		:= y

OBJECT_FILES_NON_STANDARD_test_nx.o			:= y

OBJECT_FILES_NON_STANDARD_paravirt_patch_$(BITS).o	:= y



# If instrumentation of this dir is enabled, boot hangs during first second.

# Probably could be more selective here, but note that files related to irqs,

arch/x86/kernel/acpi/Makefile

+2 −0
Original line number Diff line number Diff line 
OBJECT_FILES_NON_STANDARD_wakeup_$(BITS).o := y



obj-$(CONFIG_ACPI)		+= boot.o

obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup_$(BITS).o

obj-$(CONFIG_ACPI_APEI)		+= apei.o