diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-12-19 05:10:10 -0500 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-01-05 02:21:59 -0500 |
| commit | ed705633d3aba5ff442ca5b7a02bf19edfa811b5 (patch) | |
| tree | de9ac21c6eb5ef855345b4d0b7e364ec0042b043 /arch/microblaze/include | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
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.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index ed9d0f6e2cdb..a25e6b5e2ad4 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); | |||
| 174 | 174 | ||
| 175 | #define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr))) | 175 | #define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr))) |
| 176 | 176 | ||
| 177 | 177 | # define __pa(x) __virt_to_phys((unsigned long)(x)) | |
| 178 | # ifndef CONFIG_MMU | 178 | # define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) |
| 179 | # define __pa(vaddr) ((unsigned long) (vaddr)) | ||
| 180 | # define __va(paddr) ((void *) (paddr)) | ||
| 181 | # else /* CONFIG_MMU */ | ||
| 182 | # define __pa(x) __virt_to_phys((unsigned long)(x)) | ||
| 183 | # define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) | ||
| 184 | # endif /* CONFIG_MMU */ | ||
| 185 | |||
| 186 | 179 | ||
| 187 | /* Convert between virtual and physical address for MMU. */ | 180 | /* Convert between virtual and physical address for MMU. */ |
| 188 | /* Handle MicroBlaze processor with virtual memory. */ | 181 | /* Handle MicroBlaze processor with virtual memory. */ |