diff options
author | Michal Simek <monstr@monstr.eu> | 2010-02-22 05:27:27 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-03-11 08:13:10 -0500 |
commit | cca5613f0278fb0ae0aba285a496add55d0cabab (patch) | |
tree | 5a95b230f2ecc5904cd30a29bb017f27932d7600 /arch | |
parent | 22607a28213068af113b46862eafa785f00a482e (diff) |
microblaze: Remove VMALLOC_VMADDR
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
-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; } | |||
85 | #define VMALLOC_START (CONFIG_KERNEL_START + \ | 85 | #define VMALLOC_START (CONFIG_KERNEL_START + \ |
86 | max(32 * 1024 * 1024UL, memory_size)) | 86 | max(32 * 1024 * 1024UL, memory_size)) |
87 | #define VMALLOC_END ioremap_bot | 87 | #define VMALLOC_END ioremap_bot |
88 | #define VMALLOC_VMADDR(x) ((unsigned long)(x)) | ||
89 | 88 | ||
90 | #endif /* __ASSEMBLY__ */ | 89 | #endif /* __ASSEMBLY__ */ |
91 | 90 | ||
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, | |||
103 | area = get_vm_area(size, VM_IOREMAP); | 103 | area = get_vm_area(size, VM_IOREMAP); |
104 | if (area == NULL) | 104 | if (area == NULL) |
105 | return NULL; | 105 | return NULL; |
106 | v = VMALLOC_VMADDR(area->addr); | 106 | v = (unsigned long) area->addr; |
107 | } else { | 107 | } else { |
108 | v = (ioremap_bot -= size); | 108 | v = (ioremap_bot -= size); |
109 | } | 109 | } |