From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 May 2022 17:31:36 +0000 (-0700)
Subject: Merge tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.19-rc1~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76bfd3de34783ceda1fc1d73d0db87361de07ecb;p=thirdparty%2Flinux.git

Merge tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing updates from Steven Rostedt:
 "The majority of the changes are for fixes and clean ups.

  Notable changes:

   - Rework trace event triggers code to be easier to interact with.

   - Support for embedding bootconfig with the kernel (as suppose to
     having it embedded in initram). This is useful for embedded boards
     without initram disks.

   - Speed up boot by parallelizing the creation of tracefs files.

   - Allow absolute ring buffer timestamps handle timestamps that use
     more than 59 bits.

   - Added new tracing clock "TAI" (International Atomic Time)

   - Have weak functions show up in available_filter_function list as:
     __ftrace_invalid_address___<invalid-offset> instead of using the
     name of the function before it"

* tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (52 commits)
  ftrace: Add FTRACE_MCOUNT_MAX_OFFSET to avoid adding weak function
  tracing: Fix comments for event_trigger_separate_filter()
  x86/traceponit: Fix comment about irq vector tracepoints
  x86,tracing: Remove unused headers
  ftrace: Clean up hash direct_functions on register failures
  tracing: Fix comments of create_filter()
  tracing: Disable kcov on trace_preemptirq.c
  tracing: Initialize integer variable to prevent garbage return value
  ftrace: Fix typo in comment
  ftrace: Remove return value of ftrace_arch_modify_*()
  tracing: Cleanup code by removing init "char *name"
  tracing: Change "char *" string form to "char []"
  tracing/timerlat: Do not wakeup the thread if the trace stops at the IRQ
  tracing/timerlat: Print stacktrace in the IRQ handler if needed
  tracing/timerlat: Notify IRQ new max latency only if stop tracing is set
  kprobes: Fix build errors with CONFIG_KRETPROBES=n
  tracing: Fix return value of trace_pid_write()
  tracing: Fix potential double free in create_var_ref()
  tracing: Use strim() to remove whitespace instead of doing it manually
  ftrace: Deal with error return code of the ftrace_process_locs() function
  ...
---

76bfd3de34783ceda1fc1d73d0db87361de07ecb
diff --cc init/Kconfig
index 583675727b856,2462d4ae2dc84..251aac1c0ccd3
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -1348,16 -1361,25 +1348,35 @@@ config BOOT_CONFI
  
  	  If unsure, say Y.
  
+ config BOOT_CONFIG_EMBED
+ 	bool "Embed bootconfig file in the kernel"
+ 	depends on BOOT_CONFIG
+ 	help
+ 	  Embed a bootconfig file given by BOOT_CONFIG_EMBED_FILE in the
+ 	  kernel. Usually, the bootconfig file is loaded with the initrd
+ 	  image. But if the system doesn't support initrd, this option will
+ 	  help you by embedding a bootconfig file while building the kernel.
+ 
+ 	  If unsure, say N.
+ 
+ config BOOT_CONFIG_EMBED_FILE
+ 	string "Embedded bootconfig file path"
+ 	depends on BOOT_CONFIG_EMBED
+ 	help
+ 	  Specify a bootconfig file which will be embedded to the kernel.
+ 	  This bootconfig will be used if there is no initrd or no other
+ 	  bootconfig in the initrd.
+ 
 +config INITRAMFS_PRESERVE_MTIME
 +	bool "Preserve cpio archive mtimes in initramfs"
 +	default y
 +	help
 +	  Each entry in an initramfs cpio archive carries an mtime value. When
 +	  enabled, extracted cpio items take this mtime, with directory mtime
 +	  setting deferred until after creation of any child entries.
 +
 +	  If unsure, say Y.
 +
  choice
  	prompt "Compiler optimization level"
  	default CC_OPTIMIZE_FOR_PERFORMANCE