diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 06:30:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 06:30:42 +0100 |
| commit | 13b2eda64d14d0a0c15c092664c7351ea58ea851 (patch) | |
| tree | e0c82eb79a20f515f37ab3ffb9e5039b531eaa8c /arch/x86/include | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
| parent | 55d8085671863fe4ee6a17b7814bd38180a44e1d (diff) | |
Merge branch 'x86/urgent' into x86/core
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/iomap.h | 3 |
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); |