Merge branch 'x86/urgent' into x86/cleanups

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

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/pageattr.c
Simple merge