diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2013-02-07 15:12:24 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-04-07 14:25:53 +0200 |
| commit | a66a626538af65cbfc611e2b2fce500ed3f24518 (patch) | |
| tree | 1d471b691d098b3ed5c23ac2af8bdd2f9184d64f /arch/microblaze/mm/pgtable.c | |
| parent | c24cf712ac53ae8a7bedceb1c967da1667431d8e (diff) | |
microblaze: Use asm-generic/io.h
Using generic io.h will narrow down code duplication
in architecture io.h.
- define PCI_IOBASE
- remove non existing pci_io_base extern
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze/mm/pgtable.c')
| -rw-r--r-- | arch/microblaze/mm/pgtable.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c index 10b3bd0a980d..4f4520e779a5 100644 --- a/arch/microblaze/mm/pgtable.c +++ b/arch/microblaze/mm/pgtable.c @@ -69,10 +69,11 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size, * * However, allow remap of rootfs: TBD */ + if (mem_init_done && p >= memory_start && p < virt_to_phys(high_memory) && - !(p >= virt_to_phys((unsigned long)&__bss_stop) && - p < virt_to_phys((unsigned long)__bss_stop))) { + !(p >= __virt_to_phys((phys_addr_t)__bss_stop) && + p < __virt_to_phys((phys_addr_t)__bss_stop))) { pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n", (unsigned long)p, __builtin_return_address(0)); return NULL; |