aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-04-18 18:04:56 +0200
committerWill Deacon <will.deacon@arm.com>2016-04-22 10:08:34 +0100
commit86d618cd1d9fdf4b46b68eb014d4fbde08c4ae62 (patch)
treebb3b57d2f11a5acfe94ad4d305f11bb80173097b
parentnios2: use correct void* return type for page_to_virt() (diff)
downloadlinux-dev-86d618cd1d9fdf4b46b68eb014d4fbde08c4ae62.tar.xz
linux-dev-86d618cd1d9fdf4b46b68eb014d4fbde08c4ae62.zip
openrisc: drop wrongly typed definition of page_to_virt()
To align with generic code and other architectures that expect the macro page_to_virt to produce an expression whose type is 'void*', drop the arch specific definition, which is never referenced anyway. Acked-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--arch/openrisc/include/asm/page.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h
index e613d3673034..35bcb7cd2cde 100644
--- a/arch/openrisc/include/asm/page.h
+++ b/arch/openrisc/include/asm/page.h
@@ -81,8 +81,6 @@ typedef struct page *pgtable_t;
#define virt_to_page(addr) \
(mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT))
-#define page_to_virt(page) \
- ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
#define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)