summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/iomap.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-03-04 08:05:42 +0300
committerH. Peter Anvin <hpa@zytor.com>2009-03-04 08:05:42 +0300
commit2e22ea7cea0f7de86fd30df867fbf5b7e8eee0fd (patch)
tree8b8e5583fb2787ff7107a6f59b114ddcd2c2f691 /arch/x86/include/asm/iomap.h
parent638bee71c83a2837b48062fdc5b222163cf53d79 (diff)
parent645af4e9e0e32481e3336dda813688732c7e5f0f (diff)
downloadlinux-2e22ea7cea0f7de86fd30df867fbf5b7e8eee0fd.tar.xz
Merge branch 'x86/core' into x86/mce2
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);