Merge branch 'x86/trace'

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge