diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-01 12:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-01 12:48:28 +0100 |
| commit | 645af4e9e0e32481e3336dda813688732c7e5f0f (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /arch/x86/include | |
| parent | ecc25fbd6b9e07b33895c61ddf84006b00f55d99 (diff) | |
| parent | 55f2b78995826d549401bdf20abeac1832636bb6 (diff) | |
Merge branch 'x86/pat' into x86/core
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/iomap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h index bd46495ff7d..86af26091d6 100644 --- a/arch/x86/include/asm/iomap.h +++ b/arch/x86/include/asm/iomap.h @@ -24,10 +24,7 @@ #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); +is_io_mapping_possible(resource_size_t base, unsigned long size); void * iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); |