Merge recent cleanups to the x86 MM code to resolve a conflict.

Conflicts:
	arch/x86/mm/fault.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>