diff options
| author | Michal Simek <monstr@monstr.eu> | 2010-02-22 11:27:27 +0100 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2010-03-11 14:13:10 +0100 |
| commit | cca5613f0278fb0ae0aba285a496add55d0cabab (patch) | |
| tree | 5a95b230f2ecc5904cd30a29bb017f27932d7600 | |
| parent | microblaze: Add define for ASM_LOOP (diff) | |
| download | linux-cca5613f0278fb0ae0aba285a496add55d0cabab.tar.xz linux-cca5613f0278fb0ae0aba285a496add55d0cabab.zip | |
microblaze: Remove VMALLOC_VMADDR
Signed-off-by: Michal Simek <monstr@monstr.eu>
| -rw-r--r-- | arch/microblaze/include/asm/pgtable.h | 1 | ||||
| -rw-r--r-- | arch/microblaze/mm/pgtable.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index 1c47f6f8bfb6..e8d25fb8847c 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -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__ */ diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c index 2820081b21ab..63a6fd07c48f 100644 --- a/arch/microblaze/mm/pgtable.c +++ b/arch/microblaze/mm/pgtable.c @@ -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); } |