diff options
author | Greg Ungerer <gerg@snapgear.com> | 2005-09-01 20:42:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:57:30 -0400 |
commit | e70bd1160109f2b7e62222550a7af37910dba88a (patch) | |
tree | ea46b9013d37c56f8784ae3d93667c5caca9e6b7 /include/asm-m68knommu/page.h | |
parent | 8410a546765c10d929b82d1e8237398904a79283 (diff) |
[PATCH] m68knommu: need pfn_valid macro
Need pfn_valid macro, even on MMUless platforms.
Enclose the macro args of __pa and __va in parentheses.
Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68knommu/page.h')
-rw-r--r-- | include/asm-m68knommu/page.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-m68knommu/page.h b/include/asm-m68knommu/page.h index 05e03df0ec29..ff6a9265ed1c 100644 --- a/include/asm-m68knommu/page.h +++ b/include/asm-m68knommu/page.h | |||
@@ -73,8 +73,8 @@ extern unsigned long memory_end; | |||
73 | 73 | ||
74 | #ifndef __ASSEMBLY__ | 74 | #ifndef __ASSEMBLY__ |
75 | 75 | ||
76 | #define __pa(vaddr) virt_to_phys((void *)vaddr) | 76 | #define __pa(vaddr) virt_to_phys((void *)(vaddr)) |
77 | #define __va(paddr) phys_to_virt((unsigned long)paddr) | 77 | #define __va(paddr) phys_to_virt((unsigned long)(paddr)) |
78 | 78 | ||
79 | #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) | 79 | #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) |
80 | #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) | 80 | #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) |
@@ -84,6 +84,7 @@ extern unsigned long memory_end; | |||
84 | 84 | ||
85 | #define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn)) | 85 | #define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn)) |
86 | #define page_to_pfn(page) virt_to_pfn(page_to_virt(page)) | 86 | #define page_to_pfn(page) virt_to_pfn(page_to_virt(page)) |
87 | #define pfn_valid(pfn) ((pfn) < max_mapnr) | ||
87 | 88 | ||
88 | #define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \ | 89 | #define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \ |
89 | ((void *)(kaddr) < (void *)memory_end)) | 90 | ((void *)(kaddr) < (void *)memory_end)) |