Merge branches 'x86/urgent' and 'x86/pat' into x86/core

Conflicts:
	arch/x86/include/asm/pat.h

diff --cc arch/x86/include/asm/pat.h
index 9709fdff6615a0ed43930551fc345a3c64f19b87,abb3c29fc9d5c6cd725cdf51db028e97d78e89de..b0e70056838e9d49c4e530f0396926c91abef1fb
--- 1/arch/x86/include/asm/pat.h
--- 2/arch/x86/include/asm/pat.h
+++ b/arch/x86/include/asm/pat.h
@@@ -15,4 -17,9 +15,7 @@@ extern int reserve_memtype(u64 start, u
                unsigned long req_type, unsigned long *ret_type);
  extern int free_memtype(u64 start, u64 end);
  
 -extern void pat_disable(char *reason);
 -
+ extern int kernel_map_sync_memtype(u64 base, unsigned long size,
+               unsigned long flag);
+ 
  #endif /* _ASM_X86_PAT_H */

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