Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-09-26 18:16:26 +00:00 · 2015-02-04 09:01:12 +01:00 · 2015-02-04 09:01:12 +01:00 · 0967160ad6
commit 0967160ad6
parent 2fde4f94e0 b57c0b5175
16 changed files with 374 additions and 327 deletions
--- a/Documentation/x86/entry_64.txt
+++ b/Documentation/x86/entry_64.txt
--- a/Documentation/x86/x86_64/kernel-stacks
+++ b/Documentation/x86/x86_64/kernel-stacks
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
--- a/arch/x86/include/asm/calling.h
+++ b/arch/x86/include/asm/calling.h
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
--- a/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
--- a/arch/x86/kernel/cpu/mcheck/winchip.c
+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c