Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into tracing/hw-branch-tracing

This pulls together all the topic branches that are needed for the DS/BTS/PEBS tracing work.
2026-09-20 18:15:29 +00:00 · 2008-11-25 17:30:25 +01:00 · 2008-11-25 17:30:25 +01:00 · 7d55718b0c
commit 7d55718b0c
parent 6f893fb2e8 de90add30e f4166c54bf
12 changed files with 82 additions and 88 deletions
--- a/arch/x86/boot/tty.c
+++ b/arch/x86/boot/tty.c
--- a/arch/x86/include/asm/ds.h
+++ b/arch/x86/include/asm/ds.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
--- a/arch/x86/kernel/ds.c
+++ b/arch/x86/kernel/ds.c
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c