From fd44485fc1637d0d370adce675c018bb0fd07459 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 2 Sep 2005 10:42:52 +1000 Subject: [PATCH] --- yaml --- r: 6826 b: refs/heads/master c: e70bd1160109f2b7e62222550a7af37910dba88a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-m68knommu/page.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c1ee9d323cd..0bd0727ab1f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8410a546765c10d929b82d1e8237398904a79283 +refs/heads/master: e70bd1160109f2b7e62222550a7af37910dba88a diff --git a/trunk/include/asm-m68knommu/page.h b/trunk/include/asm-m68knommu/page.h index 05e03df0ec29..ff6a9265ed1c 100644 --- a/trunk/include/asm-m68knommu/page.h +++ b/trunk/include/asm-m68knommu/page.h @@ -73,8 +73,8 @@ extern unsigned long memory_end; #ifndef __ASSEMBLY__ -#define __pa(vaddr) virt_to_phys((void *)vaddr) -#define __va(paddr) phys_to_virt((unsigned long)paddr) +#define __pa(vaddr) virt_to_phys((void *)(vaddr)) +#define __va(paddr) phys_to_virt((unsigned long)(paddr)) #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) @@ -84,6 +84,7 @@ extern unsigned long memory_end; #define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn)) #define page_to_pfn(page) virt_to_pfn(page_to_virt(page)) +#define pfn_valid(pfn) ((pfn) < max_mapnr) #define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \ ((void *)(kaddr) < (void *)memory_end))