diff options
Diffstat (limited to 'arch/x86/mm/ioremap_64.c')
-rw-r--r-- | arch/x86/mm/ioremap_64.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/mm/ioremap_64.c b/arch/x86/mm/ioremap_64.c index 6cac90aa5032..b03db4ca9cad 100644 --- a/arch/x86/mm/ioremap_64.c +++ b/arch/x86/mm/ioremap_64.c | |||
@@ -86,23 +86,6 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l | |||
86 | if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS) | 86 | if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS) |
87 | return (__force void __iomem *)phys_to_virt(phys_addr); | 87 | return (__force void __iomem *)phys_to_virt(phys_addr); |
88 | 88 | ||
89 | #ifdef CONFIG_FLATMEM | ||
90 | /* | ||
91 | * Don't allow anybody to remap normal RAM that we're using.. | ||
92 | */ | ||
93 | if (last_addr < virt_to_phys(high_memory)) { | ||
94 | char *t_addr, *t_end; | ||
95 | struct page *page; | ||
96 | |||
97 | t_addr = __va(phys_addr); | ||
98 | t_end = t_addr + (size - 1); | ||
99 | |||
100 | for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++) | ||
101 | if(!PageReserved(page)) | ||
102 | return NULL; | ||
103 | } | ||
104 | #endif | ||
105 | |||
106 | pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_GLOBAL | 89 | pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_GLOBAL |
107 | | _PAGE_DIRTY | _PAGE_ACCESSED | flags); | 90 | | _PAGE_DIRTY | _PAGE_ACCESSED | flags); |
108 | /* | 91 | /* |