Merge branch 'x86/core' into tracing/ftrace

Semantic merge: kernel/trace/trace_functions_graph.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-26 18:16:26 +00:00 · 2009-03-10 10:16:17 +01:00 · 2009-03-10 10:16:17 +01:00 · 8293dd6f86
commit 8293dd6f86
parent 631595fbf4 467c88fee5
17 changed files with 631 additions and 354 deletions
--- a/arch/blackfin/include/asm/percpu.h
+++ b/arch/blackfin/include/asm/percpu.h
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
--- a/arch/x86/mm/memtest.c
+++ b/arch/x86/mm/memtest.c
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
--- a/mm/percpu.c
+++ b/mm/percpu.c