summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/pat.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-26 06:31:23 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-26 06:31:23 +0100
commit801c0be81454901e02c49abe12929c67e7d1cb55 (patch)
tree749cb64a2829b174e6d5df76da756285e7554002 /arch/x86/include/asm/pat.h
parent13b2eda64d14d0a0c15c092664c7351ea58ea851 (diff)
parent13093cb0e59053bf97910de3a24f07cdff71c62c (diff)
Merge branches 'x86/urgent' and 'x86/pat' into x86/core
Conflicts: arch/x86/include/asm/pat.h
Diffstat (limited to 'arch/x86/include/asm/pat.h')
-rw-r--r--arch/x86/include/asm/pat.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h
index 9709fdff661..b0e70056838 100644
--- a/arch/x86/include/asm/pat.h
+++ b/arch/x86/include/asm/pat.h
@@ -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 */