aboutsummaryrefslogtreecommitdiff
path: root/arch/microblaze/include
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2011-12-19 11:10:10 +0100
committerMichal Simek <monstr@monstr.eu>2012-01-05 08:21:59 +0100
commited705633d3aba5ff442ca5b7a02bf19edfa811b5 (patch)
treede9ac21c6eb5ef855345b4d0b7e364ec0042b043 /arch/microblaze/include
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff)
downloadlinux-ed705633d3aba5ff442ca5b7a02bf19edfa811b5.tar.gz
microblaze: Synchronize __pa __va macros
noMMU and MMU system use the same macros - synchronize them. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/include')
-rw-r--r--arch/microblaze/include/asm/page.h11
1 files changed, 2 insertions, 9 deletions
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. */