diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 05:31:23 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 05:31:23 (GMT) |
| commit | 801c0be81454901e02c49abe12929c67e7d1cb55 (patch) | |
| tree | 749cb64a2829b174e6d5df76da756285e7554002 /arch/x86/include | |
| parent | 13b2eda64d14d0a0c15c092664c7351ea58ea851 (diff) | |
| parent | 13093cb0e59053bf97910de3a24f07cdff71c62c (diff) | |
| download | linux-801c0be81454901e02c49abe12929c67e7d1cb55.tar.xz | |
Merge branches 'x86/urgent' and 'x86/pat' into x86/core
Conflicts:
arch/x86/include/asm/pat.h
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/iomap.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/pat.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h index 86af260..bd46495 100644 --- a/arch/x86/include/asm/iomap.h +++ b/arch/x86/include/asm/iomap.h @@ -24,7 +24,10 @@ #include <asm/tlbflush.h> int -is_io_mapping_possible(resource_size_t base, unsigned long size); +reserve_io_memtype_wc(u64 base, unsigned long size, pgprot_t *prot); + +void +free_io_memtype(u64 base, unsigned long size); void * iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h index 9709fdf..b0e7005 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 */ |