From df0b42c94317ac1cffa42cb043b21620ecc39243 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 22 Feb 2010 11:27:27 +0100 Subject: [PATCH] --- yaml --- r: 188372 b: refs/heads/master c: cca5613f0278fb0ae0aba285a496add55d0cabab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/microblaze/include/asm/pgtable.h | 1 - trunk/arch/microblaze/mm/pgtable.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dac40bdd88b1..9015aed8cdd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22607a28213068af113b46862eafa785f00a482e +refs/heads/master: cca5613f0278fb0ae0aba285a496add55d0cabab diff --git a/trunk/arch/microblaze/include/asm/pgtable.h b/trunk/arch/microblaze/include/asm/pgtable.h index 1c47f6f8bfb6..e8d25fb8847c 100644 --- a/trunk/arch/microblaze/include/asm/pgtable.h +++ b/trunk/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/trunk/arch/microblaze/mm/pgtable.c b/trunk/arch/microblaze/mm/pgtable.c index 2820081b21ab..63a6fd07c48f 100644 --- a/trunk/arch/microblaze/mm/pgtable.c +++ b/trunk/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); }