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

Conflicts:
	arch/x86/include/asm/pat.h
This commit is contained in:
Ingo Molnar
2009-02-26 06:31:23 +01:00
5 changed files with 82 additions and 22 deletions

View File

@@ -15,4 +15,7 @@ extern int reserve_memtype(u64 start, u64 end,
unsigned long req_type, unsigned long *ret_type);
extern int free_memtype(u64 start, u64 end);
extern int kernel_map_sync_memtype(u64 base, unsigned long size,
unsigned long flag);
#endif /* _ASM_X86_PAT_H */