microblaze: Remove VMALLOC_VMADDR
authorMichal Simek <monstr@monstr.eu>
Mon, 22 Feb 2010 10:27:27 +0000 (11:27 +0100)
committerMichal Simek <monstr@monstr.eu>
Thu, 11 Mar 2010 13:13:10 +0000 (14:13 +0100)
Signed-off-by: Michal Simek <monstr@monstr.eu>
arch/microblaze/include/asm/pgtable.h
arch/microblaze/mm/pgtable.c

index 1c47f6f..e8d25fb 100644 (file)
@@ -85,7 +85,6 @@ static inline pte_t pte_mkspecial(pte_t pte)  { return pte; }
 #define VMALLOC_START  (CONFIG_KERNEL_START + \
                                max(32 * 1024 * 1024UL, memory_size))
 #define VMALLOC_END    ioremap_bot
-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
 
 #endif /* __ASSEMBLY__ */
 
index 2820081..63a6fd0 100644 (file)
@@ -103,7 +103,7 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size,
                area = get_vm_area(size, VM_IOREMAP);
                if (area == NULL)
                        return NULL;
-               v = VMALLOC_VMADDR(area->addr);
+               v = (unsigned long) area->addr;
        } else {
                v = (ioremap_bot -= size);
        }