diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:34:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:06 +0100 |
| commit | 266b9f8727976769e2ed2dad77ac9295f37e321e (patch) | |
| tree | ed022bbf1126c2f09cb99ddfb402ef9e8da07740 /arch | |
| parent | 950f9d95bed1a366434d3597ea75f5b9d772d74f (diff) | |
x86: fix ioremap RAM check
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 24e42cab8d5..e84c09e7d2c 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -125,23 +125,14 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS) return (__force void __iomem *)phys_to_virt(phys_addr); -#ifdef CONFIG_X86_32 /* * Don't allow anybody to remap normal RAM that we're using.. */ - if (phys_addr <= virt_to_phys(high_memory - 1)) { - char *t_addr, *t_end; - struct page *page; - - t_addr = __va(phys_addr); - t_end = t_addr + (size - 1); - - for (page = virt_to_page(t_addr); - page <= virt_to_page(t_end); page++) - if (!PageReserved(page)) - return NULL; + for (offset = phys_addr >> PAGE_SHIFT; offset < max_pfn_mapped && + (offset << PAGE_SHIFT) < last_addr; offset++) { + if (page_is_ram(offset)) + return NULL; } -#endif pgprot = MAKE_GLOBAL(__PAGE_KERNEL | flags); |