summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/iomap.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-01 00:36:58 +0100
committerDavid S. Miller <davem@davemloft.net>2009-03-01 00:36:58 +0100
commit18963caaf55240d6a0491bdb27b7fef2882ffb15 (patch)
treed0e4365cae0ce401ba826809f4eef0bd755f4f2d /arch/x86/include/asm/iomap.h
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff)
downloadlinux-18963caaf55240d6a0491bdb27b7fef2882ffb15.tar.xz
linux-18963caaf55240d6a0491bdb27b7fef2882ffb15.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/x86/include/asm/iomap.h')
-rw-r--r--arch/x86/include/asm/iomap.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h
index c1f06289b14b..86af26091d6c 100644
--- a/arch/x86/include/asm/iomap.h
+++ b/arch/x86/include/asm/iomap.h
@@ -23,6 +23,9 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
+int
+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);