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

Commit 13369e83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fix from Ingo Molnar:
 "Disable function tracing during early SME setup to fix a boot crash on
  SME-enabled kernels running distro kernels (some of which have
  function tracing enabled)"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/mem_encrypt: Disable all instrumentation for early SME setup
parents 51987aff b51ce374

arch/x86/lib/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -6,6 +6,18 @@ 
# Produces uninteresting flaky coverage.

KCOV_INSTRUMENT_delay.o	:= n



# Early boot use of cmdline; don't instrument it

ifdef CONFIG_AMD_MEM_ENCRYPT

KCOV_INSTRUMENT_cmdline.o := n

KASAN_SANITIZE_cmdline.o  := n



ifdef CONFIG_FUNCTION_TRACER

CFLAGS_REMOVE_cmdline.o = -pg

endif



CFLAGS_cmdline.o := $(call cc-option, -fno-stack-protector)

endif



inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk

inat_tables_maps = $(srctree)/arch/x86/lib/x86-opcode-map.txt

quiet_cmd_inat_tables = GEN     $@

lib/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ KCOV_INSTRUMENT_list_debug.o := n 
KCOV_INSTRUMENT_debugobjects.o := n

KCOV_INSTRUMENT_dynamic_debug.o := n



# Early boot use of cmdline, don't instrument it

ifdef CONFIG_AMD_MEM_ENCRYPT

KASAN_SANITIZE_string.o := n



ifdef CONFIG_FUNCTION_TRACER

CFLAGS_REMOVE_string.o = -pg

endif



CFLAGS_string.o := $(call cc-option, -fno-stack-protector)

endif



lib-y := ctype.o string.o vsprintf.o cmdline.o \

	 rbtree.o radix-tree.o timerqueue.o xarray.o \

	 idr.o int_sqrt.o extable.o \