diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 13:16:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 13:16:18 +0100 |
commit | f8cb22cbb8383c9f41e6ccbcd4fb94edb1048bda (patch) | |
tree | 9b3a333224ec895c053a694dcaff526502b84e6c /arch/x86/mm/iomap_32.c | |
parent | 044d408409cc4e1bc75c886e27ca85c270db104c (diff) | |
parent | ebdcc81c71937b30e09110c02a1e8a21fa770b6f (diff) |
Merge branch 'linus' into irq/genirq
Diffstat (limited to 'arch/x86/mm/iomap_32.c')
-rw-r--r-- | arch/x86/mm/iomap_32.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c index 6c2b1af1692..04102d42ff4 100644 --- a/arch/x86/mm/iomap_32.c +++ b/arch/x86/mm/iomap_32.c @@ -20,23 +20,16 @@ #include <asm/pat.h> #include <linux/module.h> -#ifdef CONFIG_X86_PAE -int -is_io_mapping_possible(resource_size_t base, unsigned long size) -{ - return 1; -} -#else -int -is_io_mapping_possible(resource_size_t base, unsigned long size) +int is_io_mapping_possible(resource_size_t base, unsigned long size) { +#ifndef CONFIG_X86_PAE /* There is no way to map greater than 1 << 32 address without PAE */ if (base + size > 0x100000000ULL) return 0; - +#endif return 1; } -#endif +EXPORT_SYMBOL_GPL(is_io_mapping_possible); /* Map 'pfn' using fixed map 'type' and protections 'prot' */ |