diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-25 16:40:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-25 16:40:10 +0100 |
commit | 2e31add2a7e2a15d07f592c21ba35870fa9a1d1f (patch) | |
tree | 814e2c70fb5528f108114c0da6e5a1e219e6a0e1 /arch/x86/include/asm/iomap.h | |
parent | d639bab8da86d330493487e8c0fea8ca31f53427 (diff) | |
parent | 17581ad812a9abb0182260374ef2e52d4a808a64 (diff) |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'arch/x86/include/asm/iomap.h')
-rw-r--r-- | arch/x86/include/asm/iomap.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h index c1f06289b14..bd46495ff7d 100644 --- a/arch/x86/include/asm/iomap.h +++ b/arch/x86/include/asm/iomap.h @@ -23,6 +23,12 @@ #include <asm/pgtable.h> #include <asm/tlbflush.h> +int +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); |