From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Feb 2009 05:31:23 +0000 (+0100)
Subject: Merge branches 'x86/urgent' and 'x86/pat' into x86/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=801c0be81454901e02c49abe12929c67e7d1cb55;p=linux-beck.git

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

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

801c0be81454901e02c49abe12929c67e7d1cb55
diff --cc arch/x86/include/asm/pat.h
index 9709fdff6615,abb3c29fc9d5..b0e70056838e
--- a/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 */