Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 'tracing/urgent' into tracing/core

2026-09-22 18:22:42 +00:00 · 2008-11-08 09:34:35 +01:00 · 2008-11-08 09:34:35 +01:00 · a6b0786f7f
commit a6b0786f7f
parent 3e03fb7f1d 6a60dd121c 072ba49838
45 changed files with 725 additions and 353 deletions
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
--- a/Documentation/io-mapping.txt
+++ b/Documentation/io-mapping.txt
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
--- a/arch/sh/include/asm/ftrace.h
+++ b/arch/sh/include/asm/ftrace.h
--- a/arch/sparc/include/asm/ftrace.h
+++ b/arch/sparc/include/asm/ftrace.h
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
--- a/arch/x86/include/asm/fixmap_32.h
+++ b/arch/x86/include/asm/fixmap_32.h
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
--- a/arch/x86/include/asm/highmem.h
+++ b/arch/x86/include/asm/highmem.h
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
--- a/include/asm-x86/iomap.h
+++ b/include/asm-x86/iomap.h
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/ftrace_irq.h
+++ b/include/linux/ftrace_irq.h
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
--- a/sound/drivers/ml403-ac97cr.c
+++ b/sound/drivers/ml403-ac97cr.c
--- a/sound/drivers/pcsp/pcsp_input.c
+++ b/sound/drivers/pcsp/pcsp_input.c
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
--- a/sound/isa/adlib.c
+++ b/sound/isa/adlib.c
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c