From ed705633d3aba5ff442ca5b7a02bf19edfa811b5 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 19 Dec 2011 11:10:10 +0100 Subject: microblaze: Synchronize __pa __va macros noMMU and MMU system use the same macros - synchronize them. Signed-off-by: Michal Simek --- arch/microblaze/include/asm/page.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'arch/microblaze/include') diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index ed9d0f6e2cd..a25e6b5e2ad 100644 --- a/arch/microblaze/include/asm/page.h +++ b/arch/microblaze/include/asm/page.h @@ -174,15 +174,8 @@ extern int page_is_ram(unsigned long pfn); #define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr))) - -# ifndef CONFIG_MMU -# define __pa(vaddr) ((unsigned long) (vaddr)) -# define __va(paddr) ((void *) (paddr)) -# else /* CONFIG_MMU */ -# define __pa(x) __virt_to_phys((unsigned long)(x)) -# define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) -# endif /* CONFIG_MMU */ - +# define __pa(x) __virt_to_phys((unsigned long)(x)) +# define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) /* Convert between virtual and physical address for MMU. */ /* Handle MicroBlaze processor with virtual memory. */ -- cgit v1.2.3